diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java index 8d82c47a..e53b00d2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java @@ -158,6 +158,13 @@ public class ProcessProjectAssessTerm { @ApiModelProperty(value = "评估反馈") private Integer evaluationFeedback; + /** + * 评估反馈翻译 + */ + @TableField(exist = false) + @ApiModelProperty(value = "评估反馈翻译") + private String evaluationFeedback_dictText; + /** * 依据描述 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java index 93e18195..e59cb137 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java @@ -121,6 +121,13 @@ public class ProcessProjectAssessTermUser { @ApiModelProperty(value = "评估反馈") private Integer evaluationFeedback; + /** + * 评估反馈翻译 + */ + @TableField(exist = false) + @ApiModelProperty(value = "评估反馈翻译") + private String evaluationFeedback_dictText; + /** * 依据描述 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 45201ef6..78034ca6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -10,6 +10,7 @@ import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; @@ -186,14 +187,28 @@ public class ProcessProjectAssessService extends ServiceImpl dictModels = sysBaseAPI.queryDictItemsByCode("assess_results"); + Map dictMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); //给条款中保存关联的信息 if (!processProjectAssessTermUserList.isEmpty()) { Map> termIdListMap = CollStreamUtil.groupByKey(processProjectAssessTermUserList, ProcessProjectAssessTermUser::getTermId); for (ProcessProjectAssessTerm term : processProjectAssessTermList) { String termId = term.getId(); List termUsers = termIdListMap.get(termId); + if (CollectionUtil.isNotEmpty(termUsers)){ + for (ProcessProjectAssessTermUser termUser : termUsers) { + Integer evaluationFeedback = termUser.getEvaluationFeedback(); + termUser.setEvaluationFeedback_dictText(dictMap.get(String.valueOf(evaluationFeedback))); + } + ProcessProjectAssessTermUser termUser = termUsers.get(0); + term.setEvaluationFeedback(termUser.getEvaluationFeedback()); + term.setEvaluationFeedback_dictText(termUser.getEvaluationFeedback_dictText()); + term.setDescription(termUser.getDescription()); + term.setFileId(termUser.getFileId()); + term.setExpectedTime(termUser.getExpectedTime()); + } term.setProcessProjectAssessTermUserList(termUsers); + String previousNodeHandler = previousNodeHandlerMap.get(termId); term.setPreviousNodeHandler(previousNodeHandler); }