增加工作流 实例的时间筛选

hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/TodoCenterManage.java

@@ -70,6 +70,7 @@ import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.basic.util.NdDateUtils;
 import com.ningdatech.basic.util.StrPool;
 import com.ningdatech.file.entity.File;
 import com.ningdatech.file.entity.vo.result.FileResultVO;
@@ -249,8 +250,6 @@ public class TodoCenterManage {
         List<Xinchuang> xinchuangs = xinchuangService.list(Wrappers.lambdaQuery(Xinchuang.class)
                 .like(StringUtils.isNotBlank(param.getProjectName()),Xinchuang::getProjectName, param.getProjectName())
                 .like(StringUtils.isNotBlank(param.getBuildOrgName()),Xinchuang::getBuildOrgName, param.getBuildOrgName())
-                .ge(Objects.nonNull(param.getCreateOnMin()),Xinchuang::getCreateOn, param.getCreateOnMin())
-                .le(Objects.nonNull(param.getCreateOnMax()),Xinchuang::getCreateOn, param.getCreateOnMax())
                 .isNotNull(Xinchuang::getInstCode));
 
         if (CollUtil.isEmpty(xinchuangs)) {
@@ -272,7 +271,14 @@ public class TodoCenterManage {
         Integer pageNumber = param.getPageNumber();
         Integer pageSize = param.getPageSize();
         req.setProcessDefId(param.getProcessDefId());
+        if(Objects.nonNull(param.getCreateOnMin())){
+            req.setStartTime(NdDateUtils.localDateTime2Date(param.getCreateOnMin()));
+        }
+        if(Objects.nonNull(param.getCreateOnMax())){
+            req.setEndTime(NdDateUtils.localDateTime2Date(param.getCreateOnMax()));
+        }
         req.setEmployeeCode(userIdStr);
+
         //有待办节点的(不包含退回)
         List<ProcessTaskVo> todoList = processTaskService.getUserTodoList(req);
         //有退回待办的
@@ -942,8 +948,6 @@ public class TodoCenterManage {
         List<Xinchuang> xinchuangs = xinchuangService.list(Wrappers.lambdaQuery(Xinchuang.class)
                 .like(StringUtils.isNotBlank(param.getProjectName()),Xinchuang::getProjectName, param.getProjectName())
                 .like(StringUtils.isNotBlank(param.getBuildOrgName()),Xinchuang::getBuildOrgName, param.getBuildOrgName())
-                .ge(Objects.nonNull(param.getCreateOnMin()),Xinchuang::getCreateOn, param.getCreateOnMin())
-                .le(Objects.nonNull(param.getCreateOnMax()),Xinchuang::getCreateOn, param.getCreateOnMax())
                 .isNotNull(Xinchuang::getInstCode));
 
         if (CollUtil.isEmpty(xinchuangs)) {
@@ -967,6 +971,12 @@ public class TodoCenterManage {
         req.setUserId(userIdStr);
         req.setEmployeeCode(userIdStr);
         req.setInstCodes(instCodes);
+        if(Objects.nonNull(param.getCreateOnMin())){
+            req.setStartTime(NdDateUtils.localDateTime2Date(param.getCreateOnMin()));
+        }
+        if(Objects.nonNull(param.getCreateOnMax())){
+            req.setEndTime(NdDateUtils.localDateTime2Date(param.getCreateOnMax()));
+        }
         List<ProcessTaskVo> iDoList = processTaskService.getUserIdoList(req);
         if (CollUtil.isEmpty(iDoList)) {
             return PageVo.empty();
@@ -1148,8 +1158,6 @@ public class TodoCenterManage {
         List<Xinchuang> xinchuangs = xinchuangService.list(Wrappers.lambdaQuery(Xinchuang.class)
                 .like(StringUtils.isNotBlank(param.getProjectName()),Xinchuang::getProjectName, param.getProjectName())
                 .like(StringUtils.isNotBlank(param.getBuildOrgName()),Xinchuang::getBuildOrgName, param.getBuildOrgName())
-                .ge(Objects.nonNull(param.getCreateOnMin()),Xinchuang::getCreateOn, param.getCreateOnMin())
-                .le(Objects.nonNull(param.getCreateOnMax()),Xinchuang::getCreateOn, param.getCreateOnMax())
                 .isNotNull(Xinchuang::getInstCode));
 
         if (CollUtil.isEmpty(xinchuangs)) {
@@ -1173,6 +1181,12 @@ public class TodoCenterManage {
         req.setUserId(userIdStr);
         req.setEmployeeCode(userIdStr);
         req.setInstCodes(instCodes);
+        if(Objects.nonNull(param.getCreateOnMin())){
+            req.setStartTime(NdDateUtils.localDateTime2Date(param.getCreateOnMin()));
+        }
+        if(Objects.nonNull(param.getCreateOnMax())){
+            req.setEndTime(NdDateUtils.localDateTime2Date(param.getCreateOnMax()));
+        }
         List<ProcessInstanceVo> submittedList = processInstanceService.getUserSubmittedList(req);
 
         if (CollUtil.isEmpty(submittedList)) {
@@ -1353,8 +1367,6 @@ public class TodoCenterManage {
         List<Xinchuang> xinchuangs = xinchuangService.list(Wrappers.lambdaQuery(Xinchuang.class)
                 .like(StringUtils.isNotBlank(param.getProjectName()),Xinchuang::getProjectName, param.getProjectName())
                 .like(StringUtils.isNotBlank(param.getBuildOrgName()),Xinchuang::getBuildOrgName, param.getBuildOrgName())
-                .ge(Objects.nonNull(param.getCreateOnMin()),Xinchuang::getCreateOn, param.getCreateOnMin())
-                .le(Objects.nonNull(param.getCreateOnMax()),Xinchuang::getCreateOn, param.getCreateOnMax())
                 .isNotNull(Xinchuang::getInstCode));
 
         if (CollUtil.isEmpty(xinchuangs)) {
@@ -1377,6 +1389,12 @@ public class TodoCenterManage {
         req.setUserId(userIdStr);
         req.setEmployeeCode(userIdStr);
         req.setInstCodes(instCodes);
+        if(Objects.nonNull(param.getCreateOnMin())){
+            req.setStartTime(NdDateUtils.localDateTime2Date(param.getCreateOnMin()));
+        }
+        if(Objects.nonNull(param.getCreateOnMax())){
+            req.setEndTime(NdDateUtils.localDateTime2Date(param.getCreateOnMax()));
+        }
         List<ProcessInstanceVo> ccMeList = processInstanceService.getCcMeList(req);
 
         if (CollUtil.isEmpty(ccMeList)) {