diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/TodoCenterManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/TodoCenterManage.java index c200a19..7566cc2 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/TodoCenterManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/TodoCenterManage.java @@ -247,6 +247,10 @@ public class TodoCenterManage { // 查出信创 List 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)) { @@ -936,6 +940,10 @@ public class TodoCenterManage { // 查出信创 List 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)) { @@ -1138,6 +1146,10 @@ public class TodoCenterManage { // 查出信创 List 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)) { @@ -1339,6 +1351,10 @@ public class TodoCenterManage { String userIdStr = String.valueOf(userId); // 查出信创 List 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)) {