Merge remote-tracking branch 'origin/v1.1.6.3_20240808_现场问题修复' into v1.1.6.3_20240808_现场问题修复

amos-boot-data/amos-boot-data-accessapi/pom.xml

@@ -171,7 +171,6 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.7.22</version>
         </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.yeejoin</groupId>-->

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/pom.xml

@@ -25,7 +25,6 @@
       <dependency>
           <groupId>cn.hutool</groupId>
           <artifactId>hutool-all</artifactId>
-          <version>5.8.16</version>
       </dependency>
   </dependencies>
 </project>

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

@@ -179,7 +179,7 @@ public class EquipInfoCylinderExcelDto extends BaseDto {
     @ApiModelProperty(value = "型号")
     private String modelNumber;
 
-    @ExcelProperty(value = "充装介质", index = 31, converter = ChargingMediumConverter.class)
+    @ExcelProperty(value = "充装介质", index = 31)
     @ApiModelProperty(value = "充装介质")
     @NotBlank(message = "充装介质不能为空")
     private String chargingMedium;

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

@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -143,8 +142,9 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "申请日期，接收查询参数")
     private String applicationDate;
 
-
     @ApiModelProperty(value = "使用登记证id，多个逗号分割")
     private String registrationManageId;
 
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
 }

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

@@ -90,6 +90,9 @@ public class JgUseRegistrationDto extends BaseDto {
     @ApiModelProperty(value = "创建人ID")
     private String createUserId;
 
+    @ApiModelProperty(value = "创建人姓名")
+    private String createUserName;
+
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java

@@ -184,4 +184,10 @@ public class JgScrapCancel extends BaseEntity {
     @TableField(value = "other_accessories")
     private String otherAccessories;
 
+    /**
+     * 创建人
+     */
+    @TableField("create_user_name")
+    private String createUserName;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -134,6 +134,12 @@ public class JgUseRegistration extends BaseEntity {
     private String createUserId;
 
     /**
+     * 创建人姓名
+     */
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
      * 创建时间
      */
 	@TableField("create_date")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -976,7 +976,11 @@
                 and date_ge(CAST(a.accept_date as date),#{dto.beginDate})
                 and date_le(CAST(a.accept_date as date),#{dto.endDate})
         union all
-        SELECT  count(1) FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
+            SELECT SUM(num) FROM (
+                   SELECT  count(1) AS num FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
+                   union all
+                   SELECT  count(1) AS num FROM "tzs_jg_vehicle_information" where org_branch_code like CONCAT(#{orgCode}, '%') and status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
+               )
         union all
             SELECT
                 count(1)
@@ -990,15 +994,17 @@
                 and  date_ge(CAST(a.accept_date as date),#{dto.beginDate})
                 and date_le(CAST(a.accept_date as date),#{dto.endDate})
         union all
-        select sum(num) from (
-        select count(1) as num  from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status = '已完成' and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(a.audit_pass_date as date),#{dto.endDate})
-        union all
-        SELECT count(1) as num FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
-        union all
-        SELECT count(1) as num  FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
-        union all
-        SELECT count(1) as num  FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
-        )
+            SELECT sum(num) FROM (
+                select count(1) as num  from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status = '已完成' and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(a.audit_pass_date as date),#{dto.endDate})
+                union all
+                SELECT count(1) as num FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
+                union all
+                SELECT count(1) as num  FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
+                union all
+                SELECT count(1) as num  FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
+                union all
+                SELECT count(1) as num  FROM "tzs_jg_change_vehicle_registration_unit" where org_branch_code like CONCAT(#{orgCode}, '%') and status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
+            )
         union all
         select count(1) from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status = '已完成' and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(a.audit_pass_date as date),#{dto.endDate})
     </select>
@@ -1018,7 +1024,11 @@
                  and date_ge(CAST(a.application_date as date),#{dto.beginDate})
                  and date_le(CAST(a.application_date as date),#{dto.endDate})
         union all
-        SELECT  count(1) FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_le(CAST(reg_date as date),#{dto.endDate})
+            SELECT SUM(num) FROM (
+                  SELECT  count(1) as num FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_le(CAST(reg_date as date),#{dto.endDate})
+                  union all
+                  SELECT  count(1) as num FROM "tzs_jg_vehicle_information" where org_branch_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status != '已完成' and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_le(CAST(reg_date as date),#{dto.endDate})
+            )
         union all
             SELECT
                 count(1)
@@ -1034,13 +1044,15 @@
                  and date_le(CAST(a.application_date as date),#{dto.endDate})
         union all
         select sum(num) from (
-        select count(1) as num  from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位已撤回' and a.audit_status != '使用单位待提交' and  a.audit_status !='已作废' and a.audit_status !='已完成' and date_ge(CAST(a.apply_date as date),#{dto.beginDate}) and date_le(CAST(a.apply_date as date),#{dto.endDate})
-        union all
-        SELECT count(1) as num FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status  != '使用单位已撤回' and audit_status  != '已作废'  and audit_status  != '已完成' and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_le(CAST(reg_date as date),#{dto.endDate})
-        union all
-        SELECT count(1) as num  FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status  != '使用单位已撤回' and audit_status  != '已作废'  and audit_status  != '已完成' and  date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_le(CAST(reg_date as date),#{dto.endDate})
-        union all
-        SELECT count(1) as num  FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status  != '使用单位待提交' and status  != '使用单位已撤回' and status != '已作废' and status != '已完成' and date_ge(CAST(apply_date as date),#{dto.beginDate}) and date_le(CAST(apply_date as date),#{dto.endDate})
+                select count(1) as num  from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位已撤回' and a.audit_status != '使用单位待提交' and  a.audit_status !='已作废' and a.audit_status !='已完成' and date_ge(CAST(a.apply_date as date),#{dto.beginDate}) and date_le(CAST(a.apply_date as date),#{dto.endDate})
+                union all
+                SELECT count(1) as num FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status  != '使用单位已撤回' and audit_status  != '已作废'  and audit_status  != '已完成' and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_le(CAST(reg_date as date),#{dto.endDate})
+                union all
+                SELECT count(1) as num  FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status  != '使用单位已撤回' and audit_status  != '已作废'  and audit_status  != '已完成' and  date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_le(CAST(reg_date as date),#{dto.endDate})
+                union all
+                SELECT count(1) as num  FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status  != '使用单位待提交' and status  != '使用单位已撤回' and status != '已作废' and status != '已完成' and date_ge(CAST(apply_date as date),#{dto.beginDate}) and date_le(CAST(apply_date as date),#{dto.endDate})
+                union all
+                SELECT count(1) as num  FROM "tzs_jg_change_vehicle_registration_unit" where org_branch_code like CONCAT(#{orgCode}, '%') and status  != '使用单位待提交' and status  != '使用单位已撤回' and status != '已作废' and status != '已完成' and date_ge(CAST(apply_date as date),#{dto.beginDate}) and date_le(CAST(apply_date as date),#{dto.endDate})
         )
         union all
         select count(1) from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位待提交' and a.audit_status  != '使用单位已撤回' and a.audit_status  != '已作废' and a.audit_status  != '已完成' and date_ge(CAST(a.create_date as date),#{dto.beginDate}) and date_le(CAST(a.create_date as date),#{dto.endDate})

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/DPStatisticsMapper.xml

@@ -535,6 +535,7 @@
                 INNER JOIN privilege_company C ON A.receive_company_code = C.company_code
         WHERE
             C.org_code LIKE concat ( #{orgCode}, '%' )
+        and A.certificate_status = '已登记'
     </select>
 
     <select id="useCountByOrgCode" resultType="java.lang.Long">
@@ -543,20 +544,20 @@
         FROM
             tzs_jg_use_registration T
         WHERE
-            T.audit_status = '已完成'
+            T.status = '已完成'
             AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
     </select>
     <select id="over15yearsCount" resultType="java.lang.Long">
-        SELECT COUNT
-            ( 1 )
+        SELECT
+            count(1)
         FROM
-            idx_biz_jg_factory_info A
-            INNER JOIN idx_biz_jg_supervision_info B ON A.RECORD = B.RECORD
-            INNER JOIN idx_biz_jg_register_info C ON A.RECORD = C.RECORD
+            tzs_jg_use_registration thur
+            LEFT JOIN tzs_jg_use_registration_eq thure ON thure.equip_transfer_id = thur.sequence_nbr
+            LEFT JOIN idx_biz_jg_register_info ibjri ON ibjri."RECORD" = thure.equ_id
         WHERE
-            B.ORG_BRANCH_CODE LIKE CONCAT ( #{orgCode}, '%' )
-            AND A.PRODUCE_DATE &lt; #{time}
-            AND C.EQU_LIST = '3000'
+            thur.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
+            AND thur.audit_pass_date &lt; #{time}
+            AND ibjri."EQU_LIST" = '3000'
     </select>
     <select id="constructionNoticeCount" resultType="java.lang.Long">
         SELECT SUM
@@ -601,32 +602,32 @@
                 SELECT COUNT
                            ( 1 )
                 FROM
-                    privilege_company pc
-                        INNER JOIN tzs_jg_change_registration_name crn ON crn.receive_org_code = pc.company_code
-                        AND crn.audit_status = '已完成'
+                    tzs_jg_change_registration_name crn left join privilege_company pc
+                    ON crn.receive_org_code = pc.company_code
+                    AND crn.audit_status = '已完成'
                 WHERE
-                    pc.org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION
+                    pc.org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
                 SELECT COUNT
                            ( 1 )
                 FROM
                     tzs_jg_change_registration_reform T
                 WHERE
                     T.audit_status = '已完成'
-                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION
+                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
                 SELECT COUNT
                            ( 1 )
                 FROM
                     tzs_jg_change_registration_transfer T
                 WHERE
                     T.audit_status = '已完成'
-                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION
+                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
                 SELECT COUNT
                            ( 1 )
                 FROM
                     tzs_jg_change_registration_unit T
                 WHERE
                     T.status = '已完成'
-                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION
+                  AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' ) UNION ALL
                 SELECT COUNT
                            ( 1 )
                 FROM

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgInstallationNoticeController.java

@@ -164,7 +164,5 @@ public class JgInstallationNoticeController extends BaseController {
     @GetMapping(value = "/historyDataRepair")
     public ResponseModel<Boolean> historyDataRepair() {
         return ResponseHelper.buildResponse(iJgInstallationNoticeService.historyDataRepair());
-
     }
-
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java

@@ -194,7 +194,10 @@ public class JgUseRegistrationManageController extends BaseController {
         if (company.getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             if (ValidationUtil.isEmpty(dto.getUseUnitCreditCode())) {
                 // 不传的话取当前登录单位的统一信用代码
-                dto.setUseUnitCreditCode(company.getCompanyCode());
+                // 个人主体特殊处理
+                dto.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                        company.getCompanyCode().split("_")[1] :
+                        company.getCompanyCode());
             }
         } else {
             dto.setReceiveCompanyCode(company.getCompanyCode());

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -41,10 +41,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
@@ -126,6 +123,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private static final String MANAGE_TYPE = "manageType";
     // 设备代码
     private static final String EQU_CODE = "EQU_CODE";
+    // 96333识别码
+    private static final String CODE96333 = "CODE96333";
     private static final String SEQUENCE_NBR = "SEQUENCE_NBR";
     private static final String FACTORY_NUM = "FACTORY_NUM";
     // 新增设备是否复制而来
@@ -172,6 +171,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     @Autowired
     RegistrationInfoMapper tzsJgRegistrationInfoMapper;
     @Autowired
+    OtherInfoMapper otherInfoMapper;
+    @Autowired
     IIdxBizJgUseInfoService idxBizJgUseInfoService;
     @Autowired
     IIdxBizJgDesignInfoService iIdxBizJgDesignInfoService;
@@ -307,6 +308,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             checkEquCodeUniqueness(equipmentInfoForm);
             // 车用气瓶业务里面的 产品编号 校验唯一性（产品编号在车用气瓶范围内全局唯一）
             checkFactoryNumUniqueness(equipmentInfoForm);
+            // 96333码 字段的唯一性校验
+            check96333Code(equipmentInfoForm);
         } catch (Exception e) {
             handleError(e, null);
         }
@@ -352,6 +355,18 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             throw new BadRequest("设备代码已存在，请重新输入！");
         }
     }
+    private void check96333Code(LinkedHashMap equipmentInfoForm) {
+        if(!ObjectUtils.isEmpty(equipmentInfoForm.get(CODE96333))){
+            // 根据96333码检查唯一性
+            LambdaQueryWrapper<OtherInfo> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(OtherInfo::getCode96333, equipmentInfoForm.get(CODE96333));
+            wrapper.ne(!ObjectUtils.isEmpty(equipmentInfoForm.get(SEQUENCE_NBR)), OtherInfo::getSequenceNbr, equipmentInfoForm.get(SEQUENCE_NBR));
+            Integer count = otherInfoMapper.selectCount(wrapper);
+            if (count > 0) {
+                throw new BadRequest("96333码已存在，请确认后重新输入！");
+            }
+        }
+    }
 
     private void checkFactoryNumUniqueness(LinkedHashMap equipmentInfoForm) {
         // 车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）
@@ -2479,6 +2494,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (!ObjectUtils.isEmpty(dto)) {
             long time = Timestamp.valueOf(map.get("REC_DATE").toString().substring(0, 19)).getTime();
             dto.setREC_DATE(time);
+            // 需要安装的设备 安装告知审批通过 清除设备的USC_UNIT_CREDIT_CODE安装单位信息
+            // 使用单位编辑 防止更新设备时将安改维单位信息更新到es中
+            CompanyBo company = getSelectedOrgInfo().getCompany();
+            if(CompanyTypeEnum.USE.getName().equals(company.getCompanyType())){
+                dto.setUSC_UNIT_CREDIT_CODE(null);
+                dto.setUSC_UNIT_NAME(null);
+            }
             esEquipmentCategory.save(dto);
         }
     }
@@ -2632,7 +2654,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     equCodeList.add(data.getEquCode());
                     factoryNumList.add("0".equals(data.getWhetherVehicleCylinder()) ? data.getFactoryNum() : null);
                 }
-
                 // 全部读取完成就调用该方法
                 @Override
                 public void doAfterAllAnalysed(AnalysisContext context) {
@@ -2692,6 +2713,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             if ("his".equals(equipInfoDto.getDataSource()) && "1".equals(data.getWhetherVehicleCylinder())) {
                 throw new BadRequest("车用气瓶历史设备不能批量导入!");
             }
+            if ("1".equals(data.getWhetherVehicleCylinder()) && !SPECIAL_CYLINDER.getCode().equals(equipInfoDto.getEquDefineCode())){
+                throw new BadRequest("车用气瓶只能选择特种气瓶进行导入!");
+            }
             String record = UUID.randomUUID().toString();
             List<Map<String, Object>> fileDataList = (List<Map<String, Object>>) (data.getFileData());
             String productPhoto = getUrlByKey(fileDataList, "PRODUCT_PHOTO");
@@ -2795,10 +2819,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             otherInfoList.add(otherInfo);
 
             // 技术参数
+            List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
+            Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataValue,
+                    DictionarieValueModel::getDictDataKey));
             IdxBizJgTechParamsVessel paramsVessel = new IdxBizJgTechParamsVessel();
             BeanUtils.copyProperties(data, paramsVessel);
             paramsVessel.setRecord(record);
             paramsVessel.setRecDate(new Date());
+            paramsVessel.setChargingMedium((String) fillingMediumMap.get(data.getChargingMedium()));
             paramsVesselList.add(paramsVessel);
 
             ESEquipmentCategoryDto esEquipmentDto = JSON.parseObject(toJSONString(data), ESEquipmentCategoryDto.class);
@@ -3156,4 +3184,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public List<Map<String, Object>> getProjectContraptionList(String useUnitCreditCode) {
         return this.baseMapper.getProjectContraptionList(useUnitCreditCode);
     }
+
+    private ReginParams getSelectedOrgInfo() {
+        return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+    }
 }
\ No newline at end of file

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/JgChangeRegistrationNameServiceImpl.java

@@ -227,7 +227,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                     map.put("SEQUENCE_NBR", jsonObject.get("sequenceNbr"));
                     equipList.add(map);
                 }
-                this.repeatUsedEquipCheck(equipList, reginParams.getCompany().getCompanyCode());
+                this.repeatUsedEquipCheck(equipList,
+                        CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                                reginParams.getCompany().getCompanyCode().split("_")[1] :
+                                reginParams.getCompany().getCompanyCode());
             }
             List<ProcessTaskDTO> processTasks = new ArrayList<>();
             // 判断当前是否为提交
@@ -262,6 +265,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             convertField(model);
             BeanUtils.copyProperties(model, dto);
             dto.setApplyNo(applyNo);
+            dto.setApplyDate(new Date());
             dto.setCreateDate(new Date());
             dto.setNextExecutorIds(String.join(",", roleListNext));
             dto.setInstanceStatus(String.join(",", roleListAll));
@@ -271,7 +275,6 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 dto.setNextTaskId(nextTaskId);
                 dto.setNextExecuteUserIds(nextUserIds);
                 dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass()));
-                dto.setApplyDate(new Date());
             } else {
                 dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass()));
             }
@@ -443,7 +446,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 equipList.add(map);
             }
             ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-            this.repeatUsedEquipCheck(equipList, reginParams.getCompany().getCompanyCode());
+            this.repeatUsedEquipCheck(equipList,
+                    CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                            reginParams.getCompany().getCompanyCode().split("_")[1] :
+                            reginParams.getCompany().getCompanyCode());
         }
         if ("1".equals(submitType)) {
             //发起流程
@@ -1052,4 +1058,4 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         SortVo sortMap = commonService.sortFieldConversion(sort);
         return this.baseMapper.getListPage(page, sortMap, dto, roleIds, companyCode, RequestContext.getExeUserId());
     }
-}
+}
\ No newline at end of file

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/JgChangeRegistrationReformServiceImpl.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
@@ -161,9 +162,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     private void checkForRepeatUsedEquip(JSONObject map, String equId, ReginParams reginParams) {
+        CompanyBo company = reginParams.getCompany();
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
             EquipUsedCheckStrategyContext.getUsedStrategy(BUSINESS_TYPE_KEY)
-                    .equipRepeatUsedCheck(equId, reginParams.getCompany().getCompanyCode());
+                    .equipRepeatUsedCheck(equId, CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                            company.getCompanyCode().split("_")[1] :
+                            company.getCompanyCode());
         }
     }
 
@@ -187,6 +191,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     public List<Map<String, Object>> save(JSONObject map) {
         try {
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+            String companyCode = CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                    reginParams.getCompany().getCompanyCode().split("_")[1] : reginParams.getCompany().getCompanyCode();
             UseInfo useInfo = new UseInfo();
             String equipId = map.get("record").toString();
             LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
@@ -201,7 +207,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             String supervisoryCode = otherInfo.getSupervisoryCode();
             jgChangeRegistrationReform.setSupervisoryCode(supervisoryCode);
             jgChangeRegistrationReform.setUseUnitName(ObjectUtils.isEmpty(useInfo.getUseUnitName()) ? reginParams.getCompany().getCompanyName() : useInfo.getUseUnitName());
-            jgChangeRegistrationReform.setUseUnitCreditCode(ObjectUtils.isEmpty(useInfo.getUseUnitCreditCode()) ? reginParams.getCompany().getCompanyCode() : useInfo.getUseUnitCreditCode());
+            jgChangeRegistrationReform.setUseUnitCreditCode(ObjectUtils.isEmpty(useInfo.getUseUnitCreditCode()) ? companyCode : useInfo.getUseUnitCreditCode());
             if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
                 jgChangeRegistrationReform.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
             }
@@ -213,11 +219,11 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 jgChangeRegistrationReform.setRenovationSupervisioninspectionCertificate(JSONObject.toJSONString(map.get("renovationSupervisioninspectionCertificate")));
             }
             // 使用单位提交
-            jgChangeRegistrationReform.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+            jgChangeRegistrationReform.setUseUnitCreditCode(companyCode);
             if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
                 jgChangeRegistrationReform.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
             } else {
-                jgChangeRegistrationReform.setInspectUnitCreditCode(reginParams.getCompany().getCompanyCode());
+                jgChangeRegistrationReform.setInspectUnitCreditCode(companyCode);
             }
             if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))) {
                 jgChangeRegistrationReform.setInspectUnitName(map.get("inspectOrgName").toString());

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/JgChangeRegistrationTransferServiceImpl.java

@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.jg.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
@@ -181,7 +182,10 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             }
 
             if ("1".equals(submitType)) {
-                this.repeatUsedEquipCheck(registrationIdList, reginParams.getCompany().getCompanyCode());
+                this.repeatUsedEquipCheck(registrationIdList,
+                        CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                                reginParams.getCompany().getCompanyCode().split("_")[1] :
+                                reginParams.getCompany().getCompanyCode());
             }
 
             //查询证下的设备
@@ -264,7 +268,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             //注册登记日期
             oldTransfer.setRegDate(new Date());
             //使用机构
-            oldTransfer.setUseUnitCreditCode(company.getCompanyCode());
+            oldTransfer.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                    company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             oldTransfer.setUseUnitName(company.getCompanyName());
             //录入单位统一信用代码
             oldTransfer.setInputUnitNo(company.getCompanyCode());

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/JgChangeRegistrationUnitServiceImpl.java

@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
@@ -394,8 +395,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+            CompanyBo company = reginParams.getCompany();
             deviceList.forEach(jsonObject -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                    .equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")), reginParams.getCompany().getCompanyCode()));
+                    .equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")),
+                            CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                                    company.getCompanyCode().split("_")[1] :
+                                    company.getCompanyCode()));
         }
         return noticeDto;
     }
@@ -415,8 +420,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                                                                   JgChangeRegistrationUnitDto model,
                                                                                   String type,
                                                                                   ReginParams reginParams) {
-        String orgCode;
-        orgCode = reginParams.getCompany().getCompanyCode();
+        String orgCode = reginParams.getCompany().getCompanyCode();
+        if (CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType())) {
+            orgCode = reginParams.getCompany().getCompanyCode().split("_")[1];
+        }
         String companyType = reginParams.getCompany().getCompanyType();
         String currentUserId = reginParams.getUserModel().getUserId();
         SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
