diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java index e4de5aab..55767249 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/controller/MessageCenterController.java @@ -99,7 +99,15 @@ public class MessageCenterController { return ActionResult.success(saleQuantityData); } - + /** + *获取今天的上货量 + */ + @GetMapping(value = "/getTadayPoundist1") + @ApiOperation("获取今天的上货量") + public ActionResult getTadayPoundist1(){ + Map saleQuantityData = messageCenterService.getTadayPoundist1(); + return ActionResult.success(saleQuantityData); + } /** * 列表 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java index 112e05ef..35d36872 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java @@ -61,6 +61,12 @@ public interface MessageCenterMapper extends BaseMapper { */ List getTadayPoundist(); + /**' + * 获取今天的上货量 + * @return + */ + List getTadayPoundist1(); + /** * 获取最近一年的结算量 * @return diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java index ec838a69..701e2383 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java @@ -60,6 +60,12 @@ public interface MessageCenterService extends IService { */ Map getTadayPoundist(); + /** + * 获取今天的上货量 + * @return + */ + Map getTadayPoundist1(); + /** * 获取一年的统计数据 * @return diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java index 3ecaf459..834814e0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java @@ -436,6 +436,11 @@ public class MessageCenterServiceImpl extends ServiceImpl + + + + + + + + + + + + + + + diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowlaunch/FlowLaunchListVO.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowlaunch/FlowLaunchListVO.java index 7c354162..06bfee46 100644 --- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowlaunch/FlowLaunchListVO.java +++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/model/flowlaunch/FlowLaunchListVO.java @@ -47,4 +47,7 @@ public class FlowLaunchListVO { private Integer formType; @ApiModelProperty(value = "表单数据") private String formData; + + @ApiModelProperty(value = "付款申请描述") + private String paymentDescription; } diff --git a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java index 05c00f9c..578f2a9d 100644 --- a/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java +++ b/SC-boot/linkage-workflow/src/main/java/jnpf/engine/service/impl/FlowTaskServiceImpl.java @@ -143,8 +143,10 @@ public class FlowTaskServiceImpl extends ServiceImpl t.like(FlowTaskEntity::getEnCode, keyWord) .or().like(FlowTaskEntity::getFullName, keyWord) +// .or().like(FlowTaskEntity::getDescription, keyWord) ); } + //日期范围(近7天、近1月、近3月、自定义) String startTime = paginationFlowTask.getStartTime() != null ? paginationFlowTask.getStartTime() : null; String endTime = paginationFlowTask.getEndTime() != null ? paginationFlowTask.getEndTime() : null; @@ -153,6 +155,11 @@ public class FlowTaskServiceImpl extends ServiceImpl +