Merge remote-tracking branch 'origin/dev_20230831_problem' into dev_20230831_problem

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java

@@ -344,6 +344,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
             trackVO.setTitle(trackVO.getTitle()+problemType);
             trackVO.setCreateBy(trackVO.getDuty());
             trackVO.setLawsName(trackVO.getSerialNumber());
+            trackVO.setFlag(DataEnum.OLD.getValue());
             if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(problemType)
                     || ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(problemType)){
                 if(CutEnum.CN.getValue().equals(ncrTrackVO.getCut())){

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -10285,7 +10285,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	@Override
 	public List<Map<String,Object>> queryNotComplianList(Map<String, Object> params) {
-		//problemManagementEOService
 		String cut = (String) params.get("cut");
 
 		List<String> complianceFlowStatusList = new ArrayList<>();
@@ -10316,16 +10315,51 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				userList = this.sysUserService.querySysUserListByIdList(userIdList);
 			}
 			for (Map<String, Object> dataMap : result) {
+
+				//相关法规
+				dataMap.put("lawsName",dataMap.get("serialNumber"));
+				//相关项目(旧数据的未符合项，都是属于这一个项目的)
+				dataMap.put("projectName",params.get("projectName"));
+				//创建时间
+				dataMap.put("createTime",dataMap.get("createTime"));
+				//更新时间
+				dataMap.put("updateTime",dataMap.get("updateTime"));
+
 				String dutyTerritory = (String) dataMap.get("dutyTerritory");
 				if(StringUtils.isNotEmpty(dutyTerritory)){
 					if(StringUtils.isNotEmpty(dutyTerritory)){
 						String dutyTerritory_dictText = this.disposeShowDictItemValue(sysDictItems, dutyTerritory,cut,ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
 						dataMap.put("dutyTerritory_dictText",dutyTerritory_dictText);
+						//责任部门
+						dataMap.put("dutyTerritory",dutyTerritory_dictText);
 					}
 				}
 
 				String flowStatus = (String) dataMap.get("flowStatus");
 				if(StringUtils.isNotEmpty(flowStatus)){
+					String textByValue = ComplianceFlowStatusEnum.getTextByValue(flowStatus, cut);
+					if(ComplianceFlowStatusEnum.INCONFORMITY.getCnName().equals(textByValue)
+							|| ComplianceFlowStatusEnum.INCONFORMITY.getEnName().equals(flowStatus)){
+						//问题类型
+						if(CutEnum.CN.getValue().equals(cut)){
+							dataMap.put("problemType",ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getCnName());
+						}else{
+							dataMap.put("problemType",ComplianceFlowStatusEnum.LAWS_INCONFORMITY.getEnName());
+						}
+						//问题状态
+						dataMap.put("problemState",ColourEnum.RED.getName());
+					}
+					if(ComplianceFlowStatusEnum.TO_TRACK.getCnName().equals(flowStatus)
+							||ComplianceFlowStatusEnum.TO_TRACK.getEnName().equals(flowStatus)){
+						//问题类型
+						if(CutEnum.CN.getValue().equals(cut)){
+							dataMap.put("problemType",ComplianceFlowStatusEnum.LAWS_TO_TRACK.getCnName());
+						}else{
+							dataMap.put("problemType",ComplianceFlowStatusEnum.LAWS_TO_TRACK.getEnName());
+						}
+						//问题状态
+						dataMap.put("problemState",ColourEnum.YELLOW.getName());
+					}
 					dataMap.put("flowStatusName",ComplianceFlowStatusEnum.getTextByValue(flowStatus,cut));
 				}
 
@@ -10339,6 +10373,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					if(StringUtils.isNotEmpty(dutyId)){
 						String dutyIdName = this.sysUserService.getUsernameByUserId(userList,dutyId);
 						dataMap.put("dutyIdName",dutyIdName);
+						//创建人
+						dataMap.put("createBy",dutyIdName);
 					}
 				}
 
@@ -10346,6 +10382,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				if(StringUtils.isNotEmpty(flowType)){
 					dataMap.put("flowTypeName",FlowTypeEnum.getTextByValue(flowType,cut));
 				}
+				//标题
+				dataMap.put("title",(String) dataMap.get("flowTypeName") + (String) dataMap.get("problemType"));
+				dataMap.put("flag",DataEnum.OLD.getValue());
 
 				// 返回符合性流程的流程实例id
 				QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
@@ -10417,8 +10456,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			map.put("psIssue",problemManagementEO.getPsIssue());
 			map.put("dutyTerritory",problemManagementEO.getDutyTerritory());
 			map.put("problemState",problemManagementEO.getProblemState());
+			map.put("problemType",problemManagementEO.getProblemType());
 			map.put("description",problemManagementEO.getDescription());
 			map.put("conclusion",problemManagementEO.getConclusion());
+			map.put("createBy",problemManagementEO.getCreateBy());
+			map.put("createTime",problemManagementEO.getCreateTime());
+			map.put("updateTime",problemManagementEO.getUpdateTime());
+			map.put("flag",DataEnum.OLD.getValue());
 			//相关法规
 			if(StringUtils.isNotBlank(problemManagementEO.getLawsId())){
 				if(!documentLibraryEOList.isEmpty()){