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-06 11:16:47 +08:00
parent 7d9315967c
commit c5c1d3cf4e
2 changed files with 33 additions and 32 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/enums/ColourEnum.java
+2 -2
View File
@@ -5,8 +5,8 @@ package com.jero.modules.project.enums;
*/ */
public enum ColourEnum { public enum ColourEnum {
RED("红色","1"), // 未完成 RED("红","1"), // 未完成
YELLOW("黄色","2"), // 已完成 YELLOW("黄","2"), // 已完成
GREEN("绿色","3"), // 展示数据 GREEN("绿色","3"), // 展示数据
BLUE("蓝色","4") // 展示数据 BLUE("蓝色","4") // 展示数据
; ;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+31 -30
View File
@@ -323,35 +323,14 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
if(trackVOListTemp.size() != 0){ if(trackVOListTemp.size() != 0){
//旧数据处理 //旧数据处理
for (NcrTrackVO trackVO : trackVOListTemp) { oldData(ncrTrackVO, trackVOListTemp);
String problemType = trackVO.getProblemType();
trackVO.setTitle(trackVO.getFlowType()+problemType);
trackVO.setCreateBy(trackVO.getDuty());
if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType)
|| ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){
if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){
trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName());
}else{
trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName());
}
trackVO.setProblemType(ColourEnum.RED.getName());
}
if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType)
||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){
if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){
trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName());
}else{
trackVO.setProblemType(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName());
}
trackVO.setProblemType(ColourEnum.YELLOW.getName());
}
}
if(!ncrTrackVOList.isEmpty()){ if(!ncrTrackVOList.isEmpty()){
trackVOListTemp.addAll(ncrTrackVOList); trackVOListTemp.addAll(ncrTrackVOList);
} }
return trackVOListTemp; return trackVOListTemp;
}else{ }else{
//旧数据处理
oldData(ncrTrackVO, trackVOList);
if(!ncrTrackVOList.isEmpty()){ if(!ncrTrackVOList.isEmpty()){
trackVOList.addAll(ncrTrackVOList); trackVOList.addAll(ncrTrackVOList);
} }
@@ -359,6 +338,33 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
} }
} }
private void oldData(NcrTrackVO ncrTrackVO, List<NcrTrackVO> trackVOListTemp) {
for (NcrTrackVO trackVO : trackVOListTemp) {
String problemType = trackVO.getProblemType();
trackVO.setTitle(trackVO.getTitle()+problemType);
trackVO.setCreateBy(trackVO.getDuty());
trackVO.setLawsName(trackVO.getSerialNumber());
if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType)
|| ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){
if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){
trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName());
}else{
trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName());
}
trackVO.setProblemState(ColourEnum.RED.getName());
}
if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(problemType)
||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(problemType)){
if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){
trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName());
}else{
trackVO.setProblemType_dictText(ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName());
}
trackVO.setProblemState(ColourEnum.YELLOW.getName());
}
}
}
@NotNull @NotNull
private List<NcrTrackVO> getProblemManagementData(List<NcrTrackVO> ncrTrackVOListTemp,String cut) { private List<NcrTrackVO> getProblemManagementData(List<NcrTrackVO> ncrTrackVOListTemp,String cut) {
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
@@ -451,18 +457,13 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
}else{ }else{
projectVersion = projectLibraryBase.getProjectVersion(); projectVersion = projectLibraryBase.getProjectVersion();
} }
if(com.jero.modules.system.util.StringUtils.isNotBlank(projectLibraryBase.getYearName())){
projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+ "-" + projectLibraryBase.getYearName()
+ "-" + targetMarket);
}
projectNameList.add(projectLibraryBase.getProjectName() projectNameList.add(projectLibraryBase.getProjectName()
+ "-" + projectLibraryBase.getYearName() + "-" + projectLibraryBase.getYearName()
+ "-" + targetMarket + "-" + targetMarket
+"-"+projectVersion); +"-"+projectVersion);
} }
if(!projectNameList.isEmpty()){ if(!projectNameList.isEmpty()){
problemManagementEO.setProjectName(com.jero.modules.system.util.StringUtils.join(projectNameList,",")); problemManagementEO.setProjectName(StringUtils.join(projectNameList,","));
} }
} }