WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

未符合项列表

Browse Source
This commit is contained in:
zhn
2023-09-05 14:34:12 +08:00
parent 994175e042
commit 3e1e44f5a0
4 changed files with 169 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProblemManagementEO.java
+5
View File
@@ -160,4 +160,9 @@ public class ProblemManagementEO implements Serializable {
@ApiModelProperty(value = "详情文件回显")
private List<OSSFile> approvalEvidenceFileList;
//用于区分旧数据和新数据（旧数据->old,新数据->new）
@TableField(exist = false)
@ApiModelProperty(value = "旧数据->old,新数据->new")
private String flag;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DataEnum.java
+46
View File
@@ -0,0 +1,46 @@
package com.jero.modules.project.enums;
/**
* 当前状态枚举类
*/
public enum DataEnum {
OLD("老数据","OLD"), // 老数据
NEW("新数据","NEW") // 新数据
;
String name;
String value;
private DataEnum(String name, String value) {
this.name = name;
this.value = value;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public static String getTextByValue(String value) {
DataEnum[] values = values();
for (DataEnum taskStatusEnum : values) {
if (taskStatusEnum.value.equals(value)) {
return taskStatusEnum.name;
}
}
return null;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+18 -9
View File
@@ -8,10 +8,13 @@ import com.jero.common.constant.enums.CutEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.ProblemManagementEO;
import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
import com.jero.modules.project.enums.DataEnum;
import com.jero.modules.project.enums.ReviewResultEnum;
import com.jero.modules.project.mapper.NcrTrackMapper;
import com.jero.modules.project.service.INcrTrackService;
import com.jero.modules.project.service.IProblemManagementEOService;
import com.jero.modules.project.vo.NcrTrackInfoVO;
import com.jero.modules.project.vo.NcrTrackVO;
import com.jero.modules.system.entity.SysDictItem;
@@ -66,6 +69,8 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
private ISysDictService sysDictService;
@Autowired
private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
@Autowired
private IProblemManagementEOService problemManagementEOService;
@Override
public List<NcrTrackVO> getPageInfo(NcrTrackVO ncrTrackVO) {
@@ -121,15 +126,6 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
Set<String> userIdSet = new HashSet<>();
for (NcrTrackVO trackVO : infoList) {
/*if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
userIdSet.add(trackVO.getDesignInitiatorId());
}
if(StringUtils.isNotBlank(trackVO.getPrehomoInitiatorId())){
userIdSet.add(trackVO.getPrehomoInitiatorId());
}
if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){
userIdSet.add(trackVO.getVerifyInitiatorId());
}*/
if(StringUtils.isNotBlank(trackVO.getDesignDutyId())){
userIdSet.add(trackVO.getDesignDutyId());
}
@@ -305,10 +301,23 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
}
}
}
List<ProblemManagementEO> managementEOList = problemManagementEOService.list();
List<NcrTrackVO> ncrTrackVOList = new ArrayList<>();
for (ProblemManagementEO problemManagementEO : managementEOList) {
NcrTrackVO ncrTrackVOTemp = new NcrTrackVO();
BeanUtils.copyProperties(problemManagementEO,ncrTrackVOTemp);
ncrTrackVOList.add(ncrTrackVOTemp);
}
if(trackVOListTemp.size() != 0){
if(!ncrTrackVOList.isEmpty()){
trackVOListTemp.addAll(ncrTrackVOList);
}
return trackVOListTemp;
}else{
if(!ncrTrackVOList.isEmpty()){
trackVOList.addAll(ncrTrackVOList);
}
return trackVOList;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+100
View File
@@ -1,6 +1,8 @@
package com.jero.modules.project.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.modules.oss.entity.OSSFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -158,10 +160,108 @@ public class NcrTrackVO implements Serializable {
private String flowStatus;
/**标题*/
// @Excel(name = "标题", width = 15)
// @ApiModelProperty(value = "标题")
// private java.lang.String title;
//
// /**问题类型*/
// @Excel(name = "问题类型", width = 15)
// @ApiModelProperty(value = "问题类型")
// private java.lang.String problemType;
/**ps_issue*/
@Excel(name = "ps_issue", width = 15)
@ApiModelProperty(value = "ps_issue")
private java.lang.String psIssue;
/**相关法规*/
@Excel(name = "相关法规", width = 15)
@ApiModelProperty(value = "相关法规")
private java.lang.String lawsId;
/**相关项目*/
@Excel(name = "相关项目", width = 15)
@ApiModelProperty(value = "相关项目")
private java.lang.String projectId;
// /**责任部门*/
// @ApiModelProperty(value = "责任部门")
// @Excel(name = "*责任领域", width = 15,dicCode ="duty_territory")
// private java.lang.String dutyTerritory;
/**问题状态*/
@Excel(name = "*问题状态", width = 15,dicCode ="wen4_ti2_lei4_xing2")
@ApiModelProperty(value = "问题状态")
private java.lang.String problemState;
/**描述和分析*/
@Excel(name = "描述和分析", width = 15)
@ApiModelProperty(value = "描述和分析")
private java.lang.String description;
/**相关文件链接*/
@Excel(name = "相关文件链接", width = 15)
@ApiModelProperty(value = "相关文件链接")
private java.lang.String fileLink;
/**相关文件*/
@Excel(name = "相关文件", width = 15)
@ApiModelProperty(value = "相关文件")
private java.lang.String file;
/**进度追踪*/
@Excel(name = "进度追踪", width = 15)
@ApiModelProperty(value = "进度追踪")
private java.lang.String progressTracking;
/**结论*/
@Excel(name = "结论", width = 15)
@ApiModelProperty(value = "结论")
private java.lang.String conclusion;
/**审批证据*/
@Excel(name = "审批证据", width = 15)
@ApiModelProperty(value = "审批证据")
private java.lang.String approvalEvidence;
/**审批证据链接*/
@Excel(name = "审批证据链接", width = 15)
@ApiModelProperty(value = "审批证据链接")
private java.lang.String approvalEvidenceLink;
@ApiModelProperty(value = "相关文件地址链接（前端传参）")
private List<String> fileLinkList;
@ApiModelProperty(value = "进度追踪（前端传参）")
private List<String> progressTrackingList;
@ApiModelProperty(value = "审批证据链接（前端传参）")
private List<String> approvalEvidenceLinkList;
@ApiModelProperty(value = "相关法规中文名")
private String lawsName;
// @TableField(exist = false)
// @ApiModelProperty(value = "相关项目中文名")
// private String projectName;
@ApiModelProperty(value = "详情文件回显")
private List<OSSFile> fileList;
@ApiModelProperty(value = "详情文件回显")
private List<OSSFile> approvalEvidenceFileList;
//用于区分旧数据和新数据（旧数据->old,新数据->new）
@ApiModelProperty(value = "旧数据->old,新数据->new")
private String flag;
}