diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index 70bc3fe14..a568a77b3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -4553,11 +4553,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) { String title = ""; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ - title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," + + title = "*类别,*检验项目,*认证类型,*WVTA ID," + "*标准编号,*责任领域,*工程接口人,*责任人," + "交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称"; }else { - title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," + + title = "*Category,*Inspection Items,*Certification Type,*WVTA ID," + "*Standard No,*Responsible Field,*Eng. Interface,*Assignee," + "Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer"; } @@ -4675,7 +4675,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if (i == 0) { cell.setCellType(HSSFCell.CELL_TYPE_STRING); headerSb.append(cell.getStringCellValue() + ","); - if(j == 15){ + if(j == 14){ break; } } else if(i > 1){ @@ -4719,7 +4719,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), ProjectCertificationInventoryEO.class); projectCertificationInventoryEOTemp.setCut(projectCertificationInventoryEO.getCut()); projectCertificationInventoryEOTemp.setProjectLibraryId(projectCertificationInventoryEO.getProjectLibraryId()); - projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); + projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue()); datas.add(projectCertificationInventoryEOTemp); } @@ -4746,7 +4746,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI for(int k = 0 ; k userIdList = new ArrayList<>(); + if(ObjectUtils.isNotEmpty(datas)){ + //sdtName + List collect1 = datas.stream().filter(e -> StringUtils.isNotBlank(e.getSdtName())) + .map(ProjectCertificationInventoryEO::getSdtName).distinct().collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect1)){ + userIdList.addAll(collect1); + } + } + List userList = new ArrayList<>(); + if(ObjectUtils.isNotEmpty(userIdList)){ + userList = sysUserService.queryUserIdListByNameList(userIdList); + } + for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) { i++; String errorMsg = ""; @@ -4992,7 +5007,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI nameCn = "工程接口人"; nameEn = "Eng. Interface "; //验证人员是否存在 - personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, mapPersonList,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); + List sysUsers = userList.stream().filter(e -> sdt.equals(e.getUsername())).collect(Collectors.toList()); + personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, sysUsers,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); +// personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, mapPersonList,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); } //责任人 @@ -5294,7 +5311,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI } private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO, String errorMsg, List msgList, String regulationOwnerId, - List> mapList, String nameCn, String nameEn, String fieldNumber) { + List sysUserList, String nameCn, String nameEn, String fieldNumber) { //单选 if(regulationOwnerId.contains(",")){ if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ @@ -5305,35 +5322,61 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI msgList.add(errorMsg); } - if(mapList.size() != 0){ - int count = 0; - for (Map stringStringMap : mapList) { - String name = stringStringMap.get("name"); - if(regulationOwnerId.equals(name)){ - count ++; - if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){ - projectCertificationInventoryEO.setSdt(stringStringMap.get("value")); - } - break; - } - } - if(count == 0){ - if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ - errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配"; - }else{ - errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list"; - } - msgList.add(errorMsg); + if(ObjectUtils.isNotEmpty(sysUserList)){ + if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){ + projectCertificationInventoryEO.setSdt(sysUserList.get(0).getId()); } }else{ if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ - errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配"; + errorMsg += nameCn+regulationOwnerId+"不存在"; }else{ - errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list"; + errorMsg += nameEn+regulationOwnerId+"absent"; } msgList.add(errorMsg); } } +// private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO, +// String errorMsg, List msgList, String regulationOwnerId, +// List> mapList, String nameCn, String nameEn, String fieldNumber) { +// //单选 +// if(regulationOwnerId.contains(",")){ +// if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ +// errorMsg += nameCn + "导入只能填写一个用户名"; +// }else{ +// errorMsg += "Only one user name can be entered for"+ nameEn +"import"; +// } +// msgList.add(errorMsg); +// } +// +// if(mapList.size() != 0){ +// int count = 0; +// for (Map stringStringMap : mapList) { +// String name = stringStringMap.get("name"); +// if(regulationOwnerId.equals(name)){ +// count ++; +// if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){ +// projectCertificationInventoryEO.setSdt(stringStringMap.get("value")); +// } +// break; +// } +// } +// if(count == 0){ +// if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ +// errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配"; +// }else{ +// errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list"; +// } +// msgList.add(errorMsg); +// } +// }else{ +// if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ +// errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配"; +// }else{ +// errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list"; +// } +// msgList.add(errorMsg); +// } +// } private String pullMore(List dictItemList, ProjectCertificationInventoryEO projectCertificationInventoryEO, String errorMsg, String value, List msgList, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 412ed239c..917180cee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -5440,6 +5440,24 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUserList = this.sysUserService.querySysUserByUserNameList(userNameList); + List userIdList = new ArrayList<>(); + if(ObjectUtils.isNotEmpty(dataList)){ + //regulationOwnerId engineeringInterfacePerson + List collect1 = dataList.stream().filter(e -> StringUtils.isNotBlank(e.getRegulationOwnerId())) + .map(ProjectLawsInventoryEO::getRegulationOwnerId).distinct().collect(Collectors.toList()); + List collect2 = dataList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineeringInterfacePerson())) + .map(ProjectLawsInventoryEO::getEngineeringInterfacePerson).distinct().collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect1)){ + userIdList.addAll(collect1); + } + if(ObjectUtils.isNotEmpty(collect2)){ + userIdList.addAll(collect2); + } + } + List userList = new ArrayList<>(); + if(ObjectUtils.isNotEmpty(userIdList)){ + userList = sysUserService.queryUserIdListByNameList(userIdList); + } //编号验证 verifySerialNumber(dataList, projectLawsInventoryEOTemp, dataSource); for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { @@ -5594,8 +5612,9 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUsers = userList.stream().filter(e -> regulationOwnerId.equals(e.getUsername())).collect(Collectors.toList()); //验证人员是否存在 - personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList, nameCn, nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + personnelVerifyTemp(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, sysUsers, nameCn, nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue()); } //认证工程师 @@ -5611,7 +5630,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUsers = userList.stream().filter(e -> engineeringInterfacePerson.equals(e.getUsername())).collect(Collectors.toList()); + //验证人员是否存在 + personnelVerifyTemp(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, sysUsers, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); +// personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); } } } @@ -6258,6 +6280,51 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList, + String regulationOwnerId, + List sysUserList, + String nameCn, String nameEn, + String fieldNumber) { + //单选 + if (regulationOwnerId.contains(",")) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + errorMsg += nameCn + "导入只能填写一个用户名, "; + } else { + errorMsg += "Only one user name can be entered for" + nameEn + "import, "; + } + msgList.add(errorMsg); + } + + if (ObjectUtils.isNotEmpty(sysUserList)) { + if (ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setRegulationOwnerId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setHomologationEngineerId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setEngineeringInterfacePerson(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.DESIGNINITIATOR.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setDesignInitiatorId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setDesignDutyId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.PREHOMOINITIATOR.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setPrehomoInitiatorId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.PREHOMODUTY.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setPrehomoDutyId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.VERIFYINITIATOR.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setVerifyInitiatorId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setVerifyDutyId(sysUserList.get(0).getId()); + } + }else{ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + errorMsg += nameCn + regulationOwnerId + "不存在， "; + } else { + errorMsg += nameEn + regulationOwnerId + "absent, "; + } + msgList.add(errorMsg); + } + } private boolean dateVerify(ProjectLawsInventoryEO projectLawsInventoryEO, String errorMsg, Date field, List msgList, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java index ca1985b85..3ee5b2e4d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformTaskPlanningEOServiceImpl.java @@ -6,6 +6,7 @@ import com.jero.modules.platform.entity.PlatformTaskPlanningEO; import com.jero.modules.platform.mapper.PlatformTaskPlanningEOMapper; import com.jero.modules.platform.service.IPlatformTaskPlanningEOService; import com.jero.modules.project.enums.PlanStatusEnum; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; import java.text.ParseException; @@ -43,12 +44,18 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl platformTaskPlanningEOList) { if(!platformTaskPlanningEOList.isEmpty()){ + //先删除在新增 +// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(PlatformTaskPlanningEO::getCreateBy,loginUser.getUsername()); + wrapper.eq(PlatformTaskPlanningEO::getProjectId,platformTaskPlanningEOList.get(0).getProjectId()); + this.remove(wrapper); for (PlatformTaskPlanningEO platformTaskPlanningEO : platformTaskPlanningEOList) { Date now = new Date(); platformTaskPlanningEO.setCreateTime(now); platformTaskPlanningEO.setUpdateTime(now); } - saveOrUpdateBatch(platformTaskPlanningEOList); + saveBatch(platformTaskPlanningEOList); } } @@ -120,12 +127,14 @@ public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl quotePage(@RequestBody Map params) { + params.put("flag","quote"); + List pageList= projectLibraryBaseService.queryPageList(params); + Page pages = projectLibraryBaseService.getPages(Integer.parseInt(params.get("pageNo").toString()), Integer.parseInt(params.get("pageSize").toString()), pageList); + return Result.OK(params.get("cut").toString(),pages); + } /** * 勾选法规清单进行关联平台件 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index 2e5692fe3..82cecb02a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -66,7 +66,11 @@ - plb.platform is null + 1=1 + + and plb.platform is null + + @@ -128,7 +132,13 @@ and plb.brand = #{params.brand} - order by plb.sort desc, plb.create_time desc + + order by plb.platform, plb.sort desc, plb.create_time desc + + + order by plb.sort desc, plb.create_time desc + +