From 2613aa415afce3b85d0de8c4112927c299ed0449 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 9 Nov 2023 09:53:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/common/enums/ProcessType.java | 1 + .../common/service/ActFlowCommonService.java | 9 ++- .../controller/ESAbolishController.java | 4 +- .../esAbolish/entity/ProcessEsAbolish.java | 1 - .../esAbolish/entity/vo/ESAbolishDataVO.java | 7 ++- .../entity/vo/ESAbolishFlowUserVO.java | 33 ---------- .../service/ProcessEsAbolishService.java | 2 +- .../impl/ProcessEsAbolishServiceImpl.java | 61 +++++-------------- .../AnnualInitTaskNameConstant.java | 12 ++-- .../impl/ProcessEsAnnualInitServiceImpl.java | 2 +- .../AnnualReportTaskNameConstant.java | 9 ++- .../ProcessEsAnnualReportServiceImpl.java | 11 ++-- .../ProcessESInitChangeController.java | 2 +- .../entity/EsInitChangeConstant.java | 10 +-- .../service/ProcessEsInitChangeService.java | 2 +- .../impl/ProcessEsInitChangeServiceImpl.java | 9 +-- 16 files changed, 54 insertions(+), 121 deletions(-) delete mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishFlowUserVO.java rename laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/{constant => }/AnnualInitTaskNameConstant.java (76%) rename laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/{constant => }/AnnualReportTaskNameConstant.java (61%) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java index 3d6cbdc2..193b791a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java @@ -15,6 +15,7 @@ public enum ProcessType { ES_ANNUAL_REPORT("年度制修订-各部门主动上报", "2", "es-annual-report", "processEsAnnualReportServiceImpl"), ES_ANNUAL_INIT("年度制修订-标准化部门主动发起", "3", "es-annual-init", "processEsAnnualInitServiceImpl"), FB_ENTRY_CHANGE("标准法规入库/变更流程", "4", "fb-entry-change", "ProcessFbEntryChangeServiceImpl"), + ES_ABOLISH("标准法规入库/变更流程", "5", "es-abolish", "ProcessEsAbolishServiceImpl"), ; private final String name; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 25b2a63f..5565898c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -91,7 +91,14 @@ public class ActFlowCommonService { */ public void setProcessVariables(String processInstanceId, Map variables) { for (Map.Entry entry : variables.entrySet()) { - runtimeService.setVariable(processInstanceId, entry.getKey(), entry.getValue()); + String key = entry.getKey(); + if (key.endsWith("List")) { + String value = (String) entry.getValue(); + List valueList = Arrays.asList(value.split(",")); + runtimeService.setVariable(processInstanceId, entry.getKey(), valueList); + continue; + } + runtimeService.setVariable(processInstanceId, key, entry.getValue()); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java index b9609d4a..88140a48 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java @@ -77,7 +77,7 @@ public class ESAbolishController { @ApiOperation(value="企标废止发起流程-同意", notes="企标废止发起流程-同意") @PostMapping("/agree") public Result agree(@RequestBody ESAbolishDataVO abolishData) { - abolishService.approvalInitChange(abolishData, true); + abolishService.approval(abolishData, true); return Result.OK(); } @@ -90,7 +90,7 @@ public class ESAbolishController { @ApiOperation(value="企标废止发起流程-驳回", notes="企标废止发起流程-驳回") @PostMapping("/reject") public Result reject(@RequestBody ESAbolishDataVO abolishData) { - abolishService.approvalInitChange(abolishData, false); + abolishService.approval(abolishData, false); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/ProcessEsAbolish.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/ProcessEsAbolish.java index 01773efe..e9ce7077 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/ProcessEsAbolish.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/ProcessEsAbolish.java @@ -9,7 +9,6 @@ import java.util.Date; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.checkerframework.checker.units.qual.A; /** * 企业标准 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishDataVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishDataVO.java index 9c48281e..0e9f8850 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishDataVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishDataVO.java @@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange import lombok.Data; import java.util.List; +import java.util.Map; /** * @author: Mzaxd @@ -16,11 +17,11 @@ import java.util.List; public class ESAbolishDataVO { @JsonProperty("common") - CommonVO common; + private CommonVO common; @JsonProperty("data") - ProcessEsAbolish data; + private ProcessEsAbolish data; @JsonProperty("flowUser") - ESAbolishFlowUserVO flowUser; + private Map flowUser; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishFlowUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishFlowUserVO.java deleted file mode 100644 index 1328b428..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/entity/vo/ESAbolishFlowUserVO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.jero.modules.activiti.process.esAbolish.entity.vo; - -import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author: Mzaxd - * @Date: 2023/10/9 16:57 - */ -@Data -public class ESAbolishFlowUserVO { - - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - @ApiModelProperty("发起人") - private String createUser; - - // 相关人员 - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - @ApiModelProperty("相关人员") - private String relatedUser; - - // 主起草人主管级领导 - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - @ApiModelProperty("起草人和会签人主管级领导") - private String leader; - - // 标准化审批人 - @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - @ApiModelProperty("标准化审批人") - private String standardizationUser; - -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java index ba1d4953..b393883c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java @@ -17,5 +17,5 @@ public interface ProcessEsAbolishService extends IService { ESAbolishDataVO getHandleData(String taskId); - void approvalInitChange(ESAbolishDataVO annualInitData, boolean pass); + void approval(ESAbolishDataVO annualInitData, boolean pass); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java index 5455446e..c408a6b5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.entity.ProcessAll; -import com.jero.modules.activiti.entity.ProcessNode; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.CommonVO; import com.jero.modules.activiti.process.common.entity.ProcessDraft; @@ -16,7 +15,6 @@ import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish; import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; -import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishFlowUserVO; import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService; import com.jero.modules.activiti.process.esAbolish.mapper.ProcessEsAbolishMapper; import com.jero.modules.activiti.service.ProcessAllService; @@ -31,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; -import java.util.stream.Collectors; /** * @author ThinkBook @@ -67,7 +64,7 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl variables = abolishData.getFlowUser(); // 设置流程变量 - Map variables = this.setVariables(flowUser); + this.setVariables(variables); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, variables); // 获取流程实例ID @@ -101,30 +98,26 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl setVariables(ESAbolishFlowUserVO flowUser) { - boolean counterSign = StrUtil.isNotBlank(flowUser.getRelatedUser()); + public Map setVariables(Map flowUser) { HashMap map = new HashMap<>(this.setUserVariables(flowUser)); + boolean counterSign = StrUtil.isNotBlank((String)flowUser.get("relatedUserList")); actFlowCommonService.putIfNotNull(map, "counterSign", counterSign); return map; } - public Map setUserVariables(ESAbolishFlowUserVO flowUser) { + public Map setUserVariables(Map flowUser) { HashMap map = new HashMap<>(); // 使用一个通用方法来只在不为空时添加键值对 - actFlowCommonService.putIfNotNull(map, "createUser", flowUser.getCreateUser()); - actFlowCommonService.putIfNotNull(map, "leader", flowUser.getLeader()); - actFlowCommonService.putIfNotNull(map, "standardizationApprovalUser", flowUser.getStandardizationUser()); - actFlowCommonService.putIfNotNull(map, "relatedUserList", Optional.ofNullable(flowUser.getRelatedUser()).map(s -> Arrays.asList(s.split(","))).orElse(null)); + actFlowCommonService.putIfNotNull(map, "createUser", flowUser.get("createUser")); + actFlowCommonService.putIfNotNull(map, "relatedUserList", flowUser.get("relatedUserList")); + actFlowCommonService.putIfNotNull(map, "leader", flowUser.get("leader")); + actFlowCommonService.putIfNotNull(map, "standardizationApprovalUser", flowUser.get("standardizationApprovalUser")); return map; } private Map getUserMap(Map variables) { variables.remove("pass"); variables.remove("counterSign"); - // 转成逗号拼接 - variables.put("relatedUserList", Optional.ofNullable((List) variables.get("relatedUserList")) - .map(list -> String.join(",", list)) - .orElse("")); return variables; } @@ -189,49 +182,23 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl nodeList = processNodeService.getNodeList(processDefinitionId, processInstanceId); - ESAbolishFlowUserVO flowUser = new ESAbolishFlowUserVO(); - Map userMap = nodeList.stream().collect(Collectors.toMap(ProcessNode::getVariableName, node -> node)); - Optional.ofNullable(userMap.get("createUser")).ifPresent(node -> flowUser.setCreateUser(node.getLinkUserIds())); - Optional.ofNullable(userMap.get("leader")).ifPresent(node -> flowUser.setLeader(node.getLinkUserIds())); - Optional.ofNullable(userMap.get("standardizationUser")).ifPresent(node -> flowUser.setStandardizationUser(node.getLinkUserIds())); - Optional.ofNullable(userMap.get("relatedUserList")).ifPresent(node -> flowUser.setRelatedUser(node.getLinkUserIds())); - return flowUser; - } - @Override - public void approvalInitChange(ESAbolishDataVO abolishData, boolean pass) { + public void approval(ESAbolishDataVO abolishData, boolean pass) { String userId = UserUtils.getUserId(); CommonVO commonVO = abolishData.getCommon(); - ProcessEsAbolish data = abolishData.getData(); String taskId = commonVO.getTaskId(); if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) { throw new JeroBootException("taskId为空或任务不存在"); } String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); - String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId); - if (pass) { - if (data != null) { - saveOrUpdate(data); - ESAbolishFlowUserVO flowUserInfoVO = abolishData.getFlowUser(); - Map variables = this.setVariables(flowUserInfoVO); - processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables)); - actFlowCommonService.setProcessVariables(processInstanceId, variables); - } - runtimeService.setVariable(processInstanceId, "pass", true); - } else { - // 设置流程变量 - runtimeService.setVariable(processInstanceId, "pass", false); - } + // 设置流程变量 + runtimeService.setVariable(processInstanceId, "pass", false); // 更新审批表为完成，填充数据 actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass); - //审批节点 + // 审批节点 actFlowCommonService.completeTask(taskId, userId); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/constant/AnnualInitTaskNameConstant.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/AnnualInitTaskNameConstant.java similarity index 76% rename from laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/constant/AnnualInitTaskNameConstant.java rename to laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/AnnualInitTaskNameConstant.java index 76ada2e9..c27c94ad 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/constant/AnnualInitTaskNameConstant.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/AnnualInitTaskNameConstant.java @@ -1,4 +1,4 @@ -package com.jero.modules.activiti.process.esAnnualInit.entity.constant; +package com.jero.modules.activiti.process.esAnnualInit.entity; /** * @author: Mzaxd @@ -6,12 +6,12 @@ package com.jero.modules.activiti.process.esAnnualInit.entity.constant; */ public class AnnualInitTaskNameConstant { - public static final String STANDARD_ENGINEER_INIT = "标准化工程师发起，填写新法规"; - public static final String CONTACT_USER_EDIT = "部所联络人 选取审批人 调整完成时间"; + public static final String STANDARD_ENGINEER_INIT = "标准化工程师发起"; + public static final String CONTACT_USER_EDIT = "部所联络人选取审批人"; public static final String STANDARD_ENGINEER_EDIT = "标准化工程师修改调整"; - public static final String MAIN_DRAFT_LEADER_APPROVAL = "主起草单位主管审批"; + public static final String MAIN_DRAFT_LEADER_APPROVAL = "主起草单位主管级领导审批下发"; public static final String MAIN_DRAFT_WRITE = "主起草人填写信息"; - public static final String CONTACT_USER_COLLECT = "部所联络人 汇总"; + public static final String CONTACT_USER_COLLECT = "部所联络人汇总"; public static final String MAIN_DRAFT_LEADER_LEADER_APPROVAL = "主起草单位主管级领导审批"; - public static final String STANDARD_ENGINEER_COLLECT = "标准化工程师归档"; + public static final String STANDARD_ENGINEER_COLLECT = "标准化归档"; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index 34b707d8..0d5c1613 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -42,7 +42,7 @@ import java.io.IOException; import java.util.*; import java.util.stream.Collectors; -import static com.jero.modules.activiti.process.esAnnualInit.entity.constant.AnnualInitTaskNameConstant.*; +import static com.jero.modules.activiti.process.esAnnualInit.entity.AnnualInitTaskNameConstant.*; /** * @author ThinkBook diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/constant/AnnualReportTaskNameConstant.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/AnnualReportTaskNameConstant.java similarity index 61% rename from laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/constant/AnnualReportTaskNameConstant.java rename to laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/AnnualReportTaskNameConstant.java index 75663621..730cd1da 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/constant/AnnualReportTaskNameConstant.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/AnnualReportTaskNameConstant.java @@ -1,4 +1,4 @@ -package com.jero.modules.activiti.process.esAnnualReport.entity.constant; +package com.jero.modules.activiti.process.esAnnualReport.entity; /** * @author: Mzaxd @@ -6,11 +6,10 @@ package com.jero.modules.activiti.process.esAnnualReport.entity.constant; */ public class AnnualReportTaskNameConstant { public static final String STANDARD_ENGINEER_INIT = "标准化工程师发起"; - public static final String CONTACT_USER_DISTRIBUTE = "各部所联络人 填写/下发任务"; - public static final String WORK_GROUP_COLLECT = "工作组联络人 线下收集，填写计划内容（可跳过）"; + public static final String CONTACT_USER_DISTRIBUTE = "各部所联络人填写/下发任务"; + public static final String WORK_GROUP_COLLECT = "工作组/所联络人填写企标"; public static final String COLLECT_LEADER_APPROVAL = "收集联络人主管级领导审批"; public static final String CONTACT_USER_COLLECT = "各部所联络人汇总"; - public static final String CONTACT_USER_LEADER_APPROVAL = "联络人主管级上级领导审批"; - public static final String CONTACT_USER_EDIT = "各部所联络人修改调整"; + public static final String CONTACT_USER_LEADER_APPROVAL = "联络人主管级上一级领导审批"; public static final String STANDARD_ENGINEER_COLLECT = "标准化工程师归档"; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index f4b063f1..8ced4e3a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -42,7 +42,7 @@ import java.io.IOException; import java.util.*; import java.util.stream.Collectors; -import static com.jero.modules.activiti.process.esAnnualReport.entity.constant.AnnualReportTaskNameConstant.*; +import static com.jero.modules.activiti.process.esAnnualReport.entity.AnnualReportTaskNameConstant.*; /** * @author ThinkBook @@ -189,7 +189,6 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessEsAnnualReport::getContactUser, UserUtils.getUserId()); @@ -268,10 +267,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl startInitChange(@RequestBody InitChangeDataVO initChangeData) { - initChangeService.startInitChange(initChangeData); + initChangeService.startProcess(initChangeData); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/EsInitChangeConstant.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/EsInitChangeConstant.java index 8f6c41be..54f8f634 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/EsInitChangeConstant.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/EsInitChangeConstant.java @@ -8,12 +8,12 @@ public class EsInitChangeConstant { public static final String MAIN_DRAFT_USER_INIT = "主起草人发起"; public static final String CONTACT_USER_CHECK = "部所联络人校对"; - public static final String EXPERT_CHECK = "标准对应领域专家审核"; + public static final String EXPERT_CHECK = "专家审批"; public static final String MAIN_DRAFT_USER_LEADER = "主起草人主管级领导审批"; - public static final String MAIN_DRAFT_USER_LEADER_LEADER = "主起草人主管级上级领导审批"; + public static final String MAIN_DRAFT_USER_LEADER_LEADER = "主起草人主管级上一级领导审批"; public static final String STANDARDIZATION_CHECK = "标准化审批"; - public static final String NEW_MAIN_DRAFT_LEADER_LEADER = "新起草部门主管级上一级领导下发主管级领导"; - public static final String NEW_MAIN_DRAFT_LEADER = "新起草部门主管级领导确认新起草人"; + public static final String NEW_MAIN_DRAFT_LEADER_LEADER = "新起草部门主管级上一级领导下发"; + public static final String NEW_MAIN_DRAFT_LEADER = "新起草部门主管级领导确认"; public static final String RELATE_USER_SIGN = "相关人员会签"; - public static final String AUTO_COPY = "自动抄送"; + public static final String AUTO_COPY = "主起草人抄送"; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java index b58c33eb..922fb457 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java @@ -19,7 +19,7 @@ public interface ProcessEsInitChangeService extends IService) variables.get("standardExpertList")) - .map(list -> String.join(",", list)) - .orElse("")); - variables.put("relatedUserList", Optional.ofNullable((List) variables.get("relatedUserList")) - .map(list -> String.join(",", list)) - .orElse("")); return variables; }