修改交付物流程开发。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -6740,12 +6740,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
 				piFlowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
+				piFlowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
+				piFlowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
 			}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_RESET_FLOW.getValue())){
 				updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 				piFlowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
+				piFlowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
 			}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_RESET_FLOW.getValue())){
 				updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 				piFlowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
+				piFlowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
 			}
 
 			super.update(projectLawsInventoryEO, updateWrapper);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java

@@ -13,6 +13,11 @@ public enum DesignComplianceFlowNodeKeyEnum {
     ZRRTJJFW("符合性确认","Compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
     DEZRRTJJFW("符合性确认","Compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
     FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核
+
+    // 修改交付物流程
+    BCTJ_ZRRBCTJFQ("补充提交","Supplementary submission","zrrbctjfq"), // 责任人补充提交发起
+    BCTJ_ZRRBCTJXG("补充提交","Supplementary submission","zrrbctjxg"), // 责任人补充提交修改
+    BCTJ_FGGCSBCSH("补充审查","Supplemental Examination","fggcsbcsh"), // 法规工程师补充审核
     ;
 
     String cnName;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java

@@ -13,6 +13,11 @@ public enum VerifyComplianceFlowNodeKeyEnum {
     ZRRTJJFW("符合性确认","Compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
     DEZRRTJJFW("符合性确认","Compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
     FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核
+
+    // 修改交付物流程
+    BCTJ_ZRRBCTJFQ("补充提交","Supplementary submission","zrrbctjfq"), // 责任人补充提交发起
+    BCTJ_ZRRBCTJXG("补充提交","Supplementary submission","zrrbctjxg"), // 责任人补充提交修改
+    BCTJ_FGGCSBCSH("补充审查","Supplemental Examination","fggcsbcsh"), // 法规工程师补充审核
     ;
 
     String cnName;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml

@@ -173,7 +173,7 @@
                    <if test="params.cut == 'en'">
                         concat(pli.serial_number,' ',bdl.title_en) as standard_info,
                    </if>
-                   pi.flow_type,
+                    (case pi.flow_type when '32' THEN '2'  when '34' THEN '4' else pi.flow_type END) as flow_type,
                    pi.create_by,
                    pi.end_time,
                    pi.STATUS,

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java

@@ -224,6 +224,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 		flowTypeList.add(FlowTypeEnum.RWQRLC.getValue());
 		flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
 		flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
+		flowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
+		flowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
 		// 2023-03-08 去掉原来的Pre-Homo
 		// flowTypeList.add(FlowTypeEnum.PREHOMOQRLC.getValue());
 		params.put("flowTypeList",flowTypeList);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/ProcessHistoryEOController.java

@@ -182,4 +182,17 @@ public class ProcessHistoryEOController extends JeroController<ProcessHistoryEO,
 		 return this.processHistoryEOService.processCall(jsonObject);
 	 }
 
+	 /**
+	  * 列表查询
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "流程历史表-符合性流程-列表查询")
+	 @ApiOperation(value="流程历史表-符合性流程-列表查询", notes="流程历史表-符合性流程-列表查询")
+	 @GetMapping(value = "/queryComplianceProcessHistoryList")
+	 public Result<List<ProcessHistoryEO>> queryComplianceProcessHistoryList(@RequestParam Map<String,Object> params) {
+		 List<ProcessHistoryEO> list = processHistoryEOService.queryComplianceProcessHistoryList(params);
+		 return Result.OK(list);
+	 }
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java

@@ -77,8 +77,8 @@ public class workFlowController {
             jsonObject.put("processDefinitionKey", FlowTypeEnum.FGJSPG.getProcessDefinitionKey());
             return this.startLawsTechnologyEvaluationProcess(jsonObject);
         }else if(StringUtils.equals(type,FlowTypeEnum.XGJFWLC.getValue())){
-            jsonObject.put("processDefinitionKey", FlowTypeEnum.XGJFWLC.getProcessDefinitionKey());
+            jsonObject.put("id", FlowTypeEnum.XGJFWLC.getProcessDefinitionKey());
-            return this.startLawsTechnologyEvaluationProcess(jsonObject);
+            return this.activiti_define_start(jsonObject);
         }else{
             return null;
         }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java

@@ -70,4 +70,11 @@ public interface IProcessHistoryEOService extends IService<ProcessHistoryEO> {
     Result<?> processCall(JSONObject jsonObject);
 
 	void deleteBiActiProcInstIdList(List<String> actiProcInstIdList);
+
+	/**
+	 * 查询符合性流程历史
+	 * @param params
+	 * @return
+	 */
+	List<ProcessHistoryEO> queryComplianceProcessHistoryList(Map<String, Object> params);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java

@@ -180,17 +180,17 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 					return flag;
 				}).collect(Collectors.toList());
 
-				if(CollectionUtils.isNotEmpty(processInfoListTemp)){
+				if (CollectionUtils.isNotEmpty(processInfoListTemp)) {
 					String flowType = processInfoListTemp.get(0).getFlowType();
-					if(StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue())){
+					if (StringUtils.equals(flowType, FlowTypeEnum.SJFHXSHLC.getValue()) || StringUtils.equals(flowType, FlowTypeEnum.SJ_XGJFWLC.getValue())) {
-						data.setName(DesignComplianceFlowNodeKeyEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
+						data.setName(DesignComplianceFlowNodeKeyEnum.getTextByValue(data.getTaskDefinitionKey(), cut));
-					}else if(StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue())){
+					} else if (StringUtils.equals(flowType, FlowTypeEnum.YZFHXSCLC.getValue()) || StringUtils.equals(flowType, FlowTypeEnum.YZ_XGJFWLC.getValue())) {
-						data.setName(VerifyComplianceFlowNodeKeyEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
+						data.setName(VerifyComplianceFlowNodeKeyEnum.getTextByValue(data.getTaskDefinitionKey(), cut));
-					}else if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){
+					} else if (StringUtils.isNotEmpty(data.getTaskDefinitionKey())) {
-						data.setName(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
+						data.setName(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(), cut));
 					}
-				}else if(StringUtils.isNotEmpty(data.getTaskDefinitionKey())){
+				} else if (StringUtils.isNotEmpty(data.getTaskDefinitionKey())) {
-					data.setName(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(),cut));
+					data.setName(DesignComplianceNodeEnum.getTextByValue(data.getTaskDefinitionKey(), cut));
 				}
 
 				if(StringUtils.isNotEmpty(data.getApprovalFile())){
@@ -246,4 +246,36 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 
 		}
 	}
+
+	@Override
+	public List<ProcessHistoryEO> queryComplianceProcessHistoryList(Map<String, Object> params) {
+		String cut = (String) params.get("cut");
+		String projectLawsInventoryId = (String) params.get("projectLawsInventoryId");
+		if (StringUtils.isEmpty(projectLawsInventoryId)) {
+			throw new JeroBootException("法规清单id不能为空！");
+		}
+		String flowType = (String) params.get("flowType");
+		List<String> flowTypeList = new ArrayList<>();
+		flowTypeList.add(flowType);
+		if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){
+			flowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue());
+		}else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
+			flowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue());
+		}
+		QueryWrapper<ProcessInfoEO> piQueryWrap = new QueryWrapper<>();
+		piQueryWrap.lambda().eq(ProcessInfoEO::getProjectLawsInventoryId, projectLawsInventoryId);
+		piQueryWrap.lambda().in(ProcessInfoEO::getFlowType, flowTypeList);
+		List<ProcessInfoEO> piInfoList = this.processInfoEOService.list(piQueryWrap);
+		List<String> actiProcInstIdList = piInfoList.stream().map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList());
+
+		List<ProcessHistoryEO> processHistoryEOList = null;
+		if(CollectionUtils.isNotEmpty(actiProcInstIdList)){
+			QueryWrapper<ProcessHistoryEO> queryWrapper = new QueryWrapper<>();
+			queryWrapper.orderByAsc("create_time");
+			queryWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId, actiProcInstIdList);
+			processHistoryEOList = this.baseMapper.selectList(queryWrapper);
+			this.disposeData(processHistoryEOList, cut);
+		}
+		return processHistoryEOList;
+	}
 }