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

fix 81725 法规合规评估流程-部所主管级领导审批，模块负责人没有正常回显

Browse Source
This commit is contained in:
lijiarao
2024-02-05 11:04:53 +08:00
parent 32beb17997
commit d8ec4ae5d0
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
+4
View File
@@ -211,6 +211,10 @@ public class ProcessProjectStandardTerm {
@ApiModelProperty(value="模块负责人")
private String moduleOwner;
@TableField(exist = false)
@ApiModelProperty(value="模块负责人")
private String moduleOwner_dictText;
@TableField(exist = false)
@ApiModelProperty(value="责任单位联络人")
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+4 -2
View File
@@ -247,14 +247,16 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
}
}
if (ProcessProjectStandardCommon.BSZGJLDSP_.equals(taskDefinitionKey)){
if (ProcessProjectStandardCommon.BSZGJLDSP_1.equals(taskDefinitionKey)
||ProcessProjectStandardCommon.BSZGJLDSP_2.equals(taskDefinitionKey)
||ProcessProjectStandardCommon.BSZGJLDSP_3.equals(taskDefinitionKey)){
List<String> userNameList = new ArrayList<>();
moduleOwnerList.stream()
.filter(Objects::nonNull)
.distinct().forEach(i ->{
userNameList.add(userNameMap.get(i)) ;
});
term.setModuleOwner(String.join(",", userNameList));
term.setModuleOwner_dictText(String.join(",", userNameList));
}
if (ProcessProjectStandardCommon.FGGCSSP.equals(taskDefinitionKey)){
List<String> userNameList = new ArrayList<>();