ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: 流程通用部分字段统一

Browse Source
This commit is contained in:
mzaxd
2023-10-27 09:30:16 +08:00
parent 89ab027aab
commit c5968f004e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeDataVO.java
+5 -1
View File
@@ -1,5 +1,6 @@
package com.jero.modules.activiti.process.esInitChange.entity.vo; package com.jero.modules.activiti.process.esInitChange.entity.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.jero.modules.activiti.process.common.entity.CommonVO; import com.jero.modules.activiti.process.common.entity.CommonVO;
import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
import lombok.Data; import lombok.Data;
@@ -13,9 +14,12 @@ import java.util.List;
@Data @Data
public class InitChangeDataVO { public class InitChangeDataVO {
@JsonProperty("common")
CommonVO commonVO; CommonVO commonVO;
@JsonProperty("dataList")
List<ProcessEsInitChange> dataList; List<ProcessEsInitChange> dataList;
InitChangeFlowUserVO initChangeFlowUserVO; @JsonProperty("flowUser")
InitChangeFlowUserVO flowUserInfoVO;
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+2 -2
View File
@@ -105,7 +105,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
initChangeFlowUserVO.setNewMainDraftUserLeaderLeader(userMap.get("newMainDraftUserLeaderLeader").getLinkUserIds()); initChangeFlowUserVO.setNewMainDraftUserLeaderLeader(userMap.get("newMainDraftUserLeaderLeader").getLinkUserIds());
initChangeFlowUserVO.setNewMainDraftUserLeader(userMap.get("newMainDraftUserLeader").getLinkUserIds()); initChangeFlowUserVO.setNewMainDraftUserLeader(userMap.get("newMainDraftUserLeader").getLinkUserIds());
initChangeFlowUserVO.setCopyUser(userMap.get("copyUser").getLinkUserIds()); initChangeFlowUserVO.setCopyUser(userMap.get("copyUser").getLinkUserIds());
initChangeDataVO.setInitChangeFlowUserVO(initChangeFlowUserVO); initChangeDataVO.setFlowUserInfoVO(initChangeFlowUserVO);
return initChangeDataVO; return initChangeDataVO;
} }
@@ -238,7 +238,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
} }
public Map<String, Object> setVariables(InitChangeDataVO initChangeData) { public Map<String, Object> setVariables(InitChangeDataVO initChangeData) {
InitChangeFlowUserVO initChangeFlowUserVO = initChangeData.getInitChangeFlowUserVO(); InitChangeFlowUserVO initChangeFlowUserVO = initChangeData.getFlowUserInfoVO();
ProcessEsInitChange initChange = initChangeData.getDataList().get(0); ProcessEsInitChange initChange = initChangeData.getDataList().get(0);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
// 设置流程中各个节点的人 // 设置流程中各个节点的人