diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java index 969e5307..d9821553 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java @@ -141,6 +141,20 @@ public class ProcessStandardComplianceCheck implements Serializable { @TableField(exist = false) private String splitFile; + /** + * 主排查人 + */ + @ApiModelProperty(value = "主排查人") + @TableField(exist = false) + private String mainCheckUser; + + /** + * 排查任务是否下发 + */ + @ApiModelProperty(value = "排查任务是否下发") + @TableField(exist = false) + private String distributeFlag; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 8803c5f2..4fa6ed8c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -239,11 +239,11 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl userInfoMap = processInfoVO.getUserInfoMap(); + ProcessSccVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); switch (xmlNodeId) { case DEPT_USER_DISTRIBUTE: // 设置主排查人 - String mainCheckUser = userInfoMap.get(MAIN_CHECK_USER).toString(); + String mainCheckUser = businessInfoDTO.getStandardInfo().getMainCheckUser(); runtimeService.setVariable(processInstanceId, MAIN_CHECK_USER, mainCheckUser); break; case MAIN_CHECK_USER_DISTRIBUTE: @@ -293,6 +293,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl