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

update 法规合规评估流程

Browse Source
This commit is contained in:
lijiarao
2024-01-18 17:49:30 +08:00
parent d46eeaf8b1
commit da70a100fa
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+8 -1
View File
@@ -235,10 +235,17 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
term.setAssessResults_dictText(assessResultsMap.get(assessResults)); term.setAssessResults_dictText(assessResultsMap.get(assessResults));
} }
} }
String moduleOwner1 = null;
if (processProjectStandardTermList.size()>0){
ProcessProjectStandardTerm term = processProjectStandardTermList.get(0);
String moduleOwner = term.getModuleOwner();
moduleOwner1 = userNameMap.get(moduleOwner);
}
ProcessProjectStandard processProjectStandard = this.getById(processId); ProcessProjectStandard processProjectStandard = this.getById(processId);
ProcessProjectStandardVO processProjectStandardVO = new ProcessProjectStandardVO(); ProcessProjectStandardVO processProjectStandardVO = new ProcessProjectStandardVO();
processProjectStandardVO.setModuleOwner(moduleOwner1);
processProjectStandardVO.setProcessProjectStandard(processProjectStandard); processProjectStandardVO.setProcessProjectStandard(processProjectStandard);
processProjectStandardVO.setProcessProjectStandardTermList(processProjectStandardTermList); processProjectStandardVO.setProcessProjectStandardTermList(processProjectStandardTermList);
//processProjectStandardVO.setProcessProjectStandardTermUserList(); //processProjectStandardVO.setProcessProjectStandardTermUserList();
@@ -615,7 +622,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
} }
List<String> designEngineerList = Arrays.asList(designEngineers.split(",")); List<String> designEngineerList = Arrays.asList(designEngineers.split(","));
designEngineerIds.addAll(designEngineerList); designEngineerIds.addAll(designEngineerList);
updateWrapper.set(ProcessProjectStandardTermUser::getModuleOwner, designEngineerList.get(0)); updateWrapper.set(ProcessProjectStandardTermUser::getDesignEngineer, designEngineerList.get(0));
termUserService.update(updateWrapper); termUserService.update(updateWrapper);
if (designEngineerList.size() >= 2){ if (designEngineerList.size() >= 2){
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/vo/ProcessProjectStandardVO.java
+3
View File
@@ -18,6 +18,9 @@ public class ProcessProjectStandardVO {
/**业务基本信息*/ /**业务基本信息*/
@ApiModelProperty(value = "业务基本信息") @ApiModelProperty(value = "业务基本信息")
private ProcessProjectStandard processProjectStandard; private ProcessProjectStandard processProjectStandard;
/**上一节点处理人*/
@ApiModelProperty(value = "上一节点处理人")
private String moduleOwner;
/**关联条款列表*/ /**关联条款列表*/
@ApiModelProperty(value = "关联条款列表") @ApiModelProperty(value = "关联条款列表")
private List<ProcessProjectStandardTerm> processProjectStandardTermList; private List<ProcessProjectStandardTerm> processProjectStandardTermList;