From e21a402f733962baf3c70b75cab69865a10e15e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 28 Jun 2023 20:23:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E5=92=8C?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ectCertificationInventoryEOController.java | 20 ++++++++++
 .../ProjectLawsInventoryEOServiceImpl.java    | 39 +++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
index b78cfc973..7f79a896b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.modules.system.entity.SysRole;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -59,7 +60,26 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   @RequestParam(name="cut", defaultValue="cn") String cut,
 								   HttpServletRequest req) {
+		String flowStatusStr = "";
+		if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getFlowStatus())) {
+			flowStatusStr = projectCertificationInventoryEO.getFlowStatus();
+			projectCertificationInventoryEO.setFlowStatus(null);
+		}
 		QueryWrapper<ProjectCertificationInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectCertificationInventoryEO, req.getParameterMap());
+		if (StringUtils.isNotEmpty(flowStatusStr)) {
+			String finalflowStatusStr = flowStatusStr.replaceAll("\\*","");
+			queryWrapper.and(query -> {
+				query.lambda().like(ProjectCertificationInventoryEO::getFlowStatus, finalflowStatusStr);
+				if(StringUtils.contains(finalflowStatusStr,",")){
+					String[] flowStatusArr = finalflowStatusStr.split(",");
+					for (String fs : flowStatusArr) {
+						query.or(q -> {
+							q.like("flow_status",fs);
+						});
+					}
+				}
+			});
+		}
 		queryWrapper.orderByDesc("create_time");
 		Page<ProjectCertificationInventoryEO> page = new Page<ProjectCertificationInventoryEO>(pageNo, pageSize);
 		IPage<ProjectCertificationInventoryEO> pageList = this.projectCertificationInventoryEOService.queryPage(queryWrapper,page,projectCertificationInventoryEO,cut);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 5860da1d4..69dc5c8d0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -13441,6 +13441,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			dutyTerritoryStr = projectLawsInventoryEO.getDutyTerritory();
 			projectLawsInventoryEO.setDutyTerritory(null);
 		}
+		String designFlowStatusStr = "";
+		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignFlowStatus())) {
+			designFlowStatusStr = projectLawsInventoryEO.getDesignFlowStatus();
+			projectLawsInventoryEO.setDesignFlowStatus(null);
+		}
+		String verifyFlowStatusStr = "";
+		if (StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyFlowStatus())) {
+			verifyFlowStatusStr = projectLawsInventoryEO.getVerifyFlowStatus();
+			projectLawsInventoryEO.setVerifyFlowStatus(null);
+		}
 
 		// 根据一级责任领域（统计节点），查询该一级责任领域下所有子责任领域的法规清单数据。
 		if(StringUtils.isNotEmpty(projectLawsInventoryEO.getFirstLevelDutyTerritory())){
@@ -13475,6 +13485,35 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			});
 		}
+		if (StringUtils.isNotEmpty(designFlowStatusStr)) {
+			String finalDesignFlowStatusStr = designFlowStatusStr.replaceAll("\\*","");
+			queryWrapper.and(query -> {
+				query.lambda().like(ProjectLawsInventoryEO::getDesignFlowStatus, finalDesignFlowStatusStr);
+				if(StringUtils.contains(finalDesignFlowStatusStr,",")){
+					String[] designFlowStatusArr = finalDesignFlowStatusStr.split(",");
+					for (String dsf : designFlowStatusArr) {
+						query.or(q -> {
+							q.like("design_flow_status",dsf);
+						});
+					}
+				}
+			});
+		}
+		if (StringUtils.isNotEmpty(verifyFlowStatusStr)) {
+			String finalVerifyFlowStatusStr = verifyFlowStatusStr.replaceAll("\\*","");
+			queryWrapper.and(query -> {
+				query.lambda().like(ProjectLawsInventoryEO::getVerifyFlowStatus, finalVerifyFlowStatusStr);
+				if(StringUtils.contains(finalVerifyFlowStatusStr,",")){
+					String[] verifyFlowStatusArr = finalVerifyFlowStatusStr.split(",");
+					for (String vsf : verifyFlowStatusArr) {
+						query.or(q -> {
+							q.like("verify_flow_status",vsf);
+						});
+					}
+				}
+			});
+		}
+
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
 		if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())