Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java

@@ -305,8 +305,8 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
 	  * @param json
 	  * @return
 	  */
-	 @AutoLog(value = "项目库-认证清单表-批量更新状态")
-	 @ApiOperation(value="项目库-认证清单表-批量更新状态", notes="项目库-认证清单表-批量更新状态")
+	 @AutoLog(value = "项目库-认证清单表-批量更新流程状态")
+	 @ApiOperation(value="项目库-认证清单表-批量更新流程状态", notes="项目库-认证清单表-批量更新流程状态")
 	 @PostMapping(value = "/updateStatusBatch")
 	 public Result<?> updateStatusBatch(@RequestBody JSONObject json) {
 		 return this.projectCertificationInventoryEOService.updateStatusBatch(json);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java

@@ -500,4 +500,16 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 	public Result<?> resetFlowTemp(@RequestBody JSONObject params) {
 		return this.projectLawsInventoryEOService.resetFlowTemp(params);
 	}
+
+	/**
+	 *  批量更新法规清单状态
+	 * @param json
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-批量更新流程状态")
+	@ApiOperation(value="项目库-法规清单表-批量更新流程状态", notes="项目库-法规清单表-批量更新流程状态")
+	@PostMapping(value = "/updateFlowStatusBatch")
+	public Result<?> updateFlowStatusBatch(@RequestBody JSONObject json) {
+		return this.projectLawsInventoryEOService.updateFlowStatusBatch(json);
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java

@@ -78,6 +78,8 @@ public enum OperatorTypeEnum {
     LAWS_INVENTORY_STUDIO_EXPEDITING("法规清单-studio催办","lawsInventoryStudioExpediting"),
     LAWS_INVENTORY_REGULATION_OWNER_EXPEDITING("法规清单-法规工程师催办","lawsInventoryRegulationOwnerExpediting"),
     LAWS_INVENTORY_ENGINEERING_INTERFACE_PERSON_EXPEDITING("法规清单-工程接口人催办","lawsInventoryEngineeringInterfacePersonExpediting"),
+    LAWS_INVENTORY_DESIGN_UPDATE_FLOW_STATUS("法规清单-更新设计符合性流程状态","lawsInventoryDesignUpdateFlowStatus"),
+    LAWS_INVENTORY_VERIFY_UPDATE_FLOW_STATUS("法规清单-更新验证符合性流程状态","lawsInventoryVerifyUpdateFlowStatus"),
 
     /**
      * 待办中心-将法规工程师的法规清单确认待办任务转为已办

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

@@ -244,4 +244,11 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
     void createQueryPermission(int isProjectRole, LoginUser currentUser, QueryWrapper<ProjectLawsInventoryEO> projectLawsInventoryEOQueryWrapper);
 
 	Result<?> resetFlowTemp(JSONObject parmas);
+
+	/**
+	 * 批量更新流程状态
+	 * @param json
+	 * @return
+	 */
+	Result<?> updateFlowStatusBatch(JSONObject json);
 }

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

@@ -11859,4 +11859,28 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 		return Result.OK("变更成功！");
 	}
+
+	@Override
+	public Result<?> updateFlowStatusBatch(JSONObject json) {
+		String ids = json.getString("ids");
+		String flowStatus = json.getString("flowStatus");
+		String operateType = json.getString("operateType");
+		if(StringUtils.isNotEmpty(ids)){
+			QueryWrapper<ProjectLawsInventoryEO> pliQueryWrap = new QueryWrapper<>();
+			pliQueryWrap.lambda().in(ProjectLawsInventoryEO::getId,Arrays.asList(ids.split(",")));
+			List<ProjectLawsInventoryEO> pliEoList = this.list(pliQueryWrap);
+			if(CollectionUtils.isNotEmpty(pliEoList)){
+				pliEoList.forEach(pliEo -> {
+					if(StringUtils.contains(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_UPDATE_FLOW_STATUS.getValue())){
+						pliEo.setDesignFlowStatus(flowStatus);
+					}
+					if(StringUtils.contains(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_UPDATE_FLOW_STATUS.getValue())){
+						pliEo.setVerifyFlowStatus(flowStatus);
+					}
+				});
+				this.updateBatchById(pliEoList);
+			}
+		}
+		return new Result<>().success("批量更新状态成功！");
+	}
 }