diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java index c97012ae..b6321c07 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java @@ -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; + } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java index a3797262..3c07c915 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java @@ -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 stateDictModels = sysBaseAPI.queryDictItemsByCode("state"); + Map stateDictMap = CollStreamUtil.toMap(stateDictModels, DictModel::getValue, DictModel::getText); + + List assessResultsDictModels = sysBaseAPI.queryDictItemsByCode("assess_results"); + Map 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();