Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

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

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<PlatformP
 	@Override
 	public void disposeData(List<ProjectLibraryBase> records,String cut,boolean disposeTargetMarketFlag) {
 		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+		List<SysUser> sysUserList = getSysUserList(records);
 		for (ProjectLibraryBase projectLibraryBase : records) {
 			List<SysUser> sysUsers = new ArrayList<>();
 			//认证工程师多个id查询
@@ -1504,6 +1506,28 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 					}
 				}
 			}
+			//法规工程师
+			if(StringUtils.isNotBlank(projectLibraryBase.getRegulationOwnerId())){
+				List<SysUser> 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<SysUser> 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<SysDictItem> 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())){

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java

@@ -175,6 +175,9 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
     @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<ProjectLibraryBase> {
     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<ProjectLibraryBase> {
     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;