From 8aaa0b02879246ac25453eaf6b0558aecc442b8e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 9 Oct 2023 18:05:14 +0800 Subject: [PATCH] =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/PlatformProjectLibraryBaseMapper.xml | 28 +++++++++++++++++++ ...PlatformProjectLibraryBaseServiceImpl.java | 24 ++++++++++++++++ .../project/entity/ProjectLibraryBase.java | 9 ++++-- 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml index 950018869..39c14ed4e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/mapper/xml/PlatformProjectLibraryBaseMapper.xml @@ -52,6 +52,34 @@ plb.sort, plb.flag, plb.brand, + plb.power, + plb.producer, + plb.duty_depart, + plb.regulation_owner_id, + plb.engineering_interface_person, + plb.brand_label, + plb.product_model, + plb.cell_enterprise, + plb.assembly_enterprise, + plb.part_number_cn, + plb.part_number_en, + plb.filing_code, + plb.supplier_code, + plb.product_type_code, + plb.battery_type_code, + plb.specification_code, + plb.traceability_code, + plb.ymd_number, + plb.size, + plb.rated_capacity, + plb.nominal_voltage, + plb.rated_mass, + plb.module_number, + plb.connection_type, + plb.module_specification_code, + plb.cooling_method, + plb.filing_completion_time, + plb.remark, sdi.item_text brandText, sdi.en_name brandTextEn from project_library_base as plb diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java index 1a2b323e6..ddfb25845 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java @@ -47,6 +47,7 @@ import com.jero.modules.project.enums.DesignComplianceStatusEnum; import com.jero.modules.project.enums.HSStatisticalNodesEnum; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.PermissionDescriptionEnum; +import com.jero.modules.project.enums.ProjectInventoryFieldEnum; import com.jero.modules.project.enums.ProjectRoleEnum; import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum; import com.jero.modules.project.enums.ProjectUserLocationEnum; @@ -1474,6 +1475,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl records,String cut,boolean disposeTargetMarketFlag) { List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + List sysUserList = getSysUserList(records); for (ProjectLibraryBase projectLibraryBase : records) { List sysUsers = new ArrayList<>(); //认证工程师多个id查询 @@ -1504,6 +1506,28 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl collect = sysUserList.stream() + .filter(e -> e.getId().equals(projectLibraryBase.getRegulationOwnerId())).collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect)){ + projectLibraryBase.setRegulationOwnerIdName(collect.get(0).getUsername()); + } + } + //工程接口人 + if(StringUtils.isNotBlank(projectLibraryBase.getEngineeringInterfacePerson())){ + List collect = sysUserList.stream() + .filter(e -> e.getId().equals(projectLibraryBase.getEngineeringInterfacePerson())).collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect)){ + projectLibraryBase.setEngineeringInterfacePersonName(collect.get(0).getUsername()); + } + } + //责任部门 + if(StringUtils.isNotBlank(projectLibraryBase.getDutyDepart())){ + List sysDictItems = sysDictItemServiceImpl.getBaseMapper().selectItemsAll(); + String dutyDepartName = platformProjectLawsInventoryEOService.disposeShowDictItemValue(sysDictItems, projectLibraryBase.getDutyDepart(), cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); + projectLibraryBase.setDutyDepartName(dutyDepartName); + } if(disposeTargetMarketFlag){ if(StringUtils.isNotEmpty(projectLibraryBase.getTargetMarket())){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index c88c5812e..a26c94a13 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -175,6 +175,9 @@ public class ProjectLibraryBase implements Comparable { @ApiModelProperty(value = "责任部门") private String dutyDepart; + @TableField(exist = false) + private String dutyDepartName; + @ApiModelProperty(value = "法规工程师") private String regulationOwnerId; @@ -205,7 +208,7 @@ public class ProjectLibraryBase implements Comparable { private String partNumberCn; @ApiModelProperty(value = "零件号（国外）") - private String part_numberEn; + private String partNumberEn; @ApiModelProperty(value = "24位备案码") private String filingCode; @@ -253,7 +256,9 @@ public class ProjectLibraryBase implements Comparable { private String coolingMethod; @ApiModelProperty(value = "备案完成时间") - private String filingCompletionTime; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private java.util.Date filingCompletionTime; @ApiModelProperty(value = "备注") private String remark;