diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/external/todo/enumerization/MHTodoTypeEnum.java b/hz-pm-api/src/main/java/com/hz/pm/api/external/todo/enumerization/MHTodoTypeEnum.java index ce7555a..b41233b 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/external/todo/enumerization/MHTodoTypeEnum.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/external/todo/enumerization/MHTodoTypeEnum.java @@ -15,7 +15,13 @@ import lombok.Getter; @AllArgsConstructor public enum MHTodoTypeEnum { - + SELF_TEST_AUDIT("系统自测审批", "instanceId=${instanceId}&projectId=${projectId}&nodeId=${nodeId}&taskId=${taskId}&bidId=${bizId}&userId=${userId}&userName=${userName}&path=${path}"), + ADAPTION_AUDIT("开工文件审批", "instanceId=${instanceId}&projectId=${projectId}&nodeId=${nodeId}&taskId=${taskId}&bidId=${bizId}&userId=${userId}&userName=${userName}&path=${path}"), + TEST_VALID_AUDIT("监理核实验证审批", "instanceId=${instanceId}&projectId=${projectId}&nodeId=${nodeId}&taskId=${taskId}&bidId=${bizId}&userId=${userId}&userName=${userName}&path=${path}"), + COMPLIANCE_REVIEW_AUDIT("合规性审查审批", "instanceId=${instanceId}&projectId=${projectId}&nodeId=${nodeId}&taskId=${taskId}&bidId=${bizId}&userId=${userId}&userName=${userName}&path=${path}"), + PROJECT_REVIEW_AUDIT("项目评审审批", "instanceId=${instanceId}&projectId=${projectId}&nodeId=${nodeId}&taskId=${taskId}&bidId=${bizId}&userId=${userId}&userName=${userName}&path=${path}"), + PROJECT_STOPPED_AUDIT("项目终止审批", "instanceId=${instanceId}&projectId=${projectId}&nodeId=${nodeId}&taskId=${taskId}&bidId=${bizId}&userId=${userId}&userName=${userName}&path=${path}"), + PROJECT_CHANGE_AUDIT("项目变更审批", "instanceId=${instanceId}&projectId=${projectId}&nodeId=${nodeId}&taskId=${taskId}&bidId=${bizId}&userId=${userId}&userName=${userName}&path=${path}"), FINAL_INSPECT_AUDIT("终验审批", "instanceId=${instanceId}&projectId=${projectId}&nodeId=${nodeId}&taskId=${taskId}&bidId=${bizId}&userId=${userId}&userName=${userName}&path=${path}"), XCFHX_INSPECT_AUDIT("信创符合性审查审批", "instanceId=${instanceId}&projectId=${projectId}&nodeId=${nodeId}&taskId=${taskId}&bidId=${bizId}&userId=${userId}&userName=${userName}&path=${path}"), DECLARED_RECORD_APPLY("立项备案申请", "mhProjectId=${mhProjectId}&status=${status}&projectCode=${projectCode}&projectId=${projectId}&userId=${userId}&userName=${userName}&path=${path}"), diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/listener/TaskCreatedListener.java b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/listener/TaskCreatedListener.java index 418a27a..dd0f136 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/listener/TaskCreatedListener.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/scheduler/listener/TaskCreatedListener.java @@ -18,6 +18,7 @@ import com.hz.pm.api.projectlib.model.entity.ProjectInst; import com.hz.pm.api.projectlib.service.IProjectInstService; import com.hz.pm.api.projectlib.service.IProjectService; import com.hz.pm.api.user.security.model.UserFullInfoDTO; +import com.ningdatech.basic.exception.BizException; import com.ningdatech.basic.util.CollUtils; import com.wflow.bean.entity.WflowModelHistorys; import com.wflow.workflow.service.ProcessModelHistorysService; @@ -83,6 +84,13 @@ public class TaskCreatedListener implements FlowableEventListener { case XC_APPROVAL_PROCESS: case PROJECT_RECORD_APPROVAL_PROCESS: case ACCEPTANCE_DECLARATION_APPROVAL_PROCESS: + case ADAPTION: + case SELF_TEST: + case TEST_VALID: + case PROJECT_CHANGE: + case PROJECT_STOPPED: + case COMPLIANCE_REVIEW: + case PROJECT_REVIEW: // 发送信产平台待办 MHTodoTypeEnum todoType = getMhTodoTypeEnum(procType); String content = String.format("【%s】的【%s】需要您审核,请及时处理。", @@ -131,6 +139,13 @@ public class TaskCreatedListener implements FlowableEventListener { case XC_APPROVAL_PROCESS: case PROJECT_RECORD_APPROVAL_PROCESS: case ACCEPTANCE_DECLARATION_APPROVAL_PROCESS: + case ADAPTION: + case SELF_TEST: + case TEST_VALID: + case PROJECT_CHANGE: + case PROJECT_STOPPED: + case COMPLIANCE_REVIEW: + case PROJECT_REVIEW: MHTodoTypeEnum todoType = getMhTodoTypeEnum(procType); if (orUserTask) { List tasks = wflowHelper.listFinishedTasks(taskDefKey); @@ -156,9 +171,32 @@ public class TaskCreatedListener implements FlowableEventListener { case PROJECT_RECORD_APPROVAL_PROCESS: todoType = MHTodoTypeEnum.DECLARED_RECORD_AUDIT; break; - default: + case PROJECT_REVIEW: + todoType = MHTodoTypeEnum.PROJECT_REVIEW_AUDIT; + break; + case COMPLIANCE_REVIEW: + todoType = MHTodoTypeEnum.COMPLIANCE_REVIEW_AUDIT; + break; + case PROJECT_STOPPED: + todoType = MHTodoTypeEnum.PROJECT_STOPPED_AUDIT; + break; + case TEST_VALID: + todoType = MHTodoTypeEnum.TEST_VALID_AUDIT; + break; + case PROJECT_CHANGE: + todoType = MHTodoTypeEnum.PROJECT_CHANGE_AUDIT; + break; + case ADAPTION: + todoType = MHTodoTypeEnum.ADAPTION_AUDIT; + break; + case SELF_TEST: + todoType = MHTodoTypeEnum.SELF_TEST_AUDIT; + break; + case ACCEPTANCE_DECLARATION_APPROVAL_PROCESS: todoType = MHTodoTypeEnum.FINAL_INSPECT_AUDIT; break; + default: + throw BizException.wrap("未知待办类型:" + procType); } return todoType; }