@@ -603,7 +610,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             model.setStatus(taskName[0]);
         }
         model.setNewUseUnitName(reginParams.getCompany().getCompanyName());
-        model.setNewUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+        model.setNewUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                reginParams.getCompany().getCompanyCode().split("_")[1] :
+                reginParams.getCompany().getCompanyCode());
         if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
             model.setNextExecuteUserIds(nextExecutorUserIds.get(0));
         }
@@ -702,8 +711,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
             //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+            CompanyBo company = reginParams.getCompany();
             deviceList.forEach(jsonObject -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                    .equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")), reginParams.getCompany().getCompanyCode()));
+                    .equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")),
+                            CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                            company.getCompanyCode().split("_")[1] :
+                            company.getCompanyCode()));
         }
         return Collections.singletonList(model);
     }

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/JgChangeVehicleRegistrationUnitServiceImpl.java

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeVehicleRegistrationUnitMapper;
@@ -140,6 +141,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
     @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 600000)
     public List<JgChangeVehicleRegistrationUnit> saveMessage(JSONObject map, ReginParams reginParams) {
         try {
+            CompanyBo company = reginParams.getCompany();
             JgChangeVehicleRegistrationUnit dto = new JgChangeVehicleRegistrationUnit();
             if (!ObjectUtils.isEmpty(map.get("submit")) && SUBMIT_TYPE_FLOW.equals(map.get("submit").toString())) {
                 if (map.containsKey("dataList")) {
@@ -151,7 +153,10 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                         equ.put("record", object.get("record"));
                         equipList.add(equ);
                     });
-                    this.repeatUsedEquipCheck(equipList, reginParams.getCompany().getCompanyCode());
+                    this.repeatUsedEquipCheck(equipList,
+                            CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                                    company.getCompanyCode().split("_")[1] :
+                                    company.getCompanyCode());
                 }
             }
             if (!map.containsKey("sequenceNbr")) {
@@ -513,7 +518,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         manage.setReceiveCompanyCode(jgChangeVehicleRegistrationUnit.getReceiveOrgCode());
         manage.setReceiveOrgName(jgChangeVehicleRegistrationUnit.getReceiveOrgName());
         manage.setAuditPassDate(new Date());
-        Map<String, Object> enterpriseInfo = commonService.getEnterpriseInfo(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
+        Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
         manage.setUseUnitAddress(String.valueOf(enterpriseInfo.get("address")));
         jgUseRegistrationManageService.updateById(manage);
         // 保存证流水信息

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/JgEnableDisableServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -14,6 +15,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisableEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgEnableDisableService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -141,7 +143,11 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             // 设备列表
             List<Map<String, Object>> equipments = (List<Map<String, Object>>) map.get("equipments");
             if (SUBMIT_TYPE_FLOW.equals(submit)) {// 校验设备不能再多个流程中
-                this.repeatUsedEquipCheck(equipments, reginParams.getCompany().getCompanyCode());
+                CompanyBo company = reginParams.getCompany();
+                this.repeatUsedEquipCheck(equipments,
+                        CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                                company.getCompanyCode().split("_")[1] :
+                                company.getCompanyCode());
             }
             String businessCode = ObjectUtils.isEmpty(map.get("applyType")) ? String.valueOf(map.get("businessCode")) : String.valueOf(map.get("applyType"));
             // 接收机构
@@ -241,7 +247,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 jgEnableDisable.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
                 jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());
                 jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
-                jgEnableDisable.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+                jgEnableDisable.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                        reginParams.getCompany().getCompanyCode().split("_")[1] :
+                        reginParams.getCompany().getCompanyCode());
                 jgEnableDisable.setUseUnitName(reginParams.getCompany().getCompanyName());
                 jgEnableDisable.setReceiveCompanyCode(receiveOrgCode[0]);
                 jgEnableDisable.setReceiveOrgName(receiveOrgCode[1]);
@@ -373,7 +381,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         jgEnableDisable.setApplyDate(new Date());
         jgEnableDisable.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
         jgEnableDisable.setReceiveOrgName(splitMaintenanceUnitCode[1]);
-        jgEnableDisable.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+        jgEnableDisable.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                reginParams.getCompany().getCompanyCode().split("_")[1] :
+                reginParams.getCompany().getCompanyCode());
         jgEnableDisable.setUseUnitName(reginParams.getCompany().getCompanyName());
         jgEnableDisable.setRemark(String.valueOf(map.get("remark")));
         jgEnableDisable.setApplyType(map.getString("applyType"));
@@ -467,7 +477,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     public Page<Map<String, Object>> pageList(Page<Map<String, Object>> page, String sort, JgEnableDisableDto dto) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if ("company".equals(reginParams.getCompany().getLevel())) {
-            dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+            dto.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                    reginParams.getCompany().getCompanyCode().split("_")[1] :
+                    reginParams.getCompany().getCompanyCode());
         } else {
             dto.setReceiveCompanyCode(reginParams.getCompany().getCompanyCode());
         }

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/JgEquipTransferServiceImpl.java

@@ -154,14 +154,17 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         this.saveOrUpdateHisDataBatch(jgEquipTransferEqList);
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
             //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+            CompanyBo company = reginParams.getCompany();
             jgEquipTransferEqList.forEach(equipTransferEq -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY)
