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-25 15:14:12 +08:00
parent b68ff244e7
commit bdb18046c9
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java
+19
View File
@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -101,6 +103,12 @@ public class ProcessProjectNotMetLink {
@ApiModelProperty(value = "条款名称")
private String termName;
/**责任部门ID*/
@Excel(name = "责任部门ID", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@ApiModelProperty(value = "责任部门ID")
private String departmentId;
/**
* 设计工程师ID
*/
@@ -152,6 +160,12 @@ public class ProcessProjectNotMetLink {
@ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)")
private String state;
/**评估结果(1-符合、2-不符合、3-待验证、4-不涉及)*/
@Dict(dicCode = "assess_results")
@ApiModelProperty(value = "评估结果(1-符合、2-不符合、3-待验证、4-不涉及)")
private String assessResults;
/**
* 创建人ID
*/
@@ -198,5 +212,10 @@ public class ProcessProjectNotMetLink {
@ApiModelProperty(value = "删除标识")
private Boolean delFlag;
private String departmentId_dictText;
private String engineerId_dictText;
private String state_dictText;
private String assessResults_dictText;
}
laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
+16
View File
@@ -1,8 +1,10 @@
package com.jero.modules.activiti.process.projectnotmet.service;
import cn.hutool.core.collection.CollStreamUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
@@ -81,6 +83,20 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
for (LoginUser loginUser : userList) {
userNameMap.put(loginUser.getId(), loginUser.calcNameWorkNo());
}
List<DictModel> stateDictModels = sysBaseAPI.queryDictItemsByCode("state");
Map<String, String> stateDictMap = CollStreamUtil.toMap(stateDictModels, DictModel::getValue, DictModel::getText);
List<DictModel> assessResultsDictModels = sysBaseAPI.queryDictItemsByCode("assess_results");
Map<String, String> assessResultsDictMap = CollStreamUtil.toMap(assessResultsDictModels, DictModel::getValue, DictModel::getText);
for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) {
String engineerId = processProjectNotMetLink.getEngineerId();
processProjectNotMetLink.setEngineerId_dictText(userNameMap.get(engineerId));
String state = processProjectNotMetLink.getState();
processProjectNotMetLink.setState_dictText(stateDictMap.get(state));
String assessResults = processProjectNotMetLink.getAssessResults();
processProjectNotMetLink.setAssessResults_dictText(assessResultsDictMap.get(assessResults));
}
ProcessProjectNotMet processProjectNotMet = this.getById(businessId);
ProcessProjectNotMetVO processProjectNotMetVO = new ProcessProjectNotMetVO();