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 4592a6b41..feaf08c34 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 @@ -37,8 +37,12 @@ import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService; import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService; import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO; import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn; +import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEnPlatform; +import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOPlatform; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.jero.modules.project.entity.ProjectCertificationInventoryEOEn; +import com.jero.modules.project.entity.ProjectCertificationInventoryEOEnPlatform; +import com.jero.modules.project.entity.ProjectCertificationInventoryEOPlatform; import com.jero.modules.project.entity.ProjectCertificationInventoryLogEO; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; @@ -532,7 +536,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI List userIdList = new ArrayList<>(); userIdList.add(oldPciEo.getDutyPerson()); if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){ - userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","))); + if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){ + userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","))); + } } List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); oldPciEo.setEndTime(newPciEo.getEndTime()); @@ -789,7 +795,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI List userIdList = new ArrayList<>(); userIdList.add(oldPciEo.getDutyPerson()); if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){ - userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","))); + if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){ + userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","))); + } }else if(role == ProjectRoleEnum.HOMOLOGATION_ENGINEER.getIntValue()){ userIdList.add(projectLibraryBase.getStudioEngineer()); } @@ -1805,12 +1813,17 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI for (CertificationInventoryFlowStatusEnum value : values) { Map flowStatusMap = new HashMap<>(); String name = value.getCnName(); - if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - name = value.getEnName(); + if(!CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getCnName().equals(name) + && !CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getEnName().equals(name) + && !CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getCnName().equals(name) + && !CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getEnName().equals(name)){ + if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + name = value.getEnName(); + } + flowStatusMap.put("name",name); + flowStatusMap.put("value",value.getValue()); + result.add(flowStatusMap); } - flowStatusMap.put("name",name); - flowStatusMap.put("value",value.getValue()); - result.add(flowStatusMap); } return Result.OK(result); } @@ -5542,9 +5555,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) || ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){ - workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEO.class, copy); + workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOPlatform.class, copy); }else{ - workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEO.class, dataList); + workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOPlatform.class, dataList); } }else{ if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) || @@ -5555,7 +5568,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEn); copyEn.add(projectCertificationInventoryDutyEnginnerEOEn); } - workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOEn.class, copyEn); + workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOEnPlatform.class, copyEn); }else{ List dataListEn = new ArrayList<>(); for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) { @@ -5565,7 +5578,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI } //下拉选中英文转换 // transition(dataListEn,projectCertificationInventoryEO); - workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOEn.class, dataListEn); + workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOEnPlatform.class, dataListEn); } } workbook.write(excelOS); 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 016f7b15e..f09d765ef 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 @@ -1649,6 +1649,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl regulationOwnerId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); projectLawsInventoryEO.setRegulationOwnerName(regulationOwnerName); + projectLawsInventoryEO.setRegulationOwnerIdName(regulationOwnerName); } String engineeringInterfacePerson = projectLawsInventoryEO.getEngineeringInterfacePerson(); if (StringUtils.isNotEmpty(engineeringInterfacePerson)) { @@ -8830,6 +8831,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl正序, 2->倒序) + @TableField(exist = false) + private String orderBy; + + //排序字段 + @TableField(exist = false) + private String orderByField; + + /**清单校核截止时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "清单校核截止时间") + private Date inventoryVerifyEndTime; + + /**责任确认截止时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "责任确认截止时间") + private Date taskConfirmEndTime; + + /**认证类型*/ + @ApiModelProperty(value = "认证类型") + private String attestationType; + + /**一级责任领域**/ + @TableField(exist = false) + private String firstLevelDutyTerritory; + + @ApiModelProperty(value = "关联平台件数据") + @TableField(exist = false) + private List projectCertificationInventoryEOS; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 1092df44a..042171f70 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -186,6 +186,10 @@ public class ProjectLawsInventoryEO implements Serializable { @ApiModelProperty(value = "法规工程师名称") private String regulationOwnerName;//法规工程师名称 + @TableField(exist = false) + @ApiModelProperty(value = "法规工程师名称(前端指定要的)") + private String regulationOwnerIdName;//法规工程师名称(前端指定要的) + /**认证工程师id*/ @ApiModelProperty(value = "认证工程师id") private String homologationEngineerId;