-                    .equipRepeatUsedCheck(equipTransferEq.getEquId(), reginParams.getCompany().getCompanyCode()));
+                    .equipRepeatUsedCheck(equipTransferEq.getEquId(), CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                            company.getCompanyCode().split("_")[1] :
+                            company.getCompanyCode()));
         }
         return transferList;
     }
 
     /**
-     * 删除 redis校验重复引用设备的数据
+     * 删除redis校验重复引用设备的数据
      */
     private void delRepeatUseEquipData(Long id, String status, String companyCode) {
         List<JgEquipTransferEq> list = equipTransferEqService.lambdaQuery().eq(JgEquipTransferEq::getEquipTransferId, id).list();
@@ -406,8 +409,11 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         this.saveOrUpdateHisDataBatch(jgEquipTransferEqList);
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
             //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+            CompanyBo company = reginParams.getCompany();
             jgEquipTransferEqList.forEach(equipTransferEq -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY)
-                    .equipRepeatUsedCheck(equipTransferEq.getEquId(), reginParams.getCompany().getCompanyCode()));
+                    .equipRepeatUsedCheck(equipTransferEq.getEquId(), CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                            company.getCompanyCode().split("_")[1] :
+                            company.getCompanyCode()));
         }
         return equipTransferDto;
     }

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/JgInstallationNoticeServiceImpl.java

@@ -145,12 +145,16 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Autowired
     AmosRequestContext amosRequestContext;
     @Autowired
-    private Sequence sequence;
-    @Autowired
     CodeUtil codeUtil;
     @Autowired
     CommonServiceImpl commonServiceImpl;
     @Autowired
+    JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
+    @Autowired
+    JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
+    @Autowired
+    private Sequence sequence;
+    @Autowired
     private JgInstallationNoticeMapper jgInstallationNoticeMapper;
     @Autowired
     private ProduceInfoMapper produceInfoMapper;
@@ -177,12 +181,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Autowired
     private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
     @Autowired
-    JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
-
-    @Autowired
-    JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
-
-    @Autowired
     private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
 
     @Autowired
@@ -190,6 +188,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     @Autowired
     private EquipTechParamPipelineMapper equipTechParamPipelineMapper;
+
     /**
      * 根据sequenceNbr查询
      *
@@ -209,11 +208,11 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         installationInfo.put("city", notice.getCity() + "_" + notice.getCityName());
         installationInfo.put("county", notice.getCounty() + "_" + notice.getCountyName());
         // 处理安装负责人-详情
-        if (!ObjectUtils.isEmpty(installationInfo.get("installLeaderName"))){
+        if (!ObjectUtils.isEmpty(installationInfo.get("installLeaderName"))) {
             installationInfo.put("installLeaderName", installationInfo.get("installLeaderName"));
         }
         // 处理设备类型
-        if (!ObjectUtils.isEmpty(installationInfo.get("equCategoryCode"))){
+        if (!ObjectUtils.isEmpty(installationInfo.get("equCategoryCode"))) {
             installationInfo.put("EQU_CATEGORY_CODE", installationInfo.get("equCategoryCode"));
         }
         // 处理设备筛选默认值
@@ -327,7 +326,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     private Map<String, Object> setNewEquipData(String companyLevel, Map<String, Object> installationInfo) {
         LambdaQueryWrapper<JgInstallationNoticeEq> lambda = new QueryWrapper<JgInstallationNoticeEq>().lambda();
-        lambda.eq(JgInstallationNoticeEq::getEquipTransferId,installationInfo.get("sequenceNbr"));
+        lambda.eq(JgInstallationNoticeEq::getEquipTransferId, installationInfo.get("sequenceNbr"));
         List<JgInstallationNoticeEq> jgInstallationNoticeEqs = jgInstallationNoticeEqMapper.selectList(lambda);
         List<String> ids = jgInstallationNoticeEqs.stream().map(item -> item.getEquId()).collect(Collectors.toList());
         Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);
@@ -484,7 +483,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             lambda.eq(JgInstallationNoticeEq::getEquipTransferId, noticeDto.getSequenceNbr());
             jgInstallationNoticeEqMapper.delete(lambda);
             ArrayList<JgInstallationNoticeEq> jgInstallationNoticeEqs = new ArrayList<>();
-            noticeDto.getDeviceList().forEach(item->{
+            noticeDto.getDeviceList().forEach(item -> {
                 JgInstallationNoticeEq jgInstallationNoticeEq = new JgInstallationNoticeEq();
                 jgInstallationNoticeEq.setEquId(String.valueOf(item.get("SEQUENCE_NBR")));
                 jgInstallationNoticeEq.setEquCategoryCode(String.valueOf(item.get("EQU_CATEGORY_CODE")));
@@ -594,7 +593,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         List<JgInstallationNoticeEq> equList = jgInstallationNoticeEqService.lambdaQuery().eq(JgInstallationNoticeEq::getEquipTransferId, jgInstallationNotice.getSequenceNbr()).list();
         HashMap<String, Object> map = new HashMap<>();
         ArrayList<Map<String, Object>> maps = new ArrayList<>();
-        equList.forEach(equ ->{
+        equList.forEach(equ -> {
             List<Map<String, Object>> informationList = jgInstallationNoticeMapper.queryEquipInformation(equ.getSequenceNbr());
             if (Objects.isNull(jgInstallationNotice) || CollectionUtils.isEmpty(informationList)) {
                 throw new IllegalArgumentException("安装告知单不存在");
@@ -765,7 +764,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             BeanUtils.copyProperties(obj, taskMessageDto);
             dto.setModel(taskMessageDto);
             // 摘要 按原有规则组装
-            dto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】",obj.getEquList(), obj.getApplyNo()));
+            dto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】", obj.getEquList(), obj.getApplyNo()));
             // 申请单号
             dto.setTaskCode(obj.getApplyNo());
             // 业务类型枚举code值
@@ -798,7 +797,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             taskModelDto.setStartUserCompanyName(item.getCreateUserCompanyName()); // 任务发起人所在单位
             taskModelDto.setStartDate(item.getCreateDate());
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】",item.getEquList(), item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("来自%s的业务办理，【申请单号：%s】", item.getEquList(), item.getApplyNo()));
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
@@ -813,42 +812,42 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     private void businessData(String submitType, ReginParams reginParams, JgInstallationNoticeDto model, List<Map<String, Object>> deviceList, List<String> applyNoList, List<JgInstallationNotice> list, List<JgInstallationNoticeEq> equipList, List<WorkflowResultDto> workflowResultList) {
         CompanyBo companyBo = commonService.getOneCompany(model.getReceiveOrgCreditCode());
-            JgInstallationNotice dto = new JgInstallationNotice();
-            BeanUtils.copyProperties(model, dto);
+        JgInstallationNotice dto = new JgInstallationNotice();
+        BeanUtils.copyProperties(model, dto);
 //            int i = deviceList.indexOf(obj);
-            String applyNo = applyNoList.get(0);
-            dto.setApplyNo(applyNo);
-            dto.setNoticeDate(new Date());
-            // 统计使用
-            dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
-            dto.setEquList(String.valueOf(deviceList.get(0).get("EQU_LIST")));
-            if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-                dto.setNextExecuteIds(workflowResultList.get(0).getNextExecutorRoleIds());
-                dto.setNextExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds());
-                dto.setInstanceStatus(workflowResultList.get(0).getNextExecutorRoleIds() + "," + workflowResultList.get(0).getExecutorRoleIds());
-                dto.setPromoter(reginParams.getUserModel().getUserId());
-                dto.setNextTaskId(workflowResultList.get(0).getNextTaskId());
-            } else {
-                dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
-            }
-            dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
-            dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
+        String applyNo = applyNoList.get(0);
+        dto.setApplyNo(applyNo);
+        dto.setNoticeDate(new Date());
+        // 统计使用
+        dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
+        dto.setEquList(String.valueOf(deviceList.get(0).get("EQU_LIST")));
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+            dto.setNextExecuteIds(workflowResultList.get(0).getNextExecutorRoleIds());
+            dto.setNextExecuteUserIds(workflowResultList.get(0).getNextExecutorUserIds());
+            dto.setInstanceStatus(workflowResultList.get(0).getNextExecutorRoleIds() + "," + workflowResultList.get(0).getExecutorRoleIds());
+            dto.setPromoter(reginParams.getUserModel().getUserId());
+            dto.setNextTaskId(workflowResultList.get(0).getNextTaskId());
+        } else {
+            dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
+        }
+        dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
+        dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
 //            dto.setEquList((String.valueOf(obj.get("EQU_LIST"))));
-            dto.setEntrustingUnitName(dto.getUseUnitName());
-            dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
+        dto.setEntrustingUnitName(dto.getUseUnitName());
+        dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
 //            dto.setEquRegisterCode(String.valueOf(obj.get("EQU_CODE")));
 //            dto.setFactoryNum(String.valueOf(obj.get("FACTORY_NUM")));
 
-            if (!CollectionUtils.isEmpty(workflowResultList)) {
-                dto.setInstanceId(workflowResultList.get(0).getInstanceId());
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-            } else {
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
-            }
-            dto.setCreateUserName(reginParams.getUserModel().getRealName());
-            dto.setCreateUserId(reginParams.getUserModel().getUserId());
+        if (!CollectionUtils.isEmpty(workflowResultList)) {
+            dto.setInstanceId(workflowResultList.get(0).getInstanceId());
+            dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+        } else {
+            dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+        }
+        dto.setCreateUserName(reginParams.getUserModel().getRealName());
+        dto.setCreateUserId(reginParams.getUserModel().getUserId());
 //            dto.setEquAddress(obj.getOrDefault("ADDRESS", "").toString());
-            list.add(dto);
+        list.add(dto);
         deviceList.forEach(obj -> {
             JgInstallationNoticeEq jgRelationEquip = new JgInstallationNoticeEq();
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
@@ -872,12 +871,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> list = new ArrayList<>();
 //            deviceList.forEach(item -> {
-                ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
+            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+            dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
 //                dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
-                dto.setCompleteFirstTask(Boolean.TRUE);
-                dto.setNextExecuteUserCompanyCode(receiveOrgCreditCode);
-                list.add(dto);
+            dto.setCompleteFirstTask(Boolean.TRUE);
+            dto.setNextExecuteUserCompanyCode(receiveOrgCreditCode);
+            list.add(dto);
 //            });
             actWorkflowBatchDTO.setProcess(list);
             List<ProcessTaskDTO> processTaskDTOS = iCmWorkflowService.startBatch(actWorkflowBatchDTO);
@@ -1112,94 +1111,93 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     taskMap.put("model", taskMessageDto);
                     TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap);
                     String finalYm = ym;
-                    jgRelationEquips.forEach(jgRelationEquip ->{
-                    LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
-                    queryWrapper1.eq(OtherInfo::getRecord, jgRelationEquip.getEquId());
-                    OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
-                    LambdaQueryWrapper<IdxBizJgRegisterInfo> queryWrapper2 = new LambdaQueryWrapper<>();
-                    queryWrapper2.eq(IdxBizJgRegisterInfo::getRecord, jgRelationEquip.getEquId());
-                    IdxBizJgRegisterInfo idxBizJgRegisterInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                    String equCode = Optional.ofNullable(idxBizJgRegisterInfo.getEquDefine())
-                            .orElse(idxBizJgRegisterInfo.getEquCategory());
-                    String registrationCode = equCode + jgInstallationNotice.getReceiveOrgCreditCode() + finalYm;
-                    ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
-                    String deviceRegistrationCode = responseModel.getResult();
-                    Map<String, Object> map = new HashMap<>();
-                    map.put("code96333", tzsJgOtherInfo.getCode96333());
-                    map.put("superviseCode", tzsJgOtherInfo.getSupervisoryCode());
-                    map.put("cityCode", jgInstallationNotice.getCity());
-                    map.put("countyCode", jgInstallationNotice.getCounty());
-                    map.put("equCategory", idxBizJgRegisterInfo.getEquCategory());
-                    map.put("isXiXian", jgInstallationNotice.getIsXixian() == null ? "null" : jgInstallationNotice.getIsXixian().equals("0") ? "null" : "1");
-                    Map<String, Object> mapCode;
-                    ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
-                    mapCode = code.getResult();
-                    supervisoryCodeInfoMapper.updateStatusBySuperviseCode(mapCode.get("superviseCode").toString());
-                    jgInstallationNotice.setHandleDate(new Date());
-//                  jgInstallationNotice.setInformNumber(deviceRegistrationCode);
-                    jgRelationEquip.setInformNumber(deviceRegistrationCode);
-                    jgInstallationNotice.setSupervisoryCode(mapCode.get("superviseCode").toString());
-                    jgInstallationNotice.setPromoter("");
-
-                    Map<String, Object> map1 = new HashMap<>();
-                    // 更新其他业务表
-                    if (!ValidationUtil.isEmpty(mapCode.get("code96333"))) {
-                        tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
-                        map1.put("CODE96333", tzsJgOtherInfo.getCode96333());
-                    }
-                    tzsJgOtherInfo.setSupervisoryCode(mapCode.get("superviseCode").toString());
-                    tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
-                    List<LinkedHashMap> tree = commonServiceImpl.getCreatTree();
-                    // 更新设备监管部门信息
-                    LambdaQueryWrapper<IdxBizJgSupervisionInfo> eq = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda()
-                            .eq(IdxBizJgSupervisionInfo::getRecord, jgRelationEquip.getEquId());
-                    IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = idxBizJgSupervisionInfoMapper.selectOne(eq);
-                    if (!ObjectUtils.isEmpty(jgInstallationNotice.getOrgBranchCode()) && !ObjectUtils.isEmpty(jgInstallationNotice.getOrgBranchName())) {
-                        HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(jgInstallationNotice.getOrgBranchCode()).getResult();
-                        // 目前平台返回key为compnay(存在拼写错误)
-                        CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
-                        idxBizJgSupervisionInfo.setOrgBranchCode(parentModel.getOrgCode());
-                        idxBizJgSupervisionInfo.setOrgBranchName(parentModel.getCompanyName());
-                        idxBizJgSupervisionInfo.setCompanyOrgBranchCode(parentModel.getCompanyCode());
-                        idxBizJgSupervisionInfoMapper.updateById(idxBizJgSupervisionInfo);
-                    }
+                    jgRelationEquips.forEach(jgRelationEquip -> {
+                        LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
+                        queryWrapper1.eq(OtherInfo::getRecord, jgRelationEquip.getEquId());
+                        OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
+                        LambdaQueryWrapper<IdxBizJgRegisterInfo> queryWrapper2 = new LambdaQueryWrapper<>();
+                        queryWrapper2.eq(IdxBizJgRegisterInfo::getRecord, jgRelationEquip.getEquId());
+                        IdxBizJgRegisterInfo idxBizJgRegisterInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
+                        String equCode = Optional.ofNullable(idxBizJgRegisterInfo.getEquDefine())
+                                .orElse(idxBizJgRegisterInfo.getEquCategory());
+                        String registrationCode = equCode + jgInstallationNotice.getReceiveOrgCreditCode() + finalYm;
+                        ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
+                        String deviceRegistrationCode = responseModel.getResult();
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("code96333", tzsJgOtherInfo.getCode96333());
+                        map.put("superviseCode", tzsJgOtherInfo.getSupervisoryCode());
+                        map.put("cityCode", jgInstallationNotice.getCity());
+                        map.put("countyCode", jgInstallationNotice.getCounty());
+                        map.put("equCategory", idxBizJgRegisterInfo.getEquCategory());
+                        map.put("isXiXian", jgInstallationNotice.getIsXixian() == null ? "null" : jgInstallationNotice.getIsXixian().equals("0") ? "null" : "1");
+                        Map<String, Object> mapCode;
+                        ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
+                        mapCode = code.getResult();
+                        supervisoryCodeInfoMapper.updateStatusBySuperviseCode(mapCode.get("superviseCode").toString());
+                        jgInstallationNotice.setHandleDate(new Date());
+                        //jgInstallationNotice.setInformNumber(deviceRegistrationCode);
+                        jgRelationEquip.setInformNumber(deviceRegistrationCode);
+                        jgInstallationNotice.setSupervisoryCode(mapCode.get("superviseCode").toString());
+                        jgInstallationNotice.setPromoter("");
+
+                        Map<String, Object> map1 = new HashMap<>();
+                        // 更新其他业务表
+                        if (!ValidationUtil.isEmpty(mapCode.get("code96333"))) {
+                            tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
+                            map1.put("CODE96333", tzsJgOtherInfo.getCode96333());
+                        }
+                        tzsJgOtherInfo.setSupervisoryCode(mapCode.get("superviseCode").toString());
+                        tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
+                        // 更新设备监管部门信息
+                        LambdaQueryWrapper<IdxBizJgSupervisionInfo> eq = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda()
+                                .eq(IdxBizJgSupervisionInfo::getRecord, jgRelationEquip.getEquId());
+                        IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = idxBizJgSupervisionInfoMapper.selectOne(eq);
+                        if (!ObjectUtils.isEmpty(jgInstallationNotice.getOrgBranchCode()) && !ObjectUtils.isEmpty(jgInstallationNotice.getOrgBranchName())) {
+                            HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(jgInstallationNotice.getOrgBranchCode()).getResult();
+                            // 目前平台返回key为compnay(存在拼写错误)
+                            CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
+                            idxBizJgSupervisionInfo.setOrgBranchCode(parentModel.getOrgCode());
+                            idxBizJgSupervisionInfo.setOrgBranchName(parentModel.getCompanyName());
+                            idxBizJgSupervisionInfo.setCompanyOrgBranchCode(parentModel.getCompanyCode());
+                            idxBizJgSupervisionInfoMapper.updateById(idxBizJgSupervisionInfo);
+                        }
 
-                    // 生成设备代码及更新历史表的的设备代码字段
-                    this.justGenerateEquCode(idxBizJgRegisterInfo, jgInstallationNotice.getReceiveOrgCreditCode(), jgInstallationNotice);
-                    tzsJgRegistrationInfoMapper.updateById(idxBizJgRegisterInfo);
-                    // 更新es
-                    updateEquipEs(jgInstallationNotice, tzsJgOtherInfo, idxBizJgRegisterInfo, idxBizJgSupervisionInfo, map1, dto);
-                    // 记录施工信息表
-                    createConstruction2Db(jgInstallationNotice, jgRelationEquip);
-
-                    // 更新使用信息
-                    updateJgUseInfo(jgInstallationNotice, jgRelationEquip);
-                    // 生成证记录表主键
-                    long certChangeSeq = sequence.nextId();
-                    // 生成jg证书变更记录
-                    genJgCertificateChangeRecord(jgInstallationNotice,certChangeSeq, registrationCode, idxBizJgRegisterInfo, taskV2Model1);
-                    // 查询设备制造信息
-                    LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
-                    factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
-                    IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
-
-                    // 生成tzs_jg_certificate_change_record_eq记录
-                    JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
-                    changeRecordEq.setChangeRecordId(String.valueOf(certChangeSeq));//登记证记录主键
-                    changeRecordEq.setEquId(jgRelationEquip.getEquId());//设备主键
-                    changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
-                    certificateChangeRecordEqService.save(changeRecordEq);
-
-                    jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
-                            .applyNo(jgInstallationNotice.getApplyNo())
-                            .businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
-                            .businessId(jgInstallationNotice.getSequenceNbr() + "")
-                            .equId(jgRelationEquip.getEquId())
-                            .approvalUnit(jgInstallationNotice.getReceiveOrgName())
-                            .approvalUnitCode(jgInstallationNotice.getReceiveOrgCreditCode())
-                            .status("正常")
-                            .routePath(taskV2Model1.getRoutePath())
-                            .build());
+                        // 生成设备代码及更新历史表的的设备代码字段
+                        this.justGenerateEquCode(idxBizJgRegisterInfo, jgInstallationNotice.getReceiveOrgCreditCode(), jgInstallationNotice);
+                        tzsJgRegistrationInfoMapper.updateById(idxBizJgRegisterInfo);
+                        // 更新es
+                        updateEquipEs(jgInstallationNotice, tzsJgOtherInfo, idxBizJgRegisterInfo, idxBizJgSupervisionInfo, map1, dto);
+                        // 记录施工信息表
+                        createConstruction2Db(jgInstallationNotice, jgRelationEquip);
+
+                        // 更新使用信息
+                        updateJgUseInfo(jgInstallationNotice, jgRelationEquip);
+                        // 生成证记录表主键
+                        long certChangeSeq = sequence.nextId();
+                        // 生成jg证书变更记录
+                        genJgCertificateChangeRecord(jgInstallationNotice, certChangeSeq, registrationCode, idxBizJgRegisterInfo, taskV2Model1);
+                        // 查询设备制造信息
+                        LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
+                        factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
+                        IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
+
+                        // 生成tzs_jg_certificate_change_record_eq记录
+                        JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
+                        changeRecordEq.setChangeRecordId(String.valueOf(certChangeSeq));//登记证记录主键
+                        changeRecordEq.setEquId(jgRelationEquip.getEquId());//设备主键
+                        changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
+                        certificateChangeRecordEqService.save(changeRecordEq);
+
+                        jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
+                                .applyNo(jgInstallationNotice.getApplyNo())
+                                .businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
+                                .businessId(jgInstallationNotice.getSequenceNbr() + "")
+                                .equId(jgRelationEquip.getEquId())
+                                .approvalUnit(jgInstallationNotice.getReceiveOrgName())
+                                .approvalUnitCode(jgInstallationNotice.getReceiveOrgCreditCode())
+                                .status("正常")
+                                .routePath(taskV2Model1.getRoutePath())
+                                .build());
                     });
                     // 更新关联设备表
                     jgInstallationNoticeEqService.updateBatchById(jgRelationEquips);
@@ -1276,7 +1274,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
     }
 
-    public void genJgCertificateChangeRecord(JgInstallationNotice jgInstallationNotice,Long sequenceNbr, String registrationCode, IdxBizJgRegisterInfo idxBizJgRegisterInfo, TaskV2Model taskV2Model1) {
+    public void genJgCertificateChangeRecord(JgInstallationNotice jgInstallationNotice, Long sequenceNbr, String registrationCode, IdxBizJgRegisterInfo idxBizJgRegisterInfo, TaskV2Model taskV2Model1) {
         // 生成一条tzs_jg_certificate_change_record记录
         JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
         jgCertificateChangeRecord.setApplyNo(jgInstallationNotice.getApplyNo());
@@ -1330,10 +1328,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         map1.put("USE_UNIT_NAME", jgInstallationNotice.getUseUnitName());
         map1.put("IS_INTO_MANAGEMENT", true);
         map1.put("USE_PLACE_CODE", dto.getProvince().split("_")[0] + "#" + dto.getCity().split("_")[0] + "#" + dto.getCounty().split("_")[0] + "#" + dto.getFactoryUseSiteStreet().split("_")[0]);
-        map1.put("USC_UNIT_CREDIT_CODE", jgInstallationNotice.getInstallUnitCreditCode());
-        map1.put("USC_UNIT_NAME", jgInstallationNotice.getInstallUnitName());
+        map1.put("USC_UNIT_CREDIT_CODE", "");
+        map1.put("USC_UNIT_NAME", "");
         map1.put("USE_PLACE", String.format("%s/%s/%s/%s", jgInstallationNotice.getProvinceName(), jgInstallationNotice.getCityName(), jgInstallationNotice.getCountyName(), jgInstallationNotice.getStreetName()));
-        map1.put("ADDRESS",jgInstallationNotice.getAddress());
+        map1.put("ADDRESS", jgInstallationNotice.getAddress());
         objMap.put(tzsJgOtherInfo.getRecord(), map1);
         tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
     }
@@ -1341,7 +1339,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     private String buildRecordContent(JgInstallationNotice obj) {
         //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-        return obj.getCreateUserName() + "办理了【"+BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName()+"】，单号【"
+        return obj.getCreateUserName() + "办理了【" + BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "】，单号【"
                 + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getCreateDate());
     }
 
@@ -1563,24 +1561,25 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         LambdaQueryWrapper<JgInstallationNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgInstallationNoticeEq::getEquipTransferId, installationNotice.getSequenceNbr());
         List<JgInstallationNoticeEq> jgInstallationNoticeEqs = jgInstallationNoticeEqMapper.selectList(queryWrapper);
-        jgInstallationNoticeEqs.forEach(jgRelationEquip ->{
-        // 强制更新字段为 NULL
-        LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(IdxBizJgUseInfo::getRecord, jgRelationEquip.getEquId()); // 设置更新条件
-        updateWrapper.set(IdxBizJgUseInfo::getUseUnitCreditCode, null);
-        updateWrapper.set(IdxBizJgUseInfo::getUseUnitName, null);
-        updateWrapper.set(IdxBizJgUseInfo::getIsIntoManagement, Boolean.FALSE);
-        useInfoService.update(updateWrapper);
-        // 2.2 es的USE_UNIT_CREDIT_CODE赋空
-        Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(jgRelationEquip.getEquId());
-        if (optional.isPresent()) {
-            ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
-            esEquipmentCategoryDto.setUSE_UNIT_CREDIT_CODE(null);
-            esEquipmentCategoryDto.setUSE_UNIT_NAME(null);
-            esEquipmentCategoryDto.setIS_INTO_MANAGEMENT(Boolean.FALSE);
-            esEquipmentCategory.save(esEquipmentCategoryDto);
-        }
-      });
+
+        jgInstallationNoticeEqs.forEach(jgRelationEquip -> {
+            // 强制更新字段为 NULL
+            LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(IdxBizJgUseInfo::getRecord, jgRelationEquip.getEquId()); // 设置更新条件
+            updateWrapper.set(IdxBizJgUseInfo::getUseUnitCreditCode, null);
+            updateWrapper.set(IdxBizJgUseInfo::getUseUnitName, null);
+            updateWrapper.set(IdxBizJgUseInfo::getIsIntoManagement, Boolean.FALSE);
+            useInfoService.update(updateWrapper);
+            // 2.2 es的USE_UNIT_CREDIT_CODE赋空
+            Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(jgRelationEquip.getEquId());
+            if (optional.isPresent()) {
+                ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
+                esEquipmentCategoryDto.setUSE_UNIT_CREDIT_CODE(null);
+                esEquipmentCategoryDto.setUSE_UNIT_NAME(null);
+                esEquipmentCategoryDto.setIS_INTO_MANAGEMENT(Boolean.FALSE);
+                esEquipmentCategory.save(esEquipmentCategoryDto);
+            }
+        });
     }
 
     @Transactional
@@ -1589,12 +1588,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         List<JgInstallationNotice> list = this.lambdaQuery().list();
         ArrayList<JgInstallationNoticeEq> jgInstallationNoticeEqs = new ArrayList<>();
         ArrayList<JgRegistrationHistory> jgRegistrationHistories = new ArrayList<>();
-        list.forEach(item ->{
+        list.forEach(item -> {
             // 设备信息
             List<JgInstallationNoticeEq> equList = jgInstallationNoticeEqService.lambdaQuery().eq(JgInstallationNoticeEq::getEquipTransferId, item.getSequenceNbr()).list();
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, item.getSequenceNbr()).one();
-            if (!ObjectUtils.isEmpty(jgRegistrationHistory) && !ObjectUtils.isEmpty(jgRegistrationHistory.getChangeData())){
-                List<String> ids = equList.stream().map(a -> a.getEquId()).collect(Collectors.toList());
+            if (!ObjectUtils.isEmpty(jgRegistrationHistory) && !ObjectUtils.isEmpty(jgRegistrationHistory.getChangeData())) {
+                List<String> ids = equList.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList());
                 Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);
                 List<Map<String, Object>> equipListMaps = getEquipListMaps(equips);
                 JSONObject object = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
@@ -1602,22 +1601,22 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 jgRegistrationHistory.setChangeData(JSONObject.toJSONString(object));
                 jgRegistrationHistories.add(jgRegistrationHistory);
             }
-            equList.forEach(equ->{
-                if (!ObjectUtils.isEmpty(item.getInformNumber())){
+            equList.forEach(equ -> {
+                if (!ObjectUtils.isEmpty(item.getInformNumber())) {
                     equ.setInformNumber(item.getInformNumber());
                 }
                 IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.lambdaQuery().eq(IdxBizJgRegisterInfo::getRecord, equ.getEquId()).one();
-                if (!ObjectUtils.isEmpty(registerInfo) && !ObjectUtils.isEmpty(registerInfo.getEquList()) && !ObjectUtils.isEmpty(registerInfo.getEquCategory())){
+                if (!ObjectUtils.isEmpty(registerInfo) && !ObjectUtils.isEmpty(registerInfo.getEquList()) && !ObjectUtils.isEmpty(registerInfo.getEquCategory())) {
                     equ.setEquListCode(registerInfo.getEquList());
                     equ.setEquCategoryCode(registerInfo.getEquCategory());
-                    if (ObjectUtils.isEmpty(item.getEquListCode()) || ObjectUtils.isEmpty(item.getEquCategoryCode())){
+                    if (ObjectUtils.isEmpty(item.getEquListCode()) || ObjectUtils.isEmpty(item.getEquCategoryCode())) {
                         item.setEquListCode(registerInfo.getEquList());
                         item.setEquCategoryCode(registerInfo.getEquCategory());
-                        if ("8300".equals(item.getEquCategoryCode())){
+                        if ("8300".equals(item.getEquCategoryCode())) {
                             LambdaQueryWrapper<EquipTechParamPipeline> lambda = new QueryWrapper<EquipTechParamPipeline>().lambda();
                             lambda.eq(EquipTechParamPipeline::getRecord, equ.getEquId());
                             EquipTechParamPipeline equipTechParamPipeline = equipTechParamPipelineMapper.selectOne(lambda);
-                            if (!ObjectUtils.isEmpty(equipTechParamPipeline) && !ObjectUtils.isEmpty(equipTechParamPipeline.getDeviceName())){
+                            if (!ObjectUtils.isEmpty(equipTechParamPipeline) && !ObjectUtils.isEmpty(equipTechParamPipeline.getDeviceName())) {
                                 item.setProjectContraption(equipTechParamPipeline.getDeviceName());
                             }
                         }

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/JgScrapCancelServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -133,7 +134,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
     public Page<JgScrapCancelDto> getList(JgScrapCancelDto dto, String sort, Page<JgScrapCancelDto> page, List<String> roleIds) {
         ReginParams reginParams = this.getSelectedOrgInfo();
-        String orgCode = reginParams.getCompany().getCompanyCode();
+        CompanyBo company = reginParams.getCompany();
+        String orgCode = company.getCompanyCode();
+        if (CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType())) {
+            orgCode = company.getCompanyCode().split("_")[1];
+        }
         dto.setCreateUserId(reginParams.getUserModel().getUserId());
         String currentUserId = reginParams.getUserModel().getUserId();
         SortVo sortMap = commonService.sortFieldConversion(sort);
@@ -215,8 +220,12 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             // 判断当前是否为提交
             List<WorkflowResultDto> workflowResultDtos = null;
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+                CompanyBo company = reginParams.getCompany();
                 List<JgScrapCancelEq> JgScrapCancelEqList = getCancelEqs(noticeParams);
-                this.repeatUsedEquipCheck(JgScrapCancelEqList, reginParams.getCompany().getCompanyCode());
+                this.repeatUsedEquipCheck(JgScrapCancelEqList,
+                        CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                                company.getCompanyCode().split("_")[1] :
+                                company.getCompanyCode());
                 // 发起流程
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
@@ -256,9 +265,12 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             } else {
                 jgScrapCancel.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_SUBMIT.getPass()));
             }
-            jgScrapCancel.setUseUnitCode(reginParams.getCompany().getCompanyCode());
+            jgScrapCancel.setUseUnitCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                    reginParams.getCompany().getCompanyCode().split("_")[1] :
+                    reginParams.getCompany().getCompanyCode());
             jgScrapCancel.setUseUnitName(reginParams.getCompany().getCompanyName());
             jgScrapCancel.setCreateUserId(RequestContext.getExeUserId());
+            jgScrapCancel.setCreateUserName(reginParams.getUserModel().getRealName());
             this.setUseRegisterInfo(jgScrapCancel, noticeParams);
             this.save(jgScrapCancel);
             // 新增代办
@@ -521,8 +533,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             List<String> roleListAll = new ArrayList<>();
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+                CompanyBo company = reginParams.getCompany();
                 List<JgScrapCancelEq> JgScrapCancelEqList = getCancelEqs(pageData);
-                this.repeatUsedEquipCheck(JgScrapCancelEqList, reginParams.getCompany().getCompanyCode());
+                this.repeatUsedEquipCheck(JgScrapCancelEqList, CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                        company.getCompanyCode().split("_")[1] :
+                        company.getCompanyCode());
                 // 更新并提交
                 // 发起流程
                 if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
@@ -1007,7 +1022,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         List<String> useRegistrationCodes = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getUseRegistrationCode).collect(Collectors.toList());
         LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.in(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCodes);
-        lambdaQueryWrapper.select(JgUseRegistrationManage::getUseRegistrationCode, JgUseRegistrationManage::getEquCategoryCode, JgUseRegistrationManage::getRegType, BaseEntity::getSequenceNbr);
+        lambdaQueryWrapper.select(JgUseRegistrationManage::getUseRegistrationCode, JgUseRegistrationManage::getEquCategoryCode,
+                JgUseRegistrationManage::getRegType, BaseEntity::getSequenceNbr, JgUseRegistrationManage::getCertificateNo);
         return jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
     }
 
@@ -1028,8 +1044,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
 
     private void saveRecord(JgScrapCancel jgScrapCancel, List<JgScrapCancelEq> jgScrapCancelEqList, String routePath, List<JgUseRegistrationManage> jgUseRegistrationManageList) {
-        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String userName = reginParams.getUserModel().getRealName();
+        String userName = jgScrapCancel.getCreateUserName();
         String content = userName + "办理了【" + CancelTypeEnum.getNameByType(jgScrapCancel.getCancelType()) + "】" +
                 "单号【" + jgScrapCancel.getApplyNo() + "】，办理日期" + DateUtils.getDateNowShortStr();
         List<JgCertificateChangeRecord> certificateChangeRecords = new ArrayList<>();
@@ -1048,10 +1063,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             changeRecord.setReceiveCompanyCode(jgScrapCancel.getReceiveOrgCode());
             changeRecord.setUseUnitCreditCode(jgScrapCancel.getUseUnitCode());
             changeRecord.setUseUnitName(jgScrapCancel.getUseUnitName());
-            changeRecord.setEquCategory(jgUseRegistrationManage.getEquCategory());
+            changeRecord.setEquCategory(jgUseRegistrationManage.getEquCategoryCode());
             changeRecord.setCreateDate(new Date());
-            changeRecord.setCreateUserId(reginParams.getUserModel().getUserId());
             changeRecord.setRoutePath(routePath);
+            changeRecord.setCreateUserId(jgScrapCancel.getCreateUserId());
+            changeRecord.setCertificateNo(jgUseRegistrationManage.getCertificateNo());
             certificateChangeRecords.add(changeRecord);
             jgScrapCancelEqList.stream().filter(eq -> eq.getUseRegistrationCode().equals(jgUseRegistrationManage.getUseRegistrationCode())).forEach(e -> {
                 JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
@@ -1061,12 +1077,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 changeRecordEqList.add(changeRecordEq);
             });
         }
-        if (certificateChangeRecords.size() > 0) {
+        if (!certificateChangeRecords.isEmpty()) {
             certificateChangeRecordService.saveBatch(certificateChangeRecords);
         }
-        if (changeRecordEqList.size() > 0) {
+        if (!changeRecordEqList.isEmpty()) {
             jgCertificateChangeRecordEqServiceImpl.saveBatch(changeRecordEqList);
         }
     }
-
 }
\ No newline at end of file

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/JgTransferNoticeServiceImpl.java

@@ -853,32 +853,32 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     jgTransferNotice.setPromoter("");
                     jgTransferNotice.setHandleDate(new Date());
                     jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-                    //修改设备ES设备使用场所和设备详细使用地址
-                    Map<String, Map<String, Object>> objMap = new HashMap<>();
-                    for (JgTransferNoticeEq eq : jgTransferNoticeEqs) {
-                        Map<String, Object> map1 = new HashMap<>();
-                        map1.put("USE_PLACE", String.format("%s/%s/%s", jgTransferNotice.getProvinceName(), jgTransferNotice.getCityName(), jgTransferNotice.getCityName()));
-                        map1.put("ADDRESS", String.format("%s/%s", jgTransferNotice.getStreetName(), jgTransferNotice.getAddress()));
-                        objMap.put(eq.getEquId(), map1);
-                    }
-                    tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
+                    //修改设备ES设备使用场所和设备详细使用地址 ---- 移装告知不修改设备信息及es数据 BUG 21679
+                    // Map<String, Map<String, Object>> objMap = new HashMap<>();
+                    // for (JgTransferNoticeEq eq : jgTransferNoticeEqs) {
+                    //     Map<String, Object> map1 = new HashMap<>();
+                    //     map1.put("USE_PLACE", String.format("%s/%s/%s", jgTransferNotice.getProvinceName(), jgTransferNotice.getCityName(), jgTransferNotice.getCityName()));
+                    //     map1.put("ADDRESS", String.format("%s/%s", jgTransferNotice.getStreetName(), jgTransferNotice.getAddress()));
+                    //     objMap.put(eq.getEquId(), map1);
+                    // }
+                    // tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
 
-                    // 修改使用信息
-                    List<String> equIds = jgTransferNoticeEqs.stream().map(JgTransferNoticeEq::getEquId).collect(Collectors.toList());
-                    LambdaUpdateWrapper<IdxBizJgUseInfo> lambda = new LambdaUpdateWrapper<>();
-                    lambda.in(IdxBizJgUseInfo::getRecord, equIds);
-                    IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
-                    idxBizJgUseInfo.setProvince(jgTransferNotice.getProvince());
-                    idxBizJgUseInfo.setProvinceName(jgTransferNotice.getProvinceName());
-                    idxBizJgUseInfo.setCity(jgTransferNotice.getCity());
-                    idxBizJgUseInfo.setCityName(jgTransferNotice.getCityName());
-                    idxBizJgUseInfo.setCounty(jgTransferNotice.getCounty());
-                    idxBizJgUseInfo.setCountyName(jgTransferNotice.getCountyName());
-                    idxBizJgUseInfo.setFactoryUseSiteStreet(jgTransferNotice.getFactoryUseSiteStreet());
-                    idxBizJgUseInfo.setStreetName(jgTransferNotice.getStreetName());
-                    idxBizJgUseInfo.setAddress(jgTransferNotice.getAddress());
-                    idxBizJgUseInfo.setIsNotXiXian(jgTransferNotice.getIsXixian());
-                    idxBizJgUseInfoMapper.update(idxBizJgUseInfo, lambda);
+                    // 修改使用信息 ---- 移装告知不修改设备信息及es数据 BUG 21679
+                    // List<String> equIds = jgTransferNoticeEqs.stream().map(JgTransferNoticeEq::getEquId).collect(Collectors.toList());
+                    // LambdaUpdateWrapper<IdxBizJgUseInfo> lambda = new LambdaUpdateWrapper<>();
+                    // lambda.in(IdxBizJgUseInfo::getRecord, equIds);
+                    // IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
+                    // idxBizJgUseInfo.setProvince(jgTransferNotice.getProvince());
+                    // idxBizJgUseInfo.setProvinceName(jgTransferNotice.getProvinceName());
+                    // idxBizJgUseInfo.setCity(jgTransferNotice.getCity());
+                    // idxBizJgUseInfo.setCityName(jgTransferNotice.getCityName());
+                    // idxBizJgUseInfo.setCounty(jgTransferNotice.getCounty());
+                    // idxBizJgUseInfo.setCountyName(jgTransferNotice.getCountyName());
+                    // idxBizJgUseInfo.setFactoryUseSiteStreet(jgTransferNotice.getFactoryUseSiteStreet());
+                    // idxBizJgUseInfo.setStreetName(jgTransferNotice.getStreetName());
+                    // idxBizJgUseInfo.setAddress(jgTransferNotice.getAddress());
+                    // idxBizJgUseInfo.setIsNotXiXian(jgTransferNotice.getIsXixian());
+                    // idxBizJgUseInfoMapper.update(idxBizJgUseInfo, lambda);
 
                     // 上个代办改为已办
                     HashMap<String, Object> taskMap = new HashMap<>();

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/JgUseRegistrationServiceImpl.java

@@ -474,6 +474,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
                     company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
+            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
             if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
                 jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
             }
@@ -627,15 +628,18 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private void checkForRepeatUsedEquip(JSONObject map, CompanyBo company) {
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
             // 流程中或已完成
-            EquipUsedCheckStrategyContext.getUsedStrategy(DEFINITION_KEY).equipRepeatUsedCheck(map.get("equipId").toString(), company.getCompanyCode());
+            EquipUsedCheckStrategyContext.getUsedStrategy(DEFINITION_KEY).equipRepeatUsedCheck(map.get("equipId").toString(),
+                    CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode());
         }
     }
 
-    private void checkForRepeatUsedEquip(JSONObject map, List<Map<String, Object>> equList, ReginParams reginParams) {
+    private void checkForRepeatUsedEquip(JSONObject map, List<Map<String, Object>> equList, CompanyBo company) {
+        // 个人主体的身份证（6600_620422199903010258） 特殊处理 只取_后的身份证号码
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
             equList.forEach(equip -> {
                 // 流程中或已完成
-                EquipUsedCheckStrategyContext.getUsedStrategy(DEFINITION_KEY).equipRepeatUsedCheck(equip.get("record").toString(), reginParams.getCompany().getCompanyCode());
+                EquipUsedCheckStrategyContext.getUsedStrategy(DEFINITION_KEY).equipRepeatUsedCheck(equip.get("record").toString(),
+                        CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             });
         }
     }
@@ -674,7 +678,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (CylinderTypeEnum.CYLINDER.getCode().equals(map.get("EQU_CATEGORY_CODE"))) {
                 boolean hasExistingCertificate = this.baseMapper.selectList(
                         new LambdaQueryWrapper<JgUseRegistration>()
-                                .eq(JgUseRegistration::getUseUnitCreditCode, company.getCompanyCode())
+                                .eq(JgUseRegistration::getUseUnitCreditCode, CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
+                                        company.getCompanyCode().split("_")[1] : company.getCompanyCode())
                                 .eq(JgUseRegistration::getIsDelete, false)
                                 .eq(JgUseRegistration::getStatus, "已完成")
                 ).stream().anyMatch(v -> !ObjectUtils.isEmpty(v.getUseRegistrationCode()) && v.getUseRegistrationCode().contains("瓶30"));
@@ -684,7 +689,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
 
             // 提交时进行校验设备是否在流程中使用（并发及同时打开多个相同的页面时才会出现此种情况）
-            checkForRepeatUsedEquip(map, equipmentLists, reginParams);
+            checkForRepeatUsedEquip(map, equipmentLists, company);
             List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = idxBizJgInspectionDetectionInfoService.checkInspectionInfo(
                     equipmentLists.stream()
                             .map(v -> (String) v.get("record"))
@@ -706,6 +711,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             useRegistration.setManageType(map.getString("manageType"));
             useRegistration.setPromoter(reginParams.getUserModel().getUserId());
             useRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
+            useRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
             // 使用单位信息
             useRegistration.setUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
                     company.getCompanyName().split("_")[1] : company.getCompanyName());
@@ -1018,7 +1024,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         changeRecord.setChangeContent(this.buildRecordContent(jgUseRegistration, BusinessTypeEnum.JG_USAGE_REGISTRATION.getName(), flag));//变更内容
         changeRecord.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());//使用登记编号
         changeRecord.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyOrgCode());//接收机构公司代码
-        changeRecord.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, new Date(), jgUseRegistration.getReceiveCompanyCode()));//登记证书唯一码
+        // 流水表不需要再次生成唯一编号，使用证管理表对应值
+        if (!ObjectUtils.isEmpty(jgUseRegistration.getUseRegistrationCode())){
+            JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode()).one();
+            changeRecord.setCertificateNo(manage.getCertificateNo());//登记证书唯一码
+        }
         changeRecord.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());//使用单位统一信用代码
         changeRecord.setUseUnitName(jgUseRegistration.getUseUnitName());//使用单位名称
         changeRecord.setEquCategory(registerInfo.getEquCategory());//设备类别编码
@@ -1342,7 +1352,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private String buildRecordContent(JgUseRegistration obj, String businessName, Boolean flag) {
         //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-        return obj.getRecUserName() + "办理了【" + businessName + (flag ? "设备增补" : "") + "】，" +
+        return obj.getCreateUserName() + "办理了【" + businessName + (flag ? "设备增补" : "") + "】，" +
                 "单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
     }
 
@@ -1789,7 +1799,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
         IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
         List<String> permissionInspectTypes = getInspectInfoByEquDefine(registerInfo.getEquList(), registerInfo.getEquCategory(), registerInfo.getEquDefine());
-        if (permissionInspectTypes.size() > 0) {
+        if (!permissionInspectTypes.isEmpty()) {
             return this.baseMapper.getInspectDetail(record, permissionInspectTypes);
         } else {
             return null;
@@ -2664,6 +2674,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
                     company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             jgUseRegistration.setCreateUserId(reginParams.getUserModel().getUserId());
+            jgUseRegistration.setCreateUserName(reginParams.getUserModel().getUserName());
             if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
                 jgUseRegistration.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
             }
@@ -2988,7 +2999,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
         jgCertificateChangeRecord.setApplyNo("");
         try {
-            changeContent = jgUseRegistration.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "】，" +
+            changeContent = jgUseRegistration.getCreateUserName() + "办理了【" + BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "】，" +
                     "办理日期" + map.get("installStartDate");
             jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("installStartDate")));
             jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("installStartDate")));
@@ -3019,7 +3030,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
         jgCertificateChangeRecord.setApplyNo("");
         try {
-            changeContent = jgUseRegistration.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName() + "】，" +
+            changeContent = jgUseRegistration.getCreateUserName() + "办理了【" + BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName() + "】，" +
                     "办理日期" + map.get("installStartDate");
             jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("informEnd")));
             jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("informStart")));

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

@@ -197,6 +197,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 throw new BadRequest(CollectionUtils.isEmpty(equipmentLists) ? "请选择设备信息!" : "请选择相同充装介质设备！");
             }
             if (SUBMIT_TYPE_FLOW.equals(submit)) {
+                // 检查设备是否已经在使用
                 // 个人主体的身份证（6600_620422199903010258） 特殊处理 只取_后的身份证号码
                 this.repeatUsedEquipCheck(equipmentLists,
                         CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode());

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -94,7 +94,7 @@
             ei.legal_person,
             ei.use_contact,
             ei.contact_phone,
-            (select count(1) from tzs_user_info u where u.unit_code = ei.use_unit_code  and u.is_delete = false) as personNum,
+            (select count(1) from tzs_user_info u where u.unit_code = ei.use_code  and u.is_delete = false) as personNum,
             (
                 select
                     group_concat(concat(a.cert_no,'#',a.expiry_date)) cert_no

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AlertStatisticsMapper.xml

@@ -87,7 +87,7 @@
                                                                                                                   (SELECT min(dispatch_time)  from tz_dispatch_task where alert_id = t1.sequence_nbr and dispatch_time is not null ) as dis
 
                                                                                                               from tz_alert_called t1 where t1.region_code like concat('%', #{regionCode}, '%') and t1.alarm_type_code = '960' and call_time BETWEEN #{startDate} and #{endDate} and father_alert is null
-                                                                                                          ) as snad where   extract(epoch from  arr  -  dis ) > 1800
+                                                                                                          ) as snad where   extract(epoch from  arr  -  dis ) <![CDATA[ <= ]]> 1800
                                                                         ) as withinThirtyRescue,
                                                                         (SELECT count(1) from  tz_alert_called where region_code like concat('%', #{regionCode}, '%') and alarm_type_code = '960' and call_time BETWEEN #{startDate} and #{endDate} and father_alert is null) as greaterNum,
                                                                         (

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/CylinderStatisticsMapper.xml

@@ -33,14 +33,14 @@
     </select>
     <select id="countForCylinderCertNum" resultType="java.lang.Long">
         SELECT
-            count(DISTINCT(a.use_unit_credit_code)) as num
+            count(a.use_unit_credit_code) as num
         FROM
             "tzs_jg_use_registration_manage" a,
             privilege_company c
         where
             a.receive_company_code = c.company_code
-            and a.certificate_status='已登记'
-            and a.equ_list_code='2000'
+            and a.certificate_status = '已登记'
+            and a.equ_category_code = '2300'
             and c.org_code  like concat(#{orgCode},'%')
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/ZLStatisticsMapper.xml

@@ -32,7 +32,7 @@
 		FROM
 				( SELECT org_code FROM privilege_company WHERE company_code = #{screenDto.cityCode} ) AS subquery
 					INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( subquery.org_code, '%' )
-					INNER JOIN tzs_user_info tui ON bi.use_unit_code = tui.unit_code
+					INNER JOIN tzs_user_info tui ON bi.use_code = tui.unit_code
 		WHERE
 			tui.post LIKE concat ( '%', '6552', '%' )
 		  AND bi.unit_type IS NOT NULL
@@ -58,7 +58,7 @@
 		FROM
 			( SELECT org_code FROM privilege_company WHERE company_code = #{screenDto.cityCode} ) AS subquery
 				INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( subquery.org_code, '%' )
-				INNER JOIN tzs_user_info tui ON bi.use_unit_code = tui.unit_code
+				INNER JOIN tzs_user_info tui ON bi.use_code = tui.unit_code
 		WHERE
 		  bi.unit_type IS NOT NULL
 		  AND tui.post IS NOT NULL

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/CylinderDPStatisticsServiceImpl.java

@@ -297,7 +297,7 @@ public class CylinderDPStatisticsServiceImpl {
      * @return 临期设备的数量
      */
     private Long countForCylinderTemporaryInspect(String orgCode) {
-        long num = 0;
+        long num;
         CountRequest request = new CountRequest();
         request.indices("idx_biz_view_jg_all");
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
@@ -409,7 +410,9 @@ public class JGDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 设备状态过滤
-        boolMust.must(QueryBuilders.termsQuery("EQU_STATE", states));
+        boolMust.must(QueryBuilders.termsQuery("EQU_STATE", Arrays.asList(states)));
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -449,7 +452,7 @@ public class JGDPStatisticsServiceImpl {
      * @return 临期设备的数量
      */
     private Long staticsCenterMapCountDateTemporary(DPFilterParamDto dpFilterParamDto) {
-        long num = 0;
+        long num;
         CountRequest request = new CountRequest();
         request.indices("idx_biz_view_jg_all");
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
@@ -466,6 +469,8 @@ public class JGDPStatisticsServiceImpl {
         // 且查询 下次检验日期 <= 当前天+30天 极为临期
         long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime).lte(currentDayAfter30DayTime));
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -499,6 +504,8 @@ public class JGDPStatisticsServiceImpl {
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -689,20 +696,21 @@ public class JGDPStatisticsServiceImpl {
     }
 
     public List<Map<String, Object>> equStateCount(DPFilterParamDto dpFilterParamDto) {
-        List<Map<String, Object>> resultList = new ArrayList<>();
+        List<Map<String, Object>> resultList;
         SearchRequest request = new SearchRequest();
         request.indices("idx_biz_view_jg_all");
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (orgCode == null) {
-            this.setDefaultEquStateCount(resultList);
-            return resultList;
+            return this.setDefaultEquStateCount();
         }
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
-        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE");
+        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE").size(20);
         builder.aggregation(aggregationBuilder);
         request.source(builder);
         try {
@@ -714,17 +722,12 @@ public class JGDPStatisticsServiceImpl {
                 long docCount = bucket.getDocCount();
                 dataMap.put(category, docCount);
             }
-            /**
-             * 3	报废
-             * 1	在用
-             * 2	停用
-             * 4	注销
-             */
-            for (int i = 0; i < 4; i++) {
-                Map<String, Object> map = setEquStateNameValue(i);
-                map.put("value", dataMap.getOrDefault(String.valueOf(i), 0L));
-                resultList.add(map);
-            }
+            resultList = Arrays.stream(EquimentEnum.values()).filter(e->e.getCode() > 0).map(e->{
+                Map<String, Object> map = new HashMap<>();
+                map.put("name", e.getName());
+                map.put("value", dataMap.getOrDefault(e.getCode().toString(), 0L));
+                return map;
+            }).collect(Collectors.toList());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -732,26 +735,13 @@ public class JGDPStatisticsServiceImpl {
         return resultList;
     }
 
-    private Map<String, Object> setEquStateNameValue(int i) {
-        Map<String, Object> map = new LinkedHashMap<>();
-        if (i == 0) {
-            map.put("name", "在用");
-        } else if (i == 1) {
-            map.put("name", "停用");
-        } else if (i == 2) {
-            map.put("name", "报废");
-        } else {
-            map.put("name", "注销");
-        }
-        return map;
-    }
-
-    private void setDefaultEquStateCount(List<Map<String, Object>> resultList) {
-        for (int i = 0; i < 4; i++) {
-            Map<String, Object> map = setEquStateNameValue(i);
-            map.put("value", 0L);
-            resultList.add(map);
-        }
+    private List<Map<String, Object>> setDefaultEquStateCount() {
+        return  Arrays.stream(EquimentEnum.values()).filter(e->e.getCode() > 0).map(e->{
+            Map<String, Object> map = new HashMap<>();
+            map.put("name", e.getName());
+            map.put("value",  0L);
+            return map;
+        }).collect(Collectors.toList());
     }
 
     public Map<String, Object> equStopStateCount(DPFilterParamDto dpFilterParamDto) {
@@ -763,6 +753,8 @@ public class JGDPStatisticsServiceImpl {
         if (orgCode != null) {
             // 按照管辖机构区域信息模糊查询
             boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+            // 且8大类，目的去掉脏数据
+            boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
             SearchSourceBuilder builder = new SearchSourceBuilder();
             builder.query(boolMust);
             // 设备状态
@@ -1442,6 +1434,8 @@ public class JGDPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -1648,7 +1642,8 @@ public class JGDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 设备类别精确查询气瓶
         boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
-
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JYJCDPStatisticsServiceImpl.java

@@ -426,6 +426,8 @@ public class JYJCDPStatisticsServiceImpl {
         // 且查询 下次检验日期 <= 当前天+30天 极为临期
         long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime).lte(currentDayAfter30DayTime));
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -449,6 +451,8 @@ public class JYJCDPStatisticsServiceImpl {
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -519,6 +523,8 @@ public class JYJCDPStatisticsServiceImpl {
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime).lte(currentDayAfter30DayTime));
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE");
@@ -555,6 +561,8 @@ public class JYJCDPStatisticsServiceImpl {
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE");

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

@@ -12,12 +12,12 @@ import com.yeejoin.amos.boot.module.statistics.api.mapper.CommonBaseMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipTechParamPipelineMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.lucene.queryparser.classic.QueryParser;
-import org.bouncycastle.pqc.crypto.newhope.NHOtherInfoGenerator;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -47,11 +47,6 @@ import java.util.stream.Collectors;
 public class StCommonServiceImpl {
 
     /**
-     * 压力容器设备种类
-     */
-    public final static String EQU_LIST_CYLINDER = "2000";
-
-    /**
      * 气瓶设备类别
      */
     public final static String EQU_CATEGORY_CYLINDER = "2300";
@@ -108,7 +103,7 @@ public class StCommonServiceImpl {
             regionModels.add(r);
             this.loopSetChildRegin(regionModels, r.getChildren());
         });
-        regionCodeRegionMap = regionModels.stream().collect(Collectors.toMap(RegionModel::getRegionCode, Function.identity(),(k1,k2)->k2));
+        regionCodeRegionMap = regionModels.stream().collect(Collectors.toMap(RegionModel::getRegionCode, Function.identity(), (k1, k2) -> k2));
     }
 
     private void loopSetChildRegin(List<RegionModel> regionModels, Collection<RegionModel> children) {
@@ -122,14 +117,7 @@ public class StCommonServiceImpl {
 
     public String getAndSetOrgCode(DPFilterParamDto dpFilterParamDto) {
         String cityCode = dpFilterParamDto.getCityCode();
-        String orgCode = regionCodeOrgCodeMap.get(cityCode);
-        if (orgCode == null) {
-            orgCode = commonMapper.getOrgCodeByCompanyCode(cityCode);
-            if (orgCode != null) {
-                regionCodeOrgCodeMap.put(cityCode, orgCode);
-            }
-        }
-        return orgCode;
+        return getAndSetOrgCode(cityCode);
     }
 
     public String getAndSetOrgCode(String cityCode) {
@@ -154,17 +142,13 @@ public class StCommonServiceImpl {
     }
 
     public List<RegionModel> setRegionIfRootParent(DPFilterParamDto dpFilterParamDto) {
-        List<RegionModel> regions = regionModels.parallelStream().filter(e -> e.getParentRegionCode() != null && (e.getParentRegionCode().toString()).equals(dpFilterParamDto.getCityCode())).collect(Collectors.toList());
-        // 陕西省时需要在地图返回独立的地级市:韩城、杨凌、西咸
-        if (dpFilterParamDto.getCityCode().equals(TZSCommonConstant.SHAN_XI_REGION_CODE)) {
-            List<RegionModel> independentRegions = ReginStepEnum.enum2RegionList("map");
-            regions.addAll(independentRegions);
-        }
-        return regions;
+        String regionCode = dpFilterParamDto.getCityCode();
+        return setRegionIfRootParent(regionCode);
     }
 
     /**
      * 获取指定区域下的子区域
+     *
      * @param regionCode 行政区划
      * @return List<RegionModel>
      */
@@ -181,30 +165,26 @@ public class StCommonServiceImpl {
     /**
      * 获取指定区域下的子区域，独立地市及区县级不再下钻，直接返回当前区域信息
      *
-     * @param  dpFilterParamDto 行政区划过滤条件
+     * @param dpFilterParamDto 行政区划过滤条件
      * @return List<RegionModel>
      */
     public List<RegionModel> setRegionIfRootParentAndNoAccessIf3Level(DPFilterParamDto dpFilterParamDto) {
         String regionCode = dpFilterParamDto.getCityCode();
-        // 独立地市、区县级别时（level=3），直接返回当前区域信息，不在显示街道
-        if((Arrays.stream(ReginStepEnum.values())).anyMatch(e->e.getCode().equals(regionCode)) || regionCodeRegionMap.get(Integer.parseInt(regionCode)).getLevel().trim().equals(REGION_LEVEL_THIRD)){
-            return Collections.singletonList(regionCodeRegionMap.get(Integer.parseInt(regionCode)));
-        } else {
-            return setRegionIfRootParent(regionCode);
-        }
+        return setRegionIfRootParentAndNoAccessIf3Level(regionCode);
     }
 
 
     /**
      * 获取指定区域下的子区域，独立地市及区县级不再下钻，直接返回当前区域信息
+     *
      * @param regionCode 行政区划
      * @return List<RegionModel>
      */
     public List<RegionModel> setRegionIfRootParentAndNoAccessIf3Level(String regionCode) {
-        if(regionCodeRegionMap.get(Integer.parseInt(regionCode)) != null && regionCodeRegionMap.get(Integer.parseInt(regionCode)).getLevel().trim().equals(REGION_LEVEL_THIRD)){
+        if (regionCodeRegionMap.get(Integer.parseInt(regionCode)) != null && regionCodeRegionMap.get(Integer.parseInt(regionCode)).getLevel().trim().equals(REGION_LEVEL_THIRD)) {
             // 区县级别时（level=3），直接返回当前区域信息，不在显示街道
             return Collections.singletonList(regionCodeRegionMap.get(Integer.parseInt(regionCode)));
-        } else if((Arrays.stream(ReginStepEnum.values())).anyMatch(e->e.getCode().equals(regionCode))) {
+        } else if ((Arrays.stream(ReginStepEnum.values())).anyMatch(e -> e.getCode().equals(regionCode))) {
             // 独立地市，直接返回当前区域信息，不在显示街道
             return ReginStepEnum.getOne(regionCode);
         } else {
@@ -224,10 +204,9 @@ public class StCommonServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 设备类别精确查询气瓶
-        boolMust.must(QueryBuilders.termsQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
+        boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
         // 且在用状态设备
         boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
-
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -247,9 +226,12 @@ public class StCommonServiceImpl {
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且在用状态设备
         boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
-        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE");
+        // 默认size为10 ，数据库有脏数据，所以需要多查询一些
+        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE").size(20);
         builder.aggregation(aggregationBuilder);
         request.source(builder);
         try {
@@ -257,11 +239,14 @@ public class StCommonServiceImpl {
             Terms terms = response.getAggregations().get("count_by_equ_list_code");
             Map<String, Long> countMap = new HashMap<>();
             for (Terms.Bucket bucket : terms.getBuckets()) {
-                // 压力容器里包括气瓶所以需要特殊处理，在统计压力容器时去掉气瓶的数量
-                if (bucket.getKeyAsString().equals(EQU_LIST_CYLINDER)) {
-                    countMap.put(bucket.getKeyAsString(), bucket.getDocCount() - cylinderNum);
-                } else {
-                    countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
+                // 是八大类且排除掉脏数据[数据库存在equ_list_code汉字及其他]
+                if (equipmentCategoryDtos.stream().anyMatch(e -> e.getCode().equalsIgnoreCase(bucket.getKeyAsString()))) {
+                    // 压力容器里包括气瓶所以需要特殊处理，在统计压力容器时去掉气瓶的数量
+                    if(bucket.getKeyAsString().equals(EquipmentClassifityEnum.YLRQ.getCode())){
+                        countMap.put(bucket.getKeyAsString(), bucket.getDocCount() - cylinderNum);
+                    } else {
+                        countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
+                    }
                 }
             }
             // 按照8大类枚举，进行加工。目的：固定八大类防止没统计数据导致缺少分类、将设备种类的code换成前端定义的key
@@ -305,7 +290,6 @@ public class StCommonServiceImpl {
     }
 
 
-
     private long countCompanyForCertDateTemporary(DPFilterParamDto dpFilterParamDto) {
         String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 临期6个月

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -83,6 +84,14 @@ public class YJDPStatisticsServiceImpl {
 
     private DataDictionaryServiceImpl dataDictionaryService;
 
+    private static final Map<String, String> BLL_LX_LEGEND = new LinkedHashMap<>();
+
+    static {
+        BLL_LX_LEGEND.put("trapped", "困人");
+        BLL_LX_LEGEND.put("complaint", "投诉");
+        BLL_LX_LEGEND.put("fault", "故障");
+    }
+
     /**
      * 电梯设备品种
      */
@@ -106,11 +115,9 @@ public class YJDPStatisticsServiceImpl {
         String endDate = DateUtil.getNow(DateUtil.Y_M_D);
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto);
 
+        JSONObject jsonObject = new JSONObject();
         List<String> everyDay = this.getEveryDay(beginDate, endDate);
-        JSONObject jsonObject = this.buildLegendData(null, "trapped", "困人");
-        this.buildLegendData(jsonObject, "complaint", "投诉");
-        this.buildLegendData(jsonObject, "fault", "故障");
-
+        this.buildLegendData(jsonObject);
         List<String> xdata = new ArrayList<>();
         List<Object> trapped = new ArrayList<>();
         List<Object> complaint = new ArrayList<>();
@@ -133,7 +140,6 @@ public class YJDPStatisticsServiceImpl {
             complaint.add(!ValidationUtil.isEmpty(map.get("投诉咨询")) ? Integer.parseInt(map.get("投诉咨询").toString()) : 0);
             fault.add(!ValidationUtil.isEmpty(map.get("故障维修")) ? Integer.parseInt(map.get("故障维修").toString()) : 0);
         });
-
         jsonObject.put("xdata", xdata);
         jsonObject.put("trapped", trapped);
         jsonObject.put("complaint", complaint);
@@ -198,9 +204,9 @@ public class YJDPStatisticsServiceImpl {
         if (orgCode == null) {
             return jsonObject;
         }
-        List<Map<String, Object>> maps = alertCalledMapper.faultCauseRatio(orgCode);
-        List<Object> xdata = maps.stream().map(item -> item.get("errorResult")).collect(Collectors.toList());
-        List<Object> ydata = maps.stream().map(item -> item.get("majorAlertCount")).collect(Collectors.toList());
+        List<CountDto> maps = alertCalledMapper.faultCauseRatio(orgCode);
+        List<Object> xdata = maps.stream().map(CountDto::getKeyStr).collect(Collectors.toList());
+        List<Object> ydata = maps.stream().map(CountDto::getLongValue).collect(Collectors.toList());
         jsonObject.put("xdata", xdata);
         jsonObject.put("ydata", ydata);
         return jsonObject;
@@ -283,11 +289,11 @@ public class YJDPStatisticsServiceImpl {
         List<AlertRescueStatistics> alertRescueStatistics = alertRescueStatisticsMapper.selectList(lambda);
 
         List<Long> ydata = new ArrayList<>();
-        ydata.add(alertRescueStatistics.stream().collect(Collectors.summingLong(AlertRescueStatistics::getLessNum)));
-        ydata.add(alertRescueStatistics.stream().collect(Collectors.summingLong(AlertRescueStatistics::getGreaterNum)));
-        ydata.add(alertRescueStatistics.stream().collect(Collectors.summingLong(AlertRescueStatistics::getLevelOne)));
-        ydata.add(alertRescueStatistics.stream().collect(Collectors.summingLong(AlertRescueStatistics::getLevelTwo)));
-        ydata.add(alertRescueStatistics.stream().collect(Collectors.summingLong(AlertRescueStatistics::getLevelThree)));
+        ydata.add(alertRescueStatistics.stream().mapToLong(AlertRescueStatistics::getLessNum).sum());
+        ydata.add(alertRescueStatistics.stream().mapToLong(AlertRescueStatistics::getGreaterNum).sum());
+        ydata.add(alertRescueStatistics.stream().mapToLong(AlertRescueStatistics::getLevelOne).sum());
+        ydata.add(alertRescueStatistics.stream().mapToLong(AlertRescueStatistics::getLevelTwo).sum());
+        ydata.add(alertRescueStatistics.stream().mapToLong(AlertRescueStatistics::getLevelThree).sum());
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("xdata", Arrays.asList("30分钟内到达次数", "超过30分钟到次数", "一级救援次数", "二级救援次数", "三级救援次数"));
@@ -383,19 +389,6 @@ public class YJDPStatisticsServiceImpl {
         return dateList;
     }
 
-    private JSONObject buildLegendData(JSONObject jsonObject, String dataKey, String value) {
-        if (ValidationUtil.isEmpty(jsonObject)) {
-            jsonObject = new JSONObject();
-        }
-        JSONObject legendData = jsonObject.getJSONObject("legendData");
-        if (ValidationUtil.isEmpty(legendData)) {
-            legendData = new JSONObject();
-            jsonObject.put("legendData", legendData);
-        }
-        legendData.put(dataKey, value);
-        return jsonObject;
-    }
-
     public List<Map<String, Object>> getCenterMapCountDataForOverview(DPFilterParamDto dpFilterParamDto) {
         return stCommonService.setRegionIfRootParent(dpFilterParamDto).stream().map(r -> {
             DPFilterParamDto filterParamDto = new DPFilterParamDto();
@@ -412,6 +405,18 @@ public class YJDPStatisticsServiceImpl {
         }).collect(Collectors.toList());
     }
 
+
+    private void buildLegendData(JSONObject jsonObject) {
+        JSONArray jsonArray = new JSONArray();
+        BLL_LX_LEGEND.forEach((k, v) -> {
+            JSONObject item = new JSONObject();
+            item.put("dataKey", k);
+            item.put("value", v);
+            jsonArray.add(item);
+        });
+        jsonObject.put("legendData", jsonArray);
+    }
+
     private Map<String, Object> getCenterMapOverviewData(String orgCode, DPFilterParamDto filterParamDto) {
         Map<String, Object> result = new HashMap<>();
         // 统计完成的事件包括困人、故障、投诉咨询
@@ -501,6 +506,8 @@ public class YJDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且在用状态设备
         boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        // 且设备品种3级,按照真实的过滤，防止有脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_DEFINE_CODE.keyword", ELEVATOR_EQU_DEFINE_CODES.split(",")));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         // 原因默认10个，由于业务最多有10个，担心有脏数据，故多查询
@@ -511,10 +518,7 @@ public class YJDPStatisticsServiceImpl {
             SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
             Terms terms = response.getAggregations().get("count_by_equ_define_code");
             for (Terms.Bucket bucket : terms.getBuckets()) {
-                // 按照真实的过滤，防止有脏数据
-                if (ELEVATOR_EQU_DEFINE_CODES.contains(bucket.getKeyAsString())) {
-                    countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
-                }
+                countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
             }
         } catch (IOException e) {
             throw new RuntimeException(e);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -10,11 +10,14 @@ import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
 import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserPostEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
+import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.Aggregations;
@@ -64,9 +67,8 @@ public class ZLDPStatisticsServiceImpl {
         Map<String, Integer> dataMap = new HashMap<>();
         for(Map<String,Object> map : list){
             if(null == map.get("equipCategory") || CollectionUtils.isEmpty((JSONArray) JSONArray.parse((String) map.get("equipCategory")))){
-                String[] UnitTypeArray = ((String) map.get("unitType")).split("#");
-                for (int i = 0; i < UnitTypeArray.length; i++) {
-                    String unitTypeName = UnitTypeArray[i];
+                String[] unitTypeArray = ((String) map.get("unitType")).split("#");
+                for (String unitTypeName : unitTypeArray) {
                     if (dataMap.containsKey(unitTypeName + "null")) {
                         dataMap.put(unitTypeName + "null", dataMap.get(unitTypeName + "null") + 1);
                     } else {
@@ -75,14 +77,13 @@ public class ZLDPStatisticsServiceImpl {
                 }
             }else {
                 JSONArray equipCategoryArray = (JSONArray) JSONArray.parse((String) map.get("equipCategory"));
-                String[] UnitTypeArray = ((String) map.get("unitType")).split("#");
-                for (int i = 0; i < UnitTypeArray.length; i++) {
-                    String unitTypeName = UnitTypeArray[i];
-                    for (int j = 0; j < equipCategoryArray.size(); j++) {
-                        if (dataMap.containsKey(unitTypeName + equipCategoryArray.get(j))) {
-                            dataMap.put(unitTypeName + equipCategoryArray.get(j), dataMap.get(unitTypeName + equipCategoryArray.get(j)) + 1);
+                String[] unitTypeArray = ((String) map.get("unitType")).split("#");
+                for (String unitTypeName : unitTypeArray) {
+                    for (Object o : equipCategoryArray) {
+                        if (dataMap.containsKey(unitTypeName + o)) {
+                            dataMap.put(unitTypeName + o, dataMap.get(unitTypeName + o) + 1);
                         } else {
-                            dataMap.put(unitTypeName + equipCategoryArray.get(j), 1);
+                            dataMap.put(unitTypeName + o, 1);
                         }
                     }
                 }
@@ -148,7 +149,7 @@ public class ZLDPStatisticsServiceImpl {
         Map<String,Object> angaiweiyaliguandaoMap = new HashMap<>();
         angaiweiyaliguandaoMap.put("key","key05");
         angaiweiyaliguandaoMap.put("name","压力管道");
-        angaiweiyaliguandaoMap.put("value",dataMap.getOrDefault("安装改造维修单位9000",0));
+        angaiweiyaliguandaoMap.put("value",dataMap.getOrDefault("安装改造维修单位8000",0));
         angaiweiCompanyList.add(angaiweiyaliguandaoMap);
         //安改维起重机械
         Map<String,Object> angaiweiqizhongjixieMap = new HashMap<>();
@@ -195,6 +196,13 @@ public class ZLDPStatisticsServiceImpl {
         shejiyaliguandaoMap.put("value",dataMap.getOrDefault("设计单位8000",0));
         shejiCompanyList.add(shejiyaliguandaoMap);
         shejiMap.put("data",shejiCompanyList);
+        //无设备类型
+        Map<String,Object> shejiNullMap = new HashMap<>();
+        shejiNullMap.put("key","key09");
+        shejiNullMap.put("name","无设备类型");
+        shejiNullMap.put("value",dataMap.getOrDefault("设计单位null",0));
+        shejiCompanyList.add(shejiNullMap);
+        shejiMap.put("data",angaiweiCompanyList);
 
         //制造Map
         Map<String,Object> zhizaoMap = new HashMap<>();
@@ -213,7 +221,7 @@ public class ZLDPStatisticsServiceImpl {
         zhizaoguoluMap.put("name","锅炉");
         zhizaoguoluMap.put("value",dataMap.getOrDefault("制造单位1000",0));
         zhizaoCompanyList.add(zhizaoguoluMap);
-        //制造锅炉
+        //制造场内机动车
         Map<String,Object> zhizaojidongcheMap = new HashMap<>();
         zhizaojidongcheMap.put("key","key03");
         zhizaojidongcheMap.put("name","场内机动车");
@@ -428,7 +436,7 @@ public class ZLDPStatisticsServiceImpl {
         }
         List<String> xlist = Arrays.asList("制造单位", "安改维单位", "使用单位", "设计单位", "充装单位");
         List<Integer> ylist = new ArrayList();
-        xlist.stream().forEach(x -> {
+        xlist.forEach(x -> {
             ylist.add(dataMap.getOrDefault(x, 0));
         });
         Map<String, Object> returnMap = new HashMap<>();
@@ -448,7 +456,7 @@ public class ZLDPStatisticsServiceImpl {
         List<DataDictionary> dataDictionaryList = iDataDictionaryService.getByType("HYZGBM");
         List<String> xlist = dataDictionaryList.stream().map(DataDictionary::getName).collect(Collectors.toList());
         List<Object> ylist = new ArrayList();
-        dataDictionaryList.stream().forEach(x -> {
+        dataDictionaryList.forEach(x -> {
             ylist.add(dataMap.getOrDefault(x.getCode(), 0));
         });
         Map<String, Object> returnMap = new HashMap<>();
@@ -459,18 +467,26 @@ public class ZLDPStatisticsServiceImpl {
 
 
     public List<Map<String, Object>> equipmentInformCount(DPFilterParamDto screenDto) {
-        SearchRequest searchRequest = new SearchRequest("idx_biz_view_jg_all");
-        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-        List<DataDictionary> dataDictionaryList = iDataDictionaryService.getByType("ADDRESS");
         //设置模糊搜索
         String orgCode = stCommonService.getAndSetOrgCode(screenDto.getCityCode());
         List<Map<String, Object>> returnList = new ArrayList<>();
+        List<DataDictionary> dataDictionaryList = iDataDictionaryService.getByType("ADDRESS");
         if(orgCode == null){
             this.setEquipmentInformCountDefaultData(returnList, dataDictionaryList);
             return returnList;
         }
-        searchSourceBuilder.query(QueryBuilders.boolQuery()
-                .must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*")));
+        SearchRequest searchRequest = new SearchRequest("idx_biz_view_jg_all");
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        // 且8大类，目的去掉脏数据
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
+        // 且在用状态设备
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        // 有监管码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        searchSourceBuilder.query(boolMust);
         searchSourceBuilder.aggregation(AggregationBuilders.terms("count_by_use_site_code").field("USE_SITE_CODE").size(500));
         searchRequest.source(searchSourceBuilder);
         Map<String, Integer> dataMap = new HashMap<>();
@@ -487,7 +503,7 @@ public class ZLDPStatisticsServiceImpl {
                 long docCount = bucket.getDocCount();
                 dataMap.put(category, (int) docCount);
             }
-            dataDictionaryList.stream().forEach(x -> {
+            dataDictionaryList.forEach(x -> {
                 Map<String, Object> map = new HashMap<>();
                 map.put("name", x.getName());
                 map.put("value", dataMap.getOrDefault(x.getCode(), 0));
@@ -541,6 +557,7 @@ public class ZLDPStatisticsServiceImpl {
         LocalDate startDate;
         LocalDate endDate;
         String regionCode = params.getCityCode();
+        String orgCode = stCommonService.getAndSetOrgCode(regionCode);
         if (ObjectUtils.isEmpty(params.getBeginDate()) || ObjectUtils.isEmpty(params.getBeginDate())) {
             startDate = today.minusDays(6);
             endDate = today;
@@ -569,8 +586,12 @@ public class ZLDPStatisticsServiceImpl {
             jsonObject2.put("name", "故障维修");
 
             JSONObject jsonObject3 = new JSONObject();
+            DPFilterParamDto filterParamDto = new DPFilterParamDto();
+            filterParamDto.setBeginDate(startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+            filterParamDto.setEndDate(endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+            Long rescuedPersonNum = alertStatisticsMapper.countRescuedPersonNum(orgCode, filterParamDto);
             jsonObject3.put("key", "jjbkck");
-            jsonObject3.put("value", ValidationUtil.isEmpty(statistics.getRescuePersonnel()) ? 0 : statistics.getRescuePersonnel());
+            jsonObject3.put("value", ValidationUtil.isEmpty(rescuedPersonNum) ? 0 : rescuedPersonNum);
             jsonObject3.put("name", "解救被困乘客");
 
             JSONObject jsonObject4 = new JSONObject();
@@ -580,10 +601,9 @@ public class ZLDPStatisticsServiceImpl {
 
             JSONObject jsonObject5 = new JSONObject();
             jsonObject5.put("key", "pjjysj");
-            jsonObject5.put("value", ValidationUtil.isEmpty(statistics.getAvgTime()) ? 0 : statistics.getAvgTime());
+            jsonObject5.put("value", ValidationUtil.isEmpty(statistics.getAvgTime()) ? 0 : this.roundString(statistics.getAvgTime()));
             jsonObject5.put("name", "平均救援时间");
 
-            String orgCode = stCommonService.getAndSetOrgCode(regionCode);
             JSONObject jsonObject6 = new JSONObject();
             jsonObject6.put("key", "jycq");
             jsonObject6.put("value", orgCode == null ? 0L: this.getQuestionNumber("检验超期",params, orgCode));
@@ -631,6 +651,10 @@ public class ZLDPStatisticsServiceImpl {
         return jsonArray;
     }
 
+    private Long roundString(String avgTime) {
+        return Math.round(new Double(avgTime));
+    }
+
     private Long getQuestionNumber(String problemType, DPFilterParamDto params, String orgCode) {
         return alertStatisticsMapper.countProblemByTypeDateAndOrgCode(problemType, params, orgCode);
     }

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/pom.xml

@@ -20,7 +20,6 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.3.10</version>
         </dependency>
 
 		<dependency>
@@ -52,7 +51,6 @@
 		<dependency>
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-core</artifactId>
-			<version>5.8.16</version>
 		</dependency>
 	</dependencies>
 

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/pom.xml

@@ -119,7 +119,6 @@
 		<dependency>
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-all</artifactId>
-			<version>5.5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.liquibase</groupId>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/AlertCalledMapper.java

@@ -137,6 +137,6 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
   *
   * @return
   */
- List<Map<String, Object>> faultCauseRatio(@Param("regionCode") String regionCode);
+ List<CountDto> faultCauseRatio(@Param("regionCode") String regionCode);
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -659,25 +659,22 @@
 		ORDER BY ibjuj.USE_PLACE ASC
 	</select>
 
-	<select id="faultCauseRatio" resultType="java.util.Map">
+	<select id="faultCauseRatio" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
 		SELECT
-			tafv.field_value AS errorResult,
-			ifnull ( SUM ( CASE WHEN tac.father_alert IS NULL THEN 1 ELSE 0 END ), 0 ) AS majorAlertCount
+			tafv.field_value AS keyStr,
+			ifnull (SUM (CASE WHEN tac.father_alert IS NULL THEN 1 ELSE 0 END ), 0 ) AS longValue
 		FROM
-			tz_alert_called tac
-				LEFT JOIN tz_dispatch_task tdt ON tac.sequence_nbr = tdt.alert_id
-				LEFT JOIN tz_alert_form_value tafv ON tac.sequence_nbr = tafv.alert_called_id
-				LEFT JOIN cb_data_dictionary cdd ON cdd.NAME = tafv.field_value
+			  tz_alert_form_value tafv
+			  LEFT JOIN tz_dispatch_paper dp on dp.sequence_nbr = tafv.alert_called_id
+			  LEFT JOIN tz_alert_called tac on dp.alert_id = tac.sequence_nbr
 		WHERE
-			tac.biz_org_code LIKE concat(#{regionCode}, '%')
-		  AND tac.alarm_type_code = '961'
-		  AND cdd.TYPE = 'GZYY'
-		  AND tafv.field_code = 'error_result'
-		  AND tafv.field_value IS NOT NULL
+			 tac.biz_org_code LIKE concat(#{regionCode}, '%')
+		     AND tafv.field_code = 'error_result'
+		     AND tafv.field_value IS NOT NULL
 		GROUP BY
 			tafv.field_value
 		ORDER BY
-			majorAlertCount ASC
+			longValue ASC
 			LIMIT 5
 	</select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CylinderAreaDataMapper.xml

@@ -147,7 +147,7 @@
             count(1)
         FROM
                 tz_base_enterprise_info u
-                RIGHT JOIN tzs_user_info ui ON ui.unit_code = u.use_unit_code
+                RIGHT JOIN tzs_user_info ui ON ui.unit_code = u.use_code
         WHERE
             u.data_sources = '陕西省内企业'
             AND u.unit_type LIKE'%充装单位%'

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -55,7 +55,7 @@
              tzs_user_info tui,
              tz_base_enterprise_info bi
         WHERE
-            tui.unit_code =  bi.use_unit_code
+            tui.unit_code =  bi.use_code
             and tui.post LIKE concat ( '%', #{post}, '%' )
             and ((bi.supervise_org_code != '50' and bi.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (bi.supervise_org_code = '50' and bi.office_region LIKE CONCAT ('%', #{regionCode}, '%')))
             and tui.is_delete=false

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

@@ -2480,15 +2480,15 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                     Bean.copyExistPropertis(newData, oldData);
                     // 处理施工单位信息[去重]
                     if (!ValidationUtil.isEmpty(newUscUnitCreditCode)) {
-                        if (!ValidationUtil.isEmpty(oldUscUnitCreditCode)) {
-                            if (!oldUscUnitCreditCode.contains(newUscUnitCreditCode)) {
-                                oldData.setUSC_UNIT_CREDIT_CODE(oldUscUnitCreditCode + "," + newUscUnitCreditCode);
-                                oldData.setUSC_UNIT_NAME(oldUscUnitName + "," + newUscUnitName);
-                            }
-                        } else {
+                        // if (!ValidationUtil.isEmpty(oldUscUnitCreditCode)) {
+                        //     if (!oldUscUnitCreditCode.contains(newUscUnitCreditCode)) {
+                        //         oldData.setUSC_UNIT_CREDIT_CODE(oldUscUnitCreditCode + "," + newUscUnitCreditCode);
+                        //         oldData.setUSC_UNIT_NAME(oldUscUnitName + "," + newUscUnitName);
+                        //     }
+                        // } else {
                             oldData.setUSC_UNIT_CREDIT_CODE(newUscUnitCreditCode);
                             oldData.setUSC_UNIT_NAME(newUscUnitName);
-                        }
+                        // }
                     }
 
                 }

pom.xml

@@ -268,6 +268,16 @@
 				<artifactId>amos-component-security</artifactId>
 				<version>${amos.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>cn.hutool</groupId>
+				<artifactId>hutool-all</artifactId>
+				<version>5.8.16</version>
+			</dependency>
+			<dependency>
+				<groupId>cn.hutool</groupId>
+				<artifactId>hutool-core</artifactId>
+				<version>5.8.16</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<repositories>