diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index 7a9a244a0..291cceac3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -5,7 +5,6 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.service.IProjectRelatedPersonnelService; -import com.jero.modules.system.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -195,7 +194,7 @@ public class ProjectRelatedPersonnelController extends JeroController queryCertificationEngineer(@RequestParam(name="projectId",required=true) String projectId){ - List certificationEngineerList = projectRelatedPersonnelService.queryCertificationEngineer(projectId); + List certificationEngineerList = projectRelatedPersonnelService.queryCertificationEngineer(projectId); return Result.OK(certificationEngineerList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 02839a265..e4940671a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -4,7 +4,7 @@ public enum ProjectTaskPlanningNameEnum { LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"), LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"), DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"), - PREHOMO_DEADLINE("Pre-Homo确认","Pre-homo Check"), + PREHOMO_DEADLINE("Pre-Homo确认","Pre-Homo Check"), ATTESTATION_START_TIME("认证开始","Certification start"), ATTESTATION_END_TIME("认证结束"," Certification end"), VERIFY_DEADLINE("验证符合性确认截止时间","Verification compliance confirmation deadline"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index 7455c6f05..273981bd1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -2,7 +2,6 @@ package com.jero.modules.project.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.project.entity.ProjectRelatedPersonnel; -import com.jero.modules.system.entity.SysUser; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.springframework.web.multipart.MultipartFile; @@ -87,5 +86,5 @@ public interface IProjectRelatedPersonnelService extends IService queryCertificationEngineer(String projectId); + List queryCertificationEngineer(String projectId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 7c3ce10d4..f30b62a0a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -11,6 +11,7 @@ import com.jero.common.util.RedisUtil; import com.jero.common.util.TokenUtils; import com.jero.modules.dummy.service.impl.DummyInventoryInfoEOServiceImpl; import com.jero.modules.enums.DictCodeEnum; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; import com.jero.modules.project.service.IProjectRelatedPersonnelService; @@ -83,6 +84,8 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl0 && StringUtils.isNotBlank(row.getCell(k).getStringCellValue())) { + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("填写说明列数不对,请严格按照模板文件导入数据"); + } else { + throw new JeroBootException("The number of columns of filling explanation is wrong. Please import data strictly according to the template file."); + } } } - } if (i > 1) {//读取数据 //获取每一行数据 @@ -762,7 +767,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl可以 + }else if(StringUtils.isBlank(lawEngineerName) || StringUtils.isBlank(engineeringInterfacePersonName) || StringUtils.isBlank(certificationEngineerName)) { + //除了责任领域,其他的可以全为空->可以 projectRelatedPersonnel.setLawEngineerName(""); projectRelatedPersonnel.setEngineeringInterfacePersonName(""); projectRelatedPersonnel.setCertificationEngineerName(""); - }else {//除了责任领域,备注,有一个为空都报错 + }/*else {//除了责任领域,备注,有一个为空都报错 if(CutEnum.CN.getValue().equals(cut)){ throw new JeroBootException("请填写必填字段内容,带*的为必填.请检查第 "+ (i+1) + "行"); }else{ throw new JeroBootException("Please fill in the required fields marked with * .Please check line" + (i+1)); } - } + }*/ String remark = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString(); if(StringUtils.isNotEmpty(row.getCell(4).toString())) { @@ -803,7 +808,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl queryCertificationEngineer(String projectId) { + public List queryCertificationEngineer(String projectId) { QueryWrapper queryWrapper = new QueryWrapper<>(); List list = list(queryWrapper.eq("project_id",projectId)); - List certificationEngineerList = list.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.toList()); +// List certificationEngineerIdList = list.stream().map(e -> e.getCertificationEngineer()).collect(Collectors.toList()); - StringBuilder userIdBuilder=new StringBuilder(); - List certificationEngineerUsers = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(certificationEngineerList)){ - for(String certificationEngineerId :certificationEngineerList){ - if(StringUtils.isNotBlank(certificationEngineerId)) { - userIdBuilder.append(certificationEngineerId).append(","); + //查询基础表认证工程师的值 + QueryWrapper baseQueryWrapper = new QueryWrapper<>(); + List baseDataList = projectLibraryBaseService.list(baseQueryWrapper.eq("id", projectId)); + String baseCertificationEngineer = baseDataList.get(0).getCertificationEngineer(); +// List certificationEngineerUsers = new ArrayList<>();//认证工程师非空 + + if(StringUtils.isNotBlank(baseCertificationEngineer)) { + for (ProjectRelatedPersonnel projectRelatedPersonnel : list) { + if (StringUtils.isBlank(projectRelatedPersonnel.getCertificationEngineer())) { + projectRelatedPersonnel.setCertificationEngineer(baseCertificationEngineer); } } - String userId = userIdBuilder.substring(0, userIdBuilder.toString().length() - 1); - List userIdList = Arrays.asList(userId.split(",")); - userIdList.stream().distinct().collect(Collectors.toList()); - QueryWrapper userqueryWrapper = new QueryWrapper<>(); - userqueryWrapper.in("id ", userIdList); - certificationEngineerUsers = sysUserMapper.selectList(userqueryWrapper); } - return certificationEngineerUsers; + disposeData(list); + return list; }