From b4061eccc46e4e486b736c23692b2d5b5c43d07d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 25 Sep 2023 16:28:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E4=B8=8B=E6=8B=89=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rojectCertificationInventoryEOServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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..ea4305ab3 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 @@ -1805,12 +1805,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); } From fe206a0935492ba4db2321cefc215e5eaf75802c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 25 Sep 2023 16:42:44 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PlatformProjectLawsInventoryEOServiceImpl.java | 1 + .../jero/modules/project/entity/ProjectLawsInventoryEO.java | 4 ++++ 2 files changed, 5 insertions(+) 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..c3b4cf27c 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)) { 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; From d880ff6adef0e85f2bb03729b7f47ab2942ac7d4 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 25 Sep 2023 17:08:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 12 +- ...tionInventoryDutyEnginnerEOEnPlatform.java | 218 +++++++++++++++ ...cationInventoryDutyEnginnerEOPlatform.java | 218 +++++++++++++++ ...ectCertificationInventoryEOEnPlatform.java | 224 +++++++++++++++ ...ojectCertificationInventoryEOPlatform.java | 264 ++++++++++++++++++ 5 files changed, 932 insertions(+), 4 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java 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 ea4305ab3..7e9dd96f1 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; @@ -5547,9 +5551,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) || @@ -5560,7 +5564,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) { @@ -5570,7 +5574,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/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java new file mode 100644 index 000000000..e76c51206 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEnPlatform.java @@ -0,0 +1,218 @@ +package com.jero.modules.project.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + + +/** + * @Description: 认证清单工程接口人和责任人导出类 + * @Author: jero-boot + * @Date: 2023-03-03 + * @Version: V1.0 + */ +@Data +@TableName("project_certification_inventory") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表") +public class ProjectCertificationInventoryDutyEnginnerEOEnPlatform implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**类别*/ + @Excel(name = "Category", width = 20) + @ApiModelProperty(value = "类别") + private String category; + + /**检验项目*/ + @Excel(name = "Inspection Items", width = 20) + @ApiModelProperty(value = "检验项目") + private String inspectionItem; + + /**配置项*/ + @ApiModelProperty(value = "配置项") + @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") + private String configItem; + + /**WVTA ID*/ + @Excel(name = "WVTA ID", width = 20) + @ApiModelProperty(value = "WVTA ID") + private String wvtaId; + + /**标准编号*/ + @Excel(name = "Standard No", width = 20) + @ApiModelProperty(value = "标准编号") + private String serialNumber; + + /**责任领域*/ + @ApiModelProperty(value = "责任领域") + private String dutyTerritory; + /**责任领域名称**/ + @Excel(name = "Responsible Field", width = 20) + @TableField(exist = false) + private String dutyTerritoryName; + /**责任领域名称-英文**/ + @TableField(exist = false) + private String dutyTerritoryNameEn; + + /**工程接口人*/ + @ApiModelProperty(value = "工程接口人") + private String sdt; + /**工程接口人名称**/ + @Excel(name = "Eng. Interface", width = 20) + @TableField(exist = false) + private String sdtName; + + /**责任人*/ + @ApiModelProperty(value = "责任人") + private String dutyPerson; + /**责任人名称**/ + @Excel(name = "Assignee", width = 20) + @TableField(exist = false) + private String dutyPersonName; + + /**交付物模板*/ + @ApiModelProperty(value = "交付物模板") + private String deliverableTemplate; + /**交付物模板名称**/ + @TableField(exist = false) + @Excel(name = "Deliverable Template", width = 40) + private String deliverableTemplateName; + + /**交付物类型*/ + @ApiModelProperty(value = "交付物类型") + private String deliverableType; + // 交付物类型名称 + @Excel(name = "Deliverable Type", width = 20) + @TableField(exist = false) + private String deliverableTypeName; + // 交付物类型名称-英文 + @TableField(exist = false) + private String deliverableTypeNameEn; + + /**交付物*/ +// @Excel(name = "交付物", width = 15) + @ApiModelProperty(value = "交付物") + private String deliverable; + + /**文档库id*/ +// @Excel(name = "文档库id", width = 15) + @ApiModelProperty(value = "文档库id") + private String bussDocumentLibraryId; + + + + /**交付结果*/ + @Excel(name = "Deliverables Result", width = 20) + @ApiModelProperty(value = "交付结果") + private String deliveryResult; + + /**截止日期*/ + @Excel(name = "Due Date", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "截止日期") + private java.util.Date endTime; + + /**流程状态*/ + @ApiModelProperty(value = "流程状态") + private String flowStatus; + // 流程状态展示名称 + @Excel(name = "Process Status", width = 20) + @TableField(exist = false) + private String flowStatusName; + + /**报告编号*/ +// @Excel(name = "Report No", width = 20) + @ApiModelProperty(value = "报告编号") + private String reportNumber; + + /**产品型号*/ +// @Excel(name = "Product Model", width = 20) + @ApiModelProperty(value = "产品型号") + private String productModel; + + /**生产企业名称*/ +// @Excel(name = "Name Of Manufacturer", width = 40) + @ApiModelProperty(value = "生产企业名称") + private String productionEnterpriseName; + + /**认证进度*/ + + @ApiModelProperty(value = "认证进度") + private String certificationProgress; + + /**认证进度展示名称**/ + @TableField(exist = false) +// @Excel(name = "Homologation Progress", width = 40) + private String certificationProgress_dictText; + + // @Excel(name = "认证进度备注", width = 15) + @ApiModelProperty(value = "认证进度备注") + private String certificationProgressRemark; + + /**项目库id*/ + @ApiModelProperty(value = "项目库id") + private String projectLibraryId; + + @TableField(exist = false) + private String cut; + + @TableField(exist = false) + private String ids; + + @TableField(exist = false) + private String roleCode; + + /**值类型，对应SysCategoryValueTypeEnum中value**/ + @TableField(exist = false) + private String valueType; + + @TableField(exist = false) + private String excelName; + + // @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") + @TableField(exist = false) + private String endTimeStr; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java new file mode 100644 index 000000000..9a75018d5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOPlatform.java @@ -0,0 +1,218 @@ +package com.jero.modules.project.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + + +/** + * @Description: 认证清单工程接口人和责任人导出类 + * @Author: jero-boot + * @Date: 2023-03-03 + * @Version: V1.0 + */ +@Data +@TableName("project_certification_inventory") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表") +public class ProjectCertificationInventoryDutyEnginnerEOPlatform implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**类别*/ + @Excel(name = "类别", width = 20) + @ApiModelProperty(value = "类别") + private String category; + + /**检验项目*/ + @Excel(name = "检验项目", width = 20) + @ApiModelProperty(value = "检验项目") + private String inspectionItem; + + /**配置项*/ + @ApiModelProperty(value = "配置项") + @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") + private String configItem; + + /**WVTA ID*/ + @Excel(name = "WVTA ID", width = 20) + @ApiModelProperty(value = "WVTA ID") + private String wvtaId; + + /**标准编号*/ + @Excel(name = "标准编号", width = 20) + @ApiModelProperty(value = "标准编号") + private String serialNumber; + + /**责任领域*/ + @ApiModelProperty(value = "责任领域") + private String dutyTerritory; + /**责任领域名称**/ + @Excel(name = "责任领域", width = 20) + @TableField(exist = false) + private String dutyTerritoryName; + /**责任领域名称-英文**/ + @TableField(exist = false) + private String dutyTerritoryNameEn; + + /**工程接口人*/ + @ApiModelProperty(value = "工程接口人") + private String sdt; + /**工程接口人名称**/ + @Excel(name = "工程接口人", width = 20) + @TableField(exist = false) + private String sdtName; + + /**责任人*/ + @ApiModelProperty(value = "责任人") + private String dutyPerson; + /**责任人名称**/ + @Excel(name = "责任人", width = 20) + @TableField(exist = false) + private String dutyPersonName; + + /**交付物模板*/ + @ApiModelProperty(value = "交付物模板") + private String deliverableTemplate; + /**交付物模板名称**/ + @TableField(exist = false) + @Excel(name = "交付物模板", width = 20) + private String deliverableTemplateName; + + /**交付物类型*/ + @ApiModelProperty(value = "交付物类型") + private String deliverableType; + // 交付物类型名称 + @Excel(name = "交付物类型", width = 20) + @TableField(exist = false) + private String deliverableTypeName; + // 交付物类型名称-英文 + @TableField(exist = false) + private String deliverableTypeNameEn; + + /**交付物*/ +// @Excel(name = "交付物", width = 15) + @ApiModelProperty(value = "交付物") + private String deliverable; + + /**文档库id*/ +// @Excel(name = "文档库id", width = 15) + @ApiModelProperty(value = "文档库id") + private String bussDocumentLibraryId; + + + + /**交付结果*/ + @Excel(name = "交付结果", width = 20) + @ApiModelProperty(value = "交付结果") + private String deliveryResult; + + /**截止日期*/ + @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "截止日期") + private Date endTime; + /**流程状态*/ + @ApiModelProperty(value = "流程状态") + private String flowStatus; + // 流程状态展示名称 + @Excel(name = "流程状态", width = 20) + @TableField(exist = false) + private String flowStatusName; + + /**报告编号*/ +// @Excel(name = "报告编号", width = 20) + @ApiModelProperty(value = "报告编号") + private String reportNumber; + + /**产品型号*/ +// @Excel(name = "产品型号", width = 20) + @ApiModelProperty(value = "产品型号") + private String productModel; + + /**生产企业名称*/ +// @Excel(name = "生产企业名称", width = 20) + @ApiModelProperty(value = "生产企业名称") + private String productionEnterpriseName; + + /**认证进度*/ + + @ApiModelProperty(value = "认证进度") + private String certificationProgress; + + /**认证进度展示名称**/ +// @Excel(name = "认证进度", width = 20) + @TableField(exist = false) + private String certificationProgress_dictText; + +// @Excel(name = "认证进度备注", width = 15) + @ApiModelProperty(value = "认证进度备注") + private String certificationProgressRemark; + + /**项目库id*/ + @ApiModelProperty(value = "项目库id") + private String projectLibraryId; + + @TableField(exist = false) + private String cut; + + @TableField(exist = false) + private String ids; + + @TableField(exist = false) + private String roleCode; + + /**值类型，对应SysCategoryValueTypeEnum中value**/ + @TableField(exist = false) + private String valueType; + + @TableField(exist = false) + private String excelName; + +// @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd") + @TableField(exist = false) + private String endTimeStr; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java new file mode 100644 index 000000000..96ea4494c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEnPlatform.java @@ -0,0 +1,224 @@ +package com.jero.modules.project.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + + +/** + * @Description: 项目库-认证清单表 + * @Author: jero-boot + * @Date: 2023-03-03 + * @Version: V1.0 + */ +@Data +@TableName("project_certification_inventory") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表") +public class ProjectCertificationInventoryEOEnPlatform implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**类别*/ + @Excel(name = "Category", width = 20) + @ApiModelProperty(value = "类别") + private String category; + + /**检验项目*/ + @Excel(name = "Inspection Items", width = 20) + @ApiModelProperty(value = "检验项目") + private String inspectionItem; + + /**配置项*/ + @ApiModelProperty(value = "配置项") + @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") + private String configItem; + + /**认证类型*/ + @Excel(name = "Certification Type", width = 20) + @ApiModelProperty(value = "认证类型") + @TableField(exist = false) + private String attestationTypeName; + + /**WVTA ID*/ + @Excel(name = "WVTA ID", width = 20) + @ApiModelProperty(value = "WVTA ID") + private String wvtaId; + + /**标准编号*/ + @Excel(name = "Standard No", width = 20) + @ApiModelProperty(value = "标准编号") + private String serialNumber; + + /**责任领域*/ + @ApiModelProperty(value = "责任领域") + private String dutyTerritory; + /**责任领域名称**/ + @Excel(name = "Responsible Field", width = 20) + @TableField(exist = false) + private String dutyTerritoryName; + /**责任领域名称-英文**/ + @TableField(exist = false) + private String dutyTerritoryNameEn; + + /**工程接口人*/ + @ApiModelProperty(value = "工程接口人") + private String sdt; + /**工程接口人名称**/ + @Excel(name = "Eng. Interface", width = 20) + @TableField(exist = false) + private String sdtName; + + /**责任人*/ + @ApiModelProperty(value = "责任人") + private String dutyPerson; + /**责任人名称**/ + @Excel(name = "Assignee", width = 20) + @TableField(exist = false) + private String dutyPersonName; + + /**交付物模板*/ + @ApiModelProperty(value = "交付物模板") + private String deliverableTemplate; + /**交付物模板名称**/ + @TableField(exist = false) + @Excel(name = "Deliverable Template", width = 40) + private String deliverableTemplateName; + + /**交付物类型*/ + @ApiModelProperty(value = "交付物类型") + private String deliverableType; + // 交付物类型名称 + @Excel(name = "Deliverable Type", width = 20) + @TableField(exist = false) + private String deliverableTypeName; + // 交付物类型名称-英文 + @TableField(exist = false) + private String deliverableTypeNameEn; + + /**交付物*/ +// @Excel(name = "交付物", width = 15) + @ApiModelProperty(value = "交付物") + private String deliverable; + + /**文档库id*/ +// @Excel(name = "文档库id", width = 15) + @ApiModelProperty(value = "文档库id") + private String bussDocumentLibraryId; + + + + /**交付结果*/ + @Excel(name = "Deliverables Result", width = 20) + @ApiModelProperty(value = "交付结果") + private String deliveryResult; + + /**截止日期*/ + @Excel(name = "Due Date", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "截止日期") + private java.util.Date endTime; + + /**流程状态*/ + @ApiModelProperty(value = "流程状态") + private String flowStatus; + // 流程状态展示名称 + @Excel(name = "Process Status", width = 20) + @TableField(exist = false) + private String flowStatusName; + + /**报告编号*/ + @Excel(name = "Report No", width = 20) + @ApiModelProperty(value = "报告编号") + private String reportNumber; + + /**产品型号*/ + @Excel(name = "Product Model", width = 20) + @ApiModelProperty(value = "产品型号") + private String productModel; + + /**生产企业名称*/ + @Excel(name = "Name Of Manufacturer", width = 40) + @ApiModelProperty(value = "生产企业名称") + private String productionEnterpriseName; + + /**认证进度*/ + + @ApiModelProperty(value = "认证进度") + private String certificationProgress; + + /**认证进度展示名称**/ + @TableField(exist = false) + private String certificationProgress_dictText; + + // @Excel(name = "认证进度备注", width = 15) + @ApiModelProperty(value = "认证进度备注") + private String certificationProgressRemark; + + /**项目库id*/ + @ApiModelProperty(value = "项目库id") + private String projectLibraryId; + + @TableField(exist = false) + private String cut; + + @TableField(exist = false) + private String ids; + + @TableField(exist = false) + private String roleCode; + + /**值类型，对应SysCategoryValueTypeEnum中value**/ + @TableField(exist = false) + private String valueType; + + @TableField(exist = false) + private String excelName; + + // @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") + @TableField(exist = false) + private String endTimeStr; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java new file mode 100644 index 000000000..2acf6a6a1 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOPlatform.java @@ -0,0 +1,264 @@ +package com.jero.modules.project.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * @Description: 项目库-认证清单表 + * @Author: jero-boot + * @Date: 2023-03-03 + * @Version: V1.0 + */ +@Data +@TableName("project_certification_inventory") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表") +public class ProjectCertificationInventoryEOPlatform implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**类别*/ + @Excel(name = "类别", width = 20) + @ApiModelProperty(value = "类别") + private String category; + + /**检验项目*/ + @Excel(name = "检验项目", width = 20) + @ApiModelProperty(value = "检验项目") + private String inspectionItem; + + /**配置项*/ + @ApiModelProperty(value = "配置项") + @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") + private String configItem; + + /**认证类型名称**/ + @Excel(name = "认证类型", width = 20) + @TableField(exist = false) + private String attestationTypeName; + + /**WVTA ID*/ + @Excel(name = "WVTA ID", width = 20) + @ApiModelProperty(value = "WVTA ID") + private String wvtaId; + + /**标准编号*/ + @Excel(name = "标准编号", width = 20) + @ApiModelProperty(value = "标准编号") + private String serialNumber; + + /**责任领域*/ + @ApiModelProperty(value = "责任领域") + private String dutyTerritory; + /**责任领域名称**/ + @Excel(name = "责任领域", width = 20) + @TableField(exist = false) + private String dutyTerritoryName; + /**责任领域名称-英文**/ + @TableField(exist = false) + private String dutyTerritoryNameEn; + + /**责任部门*/ + @ApiModelProperty(value = "责任部门") + private String dutyDepart; + /**工程接口人*/ + @ApiModelProperty(value = "工程接口人") + private String sdt; + /**工程接口人名称**/ + @Excel(name = "工程接口人", width = 20) + @TableField(exist = false) + private String sdtName; + + /**责任人*/ + @ApiModelProperty(value = "责任人") + private String dutyPerson; + /**责任人名称**/ + @Excel(name = "责任人", width = 20) + @TableField(exist = false) + private String dutyPersonName; + + /**交付物模板*/ + @ApiModelProperty(value = "交付物模板") + private String deliverableTemplate; + /**交付物模板名称**/ + @TableField(exist = false) + @Excel(name = "交付物模板", width = 20) + private String deliverableTemplateName; + + /**交付物类型*/ + @ApiModelProperty(value = "交付物类型") + private String deliverableType; + // 交付物类型名称 + @Excel(name = "交付物类型", width = 20) + @TableField(exist = false) + private String deliverableTypeName; + // 交付物类型名称-英文 + @TableField(exist = false) + private String deliverableTypeNameEn; + + /**交付物*/ +// @Excel(name = "交付物", width = 15) + @ApiModelProperty(value = "交付物") + private String deliverable; + + /**文档库id*/ +// @Excel(name = "文档库id", width = 15) + @ApiModelProperty(value = "文档库id") + private String bussDocumentLibraryId; + + + + /**交付结果*/ + @Excel(name = "交付结果", width = 20) + @ApiModelProperty(value = "交付结果") + private String deliveryResult; + + /**截止日期*/ + @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "截止日期") + private Date endTime; + /**流程状态*/ + @ApiModelProperty(value = "流程状态") + private String flowStatus; + // 流程状态展示名称 + @Excel(name = "流程状态", width = 20) + @TableField(exist = false) + private String flowStatusName; + + /**报告编号*/ + @Excel(name = "报告编号", width = 20) + @ApiModelProperty(value = "报告编号") + private String reportNumber; + + /**产品型号*/ + @Excel(name = "产品型号", width = 20) + @ApiModelProperty(value = "产品型号") + private String productModel; + + /**生产企业名称*/ + @Excel(name = "生产企业名称", width = 20) + @ApiModelProperty(value = "生产企业名称") + private String productionEnterpriseName; + + /**认证进度*/ + @ApiModelProperty(value = "认证进度") + private String certificationProgress; + + // 认证进度排序字段 + @TableField(exist = false) + private String certificationProgressNumber; + + /**认证进度展示名称**/ + @TableField(exist = false) + private String certificationProgress_dictText; + +// @Excel(name = "认证进度备注", width = 15) + @ApiModelProperty(value = "认证进度备注") + private String certificationProgressRemark; + + /**项目库id*/ + @ApiModelProperty(value = "项目库id") + private String projectLibraryId; + + @TableField(exist = false) + private String cut; + + @TableField(exist = false) + private String ids; + + @TableField(exist = false) + private String roleCode; + + /**值类型，对应SysCategoryValueTypeEnum中value**/ + @TableField(exist = false) + private String valueType; + + @TableField(exist = false) + private String excelName; + +// @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd") + @TableField(exist = false) + private String endTimeStr; + + @TableField(exist = false) + private String reasonForReturn; + + //排序（1->正序， 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; +} From 973809184692009e26dabcf10e4d5b885949d432 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 25 Sep 2023 17:17:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...latformProjectCertificationInventoryEOServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 7e9dd96f1..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 @@ -536,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()); @@ -793,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()); } From 2a63464f1e1d158267515d9148fa65eb5f204220 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 25 Sep 2023 17:59:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PlatformProjectLawsInventoryEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 c3b4cf27c..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 @@ -8831,6 +8831,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl