fix(jg)：修改生产环境车用气瓶Bug

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgVehicleInformationDto.java

@@ -50,7 +50,6 @@ public class JgVehicleInformationDto extends BaseDto {
 
     @ApiModelProperty(value = "终审通过时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonSerialize(using = BizCustomDateSerializer.class)
     private String auditPassDate;
 
     @ApiModelProperty(value = "登记类别")
@@ -58,7 +57,6 @@ public class JgVehicleInformationDto extends BaseDto {
 
     @ApiModelProperty(value = "注册登记日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonSerialize(using = BizCustomDateSerializer.class)
     private String regDate;
 
     @ApiModelProperty(value = "注册登记人员ID")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -139,6 +139,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     private ESEquipmentCategory esEquipmentCategory;
     @Autowired
     private JgResumeInfoServiceImpl jgResumeInfoService;
+    @Autowired
+    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
     private Map<String, Object> fillingMediumMap;
 
@@ -513,8 +515,17 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             vo.setSafetyManagerId(dto.getSafetyManagerId() + "_" + dto.getSafetyManagerName());
         }
         //产权单位
-        if (!ValidationUtil.isEmpty(dto.getEstateUnitCreditCode()) && !ValidationUtil.isEmpty(dto.getEstateUnitName())) {
-            vo.setEstateUnitName(dto.getEstateUnitCreditCode() + "_" + dto.getEstateUnitName());
+        //if (!ValidationUtil.isEmpty(dto.getEstateUnitCreditCode()) && !ValidationUtil.isEmpty(dto.getEstateUnitName())) {
+        //    vo.setEstateUnitName(dto.getEstateUnitCreditCode() + "_" + dto.getEstateUnitName());
+        //}
+        TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>()
+                .eq("use_unit_code", dto.getEstateUnitCreditCode())
+        );
+
+        if (useCodeResult != null) {
+            String result = dto.getEstateUnitCreditCode() + "_" + dto.getEstateUnitName() + ("个人主体".equals(useCodeResult.getUnitType())
+                            ? "_" + dto.getEstateUnitCreditCode().substring(dto.getEstateUnitCreditCode().length() - 4): "");
+            vo.setEstateUnitName(result);
         }
 
         vo.setIdCardFront(ObjectUtils.isEmpty(dto.getIdCardFront()) ? null : JSON.parseArray(dto.getIdCardFront()));