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
2023-12-17 18:02:16 +08:00
parent e15a53c898
commit bdd514b395
3 changed files with 30 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/projectassess/entity/ProcessProjectAssessTerm.java
+7
View File
@@ -158,6 +158,13 @@ public class ProcessProjectAssessTerm {
@ApiModelProperty(value = "评估反馈")
private Integer evaluationFeedback;
/**
* 评估反馈翻译
*/
@TableField(exist = false)
@ApiModelProperty(value = "评估反馈翻译")
private String evaluationFeedback_dictText;
/**
* 依据描述
*/
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTermUser.java
+7
View File
@@ -121,6 +121,13 @@ public class ProcessProjectAssessTermUser {
@ApiModelProperty(value = "评估反馈")
private Integer evaluationFeedback;
/**
* 评估反馈翻译
*/
@TableField(exist = false)
@ApiModelProperty(value = "评估反馈翻译")
private String evaluationFeedback_dictText;
/**
* 依据描述
*/
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+16 -1
View File
@@ -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<ProcessProjectAsses
default:
}
List<DictModel> dictModels = sysBaseAPI.queryDictItemsByCode("assess_results");
Map<String, String> dictMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
//给条款中保存关联的信息
if (!processProjectAssessTermUserList.isEmpty()) {
Map<String, List<ProcessProjectAssessTermUser>> termIdListMap = CollStreamUtil.groupByKey(processProjectAssessTermUserList, ProcessProjectAssessTermUser::getTermId);
for (ProcessProjectAssessTerm term : processProjectAssessTermList) {
String termId = term.getId();
List<ProcessProjectAssessTermUser> 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);
}