Merge branch 'develop_tzs_register_1114' into develop_tzs_register

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

@@ -234,4 +234,7 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
 
     @ApiModelProperty(value = "投用日期")
     private String useDate;
+
+    @ApiModelProperty(value = "设备使用场所")
+    private String usePlace;
 }

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
-import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -151,4 +150,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
 
     @ApiModelProperty("证书打印标记")
     private String certificatePrintTag;
+
+    @ApiModelProperty("登记证号类型：0-系统生成，1-手动录入")
+    private String registrationType;
 }

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

@@ -372,4 +372,10 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      */
     @TableField("use_date")
     private String useDate;
+
+    /**
+     * 设备使用场所
+     */
+    @TableField("use_place")
+    private String usePlace;
 }

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

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.*;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -247,4 +247,10 @@ public class JgUseRegistrationManage extends BaseEntity {
      */
     @TableField("certificate_print_tag")
     private String certificatePrintTag;
+
+    /**
+     * 登记证号类型：0-系统生成，1-手动录入
+     */
+    @TableField("registration_type")
+    private String registrationType;
 }

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

@@ -22,6 +22,65 @@
         </if>
     </select>
 
+    <select id="countEquipInUseTimesWithOutZFBatch" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+        select
+        sum(inUseNumber) longValue,
+        record as keyStr
+        from (
+        select
+        count(1) as inUseNumber,
+        b.equ_id AS record
+        from
+        tzs_jg_use_registration a,
+        tzs_jg_use_registration_eq b
+        where
+        a.sequence_nbr = b.equip_transfer_id
+        and b.equ_id = ANY(ARRAY[
+        <foreach collection="records" item="record" separator=",">
+            #{record}
+        </foreach>
+        ])
+        and a.is_delete = 0
+        and ( a.status <![CDATA[ <> ]]> '已作废')
+        GROUP BY b.equ_id
+        UNION ALL
+        select
+        count(1) as inUseNumber,
+        b.equ_id  AS record
+        from
+        tzs_jg_installation_notice a,
+        tzs_jg_installation_notice_eq b
+        where
+        a.sequence_nbr = b.equip_transfer_id
+        and b.equ_id = ANY(ARRAY[
+        <foreach collection="records" item="record" separator=",">
+            #{record}
+        </foreach>
+        ])
+        and a.is_delete = 0
+        and (a.notice_status <![CDATA[ <> ]]> '6617')
+        GROUP BY b.equ_id
+        UNION ALL
+        select
+        count(1) as inUseNumber,
+        b.equ_id  AS record
+        from
+        tzs_jg_vehicle_information a,
+        tzs_jg_vehicle_information_eq b
+        where
+        a.sequence_nbr = b.vehicle_id
+        and b.equ_id = ANY(ARRAY[
+        <foreach collection="records" item="record" separator=",">
+            #{record}
+        </foreach>
+        ])
+        and a.is_delete = 0
+        and (a.status <![CDATA[ <> ]]> '已作废')
+        GROUP BY b.equ_id
+        )
+        GROUP BY record
+    </select>
+
     <select id="getUnitInfoListByType" resultType="java.util.Map">
         SELECT sequence_nbr AS useCode,
         CASE

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

@@ -67,12 +67,14 @@
             <if test="dto.isDoBusiness != null and dto.isDoBusiness != ''">
                 and tjurm.is_do_business = #{dto.isDoBusiness}
             </if>
+            <!--登记证号类型：0-系统生成，1-手动录入-->
+            <if test="dto.registrationType != null and dto.registrationType != ''">
+                and tjurm.registration_type = #{dto.registrationType}
+            </if>
+            <!--系统数据刷库后，regType可以不用-->
             <if test="dto.regType != null and dto.regType != '' ">
                 AND EXISTS (
-                SELECT 1
-                FROM tzs_jg_use_registration ur
-                WHERE ur.use_registration_code = tjurm.use_registration_code
-                AND ur.reg_type IN (0, 2)
+                SELECT 1 FROM tzs_jg_use_registration ur WHERE ur.use_registration_code = tjurm.use_registration_code AND ur.reg_type IN (0, 2)
                 )
             </if>
             ORDER BY tjurm.create_date DESC

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

@@ -9,7 +9,6 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationUnitServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,8 +38,6 @@ public class JgChangeRegistrationUnitController extends BaseController {
 
     @Autowired
     JgChangeRegistrationUnitServiceImpl jgChangeRegistrationUnitServiceImpl;
-    @Autowired
-    CommonServiceImpl commonService;
 
     /**
      * 新增
@@ -174,7 +171,6 @@ public class JgChangeRegistrationUnitController extends BaseController {
         if (Objects.isNull(installationInfo)) {
             throw new IllegalArgumentException("参数installationInfo不能为空");
         }
-        ReginParams reginParams = getSelectedOrgInfo();
         jgChangeRegistrationUnitServiceImpl.cancel(installationInfo);
         return ResponseHelper.buildResponse(installationInfo);
     }
@@ -198,8 +194,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
         }
         JgChangeRegistrationUnitDto changeRegistrationUnitDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
         changeRegistrationUnitDto.setProcessAdvice(opinion);
-        ReginParams reginParams = getSelectedOrgInfo();
-        jgChangeRegistrationUnitServiceImpl.accept(changeRegistrationUnitDto, op, reginParams);
+        jgChangeRegistrationUnitServiceImpl.accept(changeRegistrationUnitDto, op);
         return ResponseHelper.buildResponse(null);
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -76,6 +76,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.yeejoin.amos.boot.module.jg.api.enums.CertificateStatusEnum.YIDENGJI;
 import static com.yeejoin.amos.boot.module.jg.biz.edit.core.SubClassFinder.getAllSubClasses;
 import static com.yeejoin.amos.boot.module.jg.biz.edit.utils.ReflectiveFieldAccessor.getAllFields;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgProjectContraptionServiceImplService.PROJECT_CONTRAPTION;
@@ -827,6 +828,7 @@ public class CommonEquipDataProcessService {
             JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfo.getUseOrgCode())
                     .eq(JgUseRegistrationManage::getIsDelete, 0)
+                    .eq(JgUseRegistrationManage::getCertificateStatus,YIDENGJI.getName())
                     .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode).one();
             result.put("receiveCompanyCode", jgUseRegistrationManage.getReceiveCompanyCode());
         }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleEquipChangeProcess.java

@@ -39,6 +39,8 @@ import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.yeejoin.amos.boot.module.jg.api.enums.CertificateStatusEnum.YIDENGJI;
+
 /**
  * 单个维护设备-策略实现类
  */
@@ -77,6 +79,8 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
         if (!ValidationUtil.isEmpty(registerInfoOld.getUseOrgCode())) {
             JgUseRegistrationManage jgUseRegistrationManage = commonEquipDataProcessService.getJgUseRegistrationManageService().lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfoOld.getUseOrgCode())
+                    .eq(JgUseRegistrationManage::getIsDelete,0)
+                    .eq(JgUseRegistrationManage::getCertificateStatus,YIDENGJI.getName())
                     .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode).one();
             useInfoOld.setReceiveCompanyCode(jgUseRegistrationManage.getReceiveCompanyCode());
         }

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

@@ -2545,7 +2545,7 @@ public class DataDockServiceImpl {
                 .auditPassDate(new Date())
                 .useRegistrationCode(paramsDto.getUseOrgCode())
                 .certificateNo(commonService.generateCertificateNo(equType, new Date(), paramsDto.getReceiveOrgCode()))
-                .regType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName())
+                .regType("1".equals(useReg.getRegType())? BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName():BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
                 .certificateStatus("已登记")
                 .regDate(new Date())
                 // .equUseAddress()
@@ -2555,6 +2555,7 @@ public class DataDockServiceImpl {
                 .manageType("unit")
                 .isScrap("0")
                 .version(1)
+                .registrationType("1".equals(useReg.getRegType()) ? "1" : "0")
                 .superviseOrgCode(paramsDto.getOrgBranchCode())
                 .superviseOrgName(paramsDto.getOrgBranchName())
                 .build();
@@ -3234,6 +3235,7 @@ public class DataDockServiceImpl {
         // 查询企业地址
         manage.setUseUnitAddress(this.queryUseUnitAddress(map));
         manage.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
+        manage.setRegistrationType("1".equals(jgUseRegistration.getRegType()) ? "1" : "0");
         manage.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());
         manage.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyCode());
         manage.setManageType(jgUseRegistration.getManageType());

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

@@ -1164,6 +1164,7 @@ public class EquipClaimServiceImpl {
                 .certificateNo(commonService.generateCertificateNo(equType, new Date(), useReg.getReceiveOrgCode()))
                 .regType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName())
                 .certificateStatus("已登记")
+                .registrationType("1")
                 .regDate(new Date())
                 .createDate(new Date())
                 .createUserId(userModel.getUserId())

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

@@ -5005,6 +5005,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 company.getCompanyCode().split("_")[1] : company.getCompanyCode());
         jgUseRegistrationManage.setReceiveCompanyCode(equipInfoDto.getReceiveOrgCode());
         jgUseRegistrationManage.setCertificateNo(generateCertificateNo(equipInfoDto, new Date(), equipInfoDto.getReceiveOrgCode()));
+        jgUseRegistrationManage.setRegistrationType("1");
         jgUseRegistrationManageService.save(jgUseRegistrationManage);
         return jgUseRegistrationManage;
     }

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

@@ -1160,6 +1160,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                         registrationManageNew.setSuperviseOrgCode(orgBranchArray[0]);
                         registrationManageNew.setSuperviseOrgName(StringUtil.isNotEmpty(orgBranchName) ? orgBranchName : orgBranchArray[1]);
                     }
+                    registrationManageNew.setRegistrationType("0");
                     // 添加到新列表中
                     newRegistrationList.add(registrationManageNew);
 

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

@@ -17,6 +17,7 @@ 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.enums.TcmUnitTypeEnum;
+import com.yeejoin.amos.boot.biz.common.enums.TcmUnitTypeEnum;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -352,7 +353,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(noticeDto.getEquListCode())) {
                 dealProjectContraptionToUpdate(submitType, noticeDto, op, reginParams);
             } else if (CylinderTypeEnum.CYLINDER.getCode().equals(noticeDto.getEquCategoryCode())) {
-                dealCylinderToUpdate1(submitType, noticeDto, op, reginParams);
+                this.dealCylinderToUpdate(submitType, noticeDto, op, reginParams);
             } else {
                 // 字段转换
                 this.convertField(noticeDto);
@@ -530,7 +531,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
     }
 
-    private void dealCylinderToUpdate1(String submitType, JgChangeRegistrationUnitDto changeRegistrationUnitDto, String op, ReginParams reginParams) {
+    private void dealCylinderToUpdate(String submitType, JgChangeRegistrationUnitDto changeRegistrationUnitDto, String op, ReginParams reginParams) {
         // 字段转换
         this.convertField(changeRegistrationUnitDto);
         // 获取单位变更设备列表
@@ -538,14 +539,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         if (CollectionUtils.isEmpty(deviceList)) {
             throw new BadRequest("请选择设备后提交");
         }
-        String applyNo = changeRegistrationUnitDto.getApplyNo();
-        List<String> applyNoList = ValidationUtil.isEmpty(applyNo)
-                ? Optional.ofNullable(tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.DWBG.getCode(), 1))
-                .filter(r -> r.getStatus() == HttpStatus.OK.value() && !CollectionUtils.isEmpty(r.getResult()))
-                .map(ResponseModel::getResult)
-                .orElseThrow(() -> new BadRequest("生成申请变更单位编码失败！"))
-                : Collections.singletonList(applyNo);
-
         if (SUBMIT_TYPE_FLOW.equals(submitType)) { //放在最后面防止前面有异常
             //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
             CompanyBo company = reginParams.getCompany();
@@ -872,13 +865,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     }
 
     /**
-     * 气瓶单位变更业务
+     * 气瓶单位变更业务新增
      * @param submitType
      * @param changeRegistrationUnitDto
-     * @param op
      * @param reginParams
      */
-    private JgChangeRegistrationUnitDto dealCylinderToSave(String submitType, JgChangeRegistrationUnitDto changeRegistrationUnitDto, String op, ReginParams reginParams) {
+    private void dealCylinderToSave(String submitType, JgChangeRegistrationUnitDto changeRegistrationUnitDto, ReginParams reginParams) {
         String[] taskName = new String[]{"流程结束"};
         // 字段转换
         this.convertField(changeRegistrationUnitDto);
@@ -1041,7 +1033,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         registrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
                 .eq(JgRegistrationHistory::getCurrentDocumentId, registrationUnit.getApplyNo()));
         registrationHistoryService.save(jgRegistrationHistory);
-        return changeRegistrationUnitDto;
     }
 
     /**
@@ -1351,7 +1342,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             // 字段转换
             convertField(model);
             if (CylinderTypeEnum.CYLINDER.getCode().equals(model.getEquCategoryCode())) {
-                this.dealCylinderToSave(submitType, model, "", reginParams);
+                this.dealCylinderToSave(submitType, model, reginParams);
             } else{
                 // 获取单位变更使用登记证列表
                 List<Map<String, Object>> registrationList = model.getRegistrationList();
@@ -1536,7 +1527,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 jgRegistrationHistory.setRegistrationClass("单位变更登记");
                 jgRegistrationHistory.setCurrentDocumentId(registrationUnit.getApplyNo());
                 //使用登记证历史数据
-                jgRegistrationHistory.setChangeData(JSONObject.toJSONString(deviceList));
+                jgRegistrationHistory.setChangeData(JSONObject.toJSONString(registrationList));
                 //先删除之前设备关系数据，在插入最新设备关系数据
                 registrationUnitEqService.getBaseMapper().delete(new LambdaQueryWrapper<JgChangeRegistrationUnitEq>()
                         .eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, registrationUnit.getSequenceNbr()));
@@ -1561,8 +1552,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
     }
 
-
-
     private void rollBackForDelRedisData() {
         FlowingEquipRedisContext.getContext().forEach(e -> {
             EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY).delDataForCheckWithKey(e.getData(), e.getRedisKey());
@@ -1784,14 +1773,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     /**
      * @param dto
      * @param op          void
-     * @param reginParams
      * @description 执行流程
      * @author wangguo
      * @date 2024/7/18 11:00
      **/
     @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
     @Transactional(rollbackFor = Exception.class)
-    public void accept(JgChangeRegistrationUnitDto dto, String op, ReginParams reginParams) {
+    public void accept(JgChangeRegistrationUnitDto dto, String op) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(dto.getInstanceId());
         RLock lock = redissonClient.getLock(lockKey);
         try {
@@ -1993,6 +1981,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                 // 新证属性重置
                                 newManage.setCertificateStatus("已登记");
                                 newManage.setVersion(1);
+                                newManage.setRegistrationType("0");
                                 newManage.setEquUseAddress(registration.getEquAddress());
                                 // 如果 equListCode = 5000，则设置车牌号
                                 if (EQU_CODE_CC.equals(registrationManage.getEquListCode())) {
@@ -2095,169 +2084,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
     /**
      * 处理气瓶单位变更三级审核完成后数据
-     * @param dto 变更数据
-     * @param nextTaskId taskId
-     * @param registration 单位变更主表数据
-     * @param op 通过
-     */
-    private void dealCylinderAuditPassData1(JgChangeRegistrationUnitDto dto, String nextTaskId, JgChangeRegistrationUnit registration, String op) {
-        List<Map<String, Object>> deviceList = dto.getDeviceList();
-        if (CollUtil.isEmpty(deviceList)) {
-            throw new BadRequest("设备列表不能为空！");
-        }
-        registration.setNextTaskId(nextTaskId);
-        TaskV2Model taskV2Model = updateTaskModel(registration, op);
-        AtomicReference<Boolean> flag = new AtomicReference<>(Boolean.FALSE);
-        String useRegistrationCode;
-        JgUseRegistrationManageDto manageDto = new JgUseRegistrationManageDto();
-        manageDto.setCertificateStatus(CertificateStatusEnum.YIDENGJI.getName());
-        manageDto.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
-        manageDto.setRegType("0");
-        useRegistrationCode = Optional.ofNullable(jgUseRegistrationManageMapper.queryByUseUnitCreditCode(manageDto))
-                .filter(list -> !list.isEmpty())
-                .flatMap(list -> list.stream()
-                        .map(JgUseRegistrationManageDto::getUseRegistrationCode)
-                        .filter(code -> code.startsWith("瓶30"))
-                        .findFirst())
-                .map(code -> {
-                    flag.set(Boolean.TRUE);
-                    return code;
-                }).orElse(commonServiceImpl.generateRegistrationCode(Objects.toString(deviceList.get(0).get(RECORD)), dto.getReceiveCompanyCode(), true));
-
-        List<String> records = new ArrayList<>();
-        Map<String, Map<String, Object>> resultMap = new HashMap<>();
-
-        TzBaseEnterpriseInfo enterpriseInfo = Optional.ofNullable(dto.getEstateUnitSeq())
-                .filter(ObjectUtils::isNotEmpty)
-                .map(tzBaseEnterpriseInfoMapper::selectById)
-                .orElse(null);
-
-        for (Map<String, Object> map : deviceList) {
-            String record = MapUtils.getString(map, RECORD);
-            records.add(record);
-            LambdaQueryWrapper<IdxBizJgUseInfo> useInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            useInfoLambdaQueryWrapper.eq(IdxBizJgUseInfo::getRecord, record);
-            IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(useInfoLambdaQueryWrapper);
-
-            //更新产权信息
-            if (ObjectUtils.isNotEmpty(useInfo)) {
-                if (enterpriseInfo != null) {
-                    useInfo.setEstateUnitCreditCode(enterpriseInfo.getUseUnitCode()).setEstateUnitName(enterpriseInfo.getUseUnit());
-                }
-                useInfoMapper.updateById(useInfo
-                        .setPhone(dto.getPhone())
-                        .setUseUnitCreditCode(registration.getNewUseUnitCreditCode())
-                        .setUseUnitName(registration.getNewUseUnitName())
-                        .setSafetyManager(Optional.ofNullable(dto.getSafetyManager())
-                                .map(s -> s.split(","))
-                                .filter(arr -> arr.length > 1)
-                                .map(arr -> arr[1])
-                                .orElse(""))
-                        .setProvinceName("陕西省")
-                        .setProvince(dto.getProvince())
-                        .setCity(dto.getCity())
-                        .setCityName(getRegionNameByCode("city", dto.getCity()))
-                        .setCounty(dto.getCounty())
-                        .setCountyName(getRegionNameByCode("region", dto.getCounty()))
-                        .setFactoryUseSiteStreet(dto.getStreet())
-                        .setStreetName(getRegionNameByCode("street", dto.getStreet()))
-                        .setAddress(dto.getFullAddress())
-                        .setCity(dto.getCity())
-                        .setCounty(dto.getCounty())
-                        .setFactoryUseSiteStreet(dto.getStreet())
-                        .setUseDate(dto.getUseDate()));
-            }
-            //更新属地信息
-            IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = new IdxBizJgSupervisionInfo();
-            if (!ObjectUtils.isEmpty(dto.getOrgBranchCode())) {
-                HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(registration.getOrgBranchCode()).getResult();
-                CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
-                idxBizJgSupervisionInfo.setOrgBranchCode(registration.getOrgBranchCode());
-                idxBizJgSupervisionInfo.setOrgBranchName(registration.getOrgBranchName());
-                idxBizJgSupervisionInfo.setCompanyOrgBranchCode(parentModel.getCompanyCode());
-                LambdaQueryWrapper<IdxBizJgSupervisionInfo> eq = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda()
-                        .eq(IdxBizJgSupervisionInfo::getRecord, record);
-                idxBizJgSupervisionInfoMapper.update(idxBizJgSupervisionInfo, eq);
-            }
-            //更新注册信息
-            LambdaUpdateWrapper<IdxBizJgRegisterInfo> lambda = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda();
-            lambda.eq(IdxBizJgRegisterInfo::getRecord, record);
-            lambda.set(true, IdxBizJgRegisterInfo::getUseOrgCode, useRegistrationCode);
-            idxBizJgRegisterInfoService.update(lambda);
-
-            Map<String, Object> esUpdateParams = new HashMap<>();
-            esUpdateParams.put("USE_UNIT_CREDIT_CODE", registration.getNewUseUnitCreditCode());
-            esUpdateParams.put("USE_UNIT_NAME", registration.getNewUseUnitName());
-            esUpdateParams.put("REC_DATE", new Date());
-            esUpdateParams.put("USE_PLACE", joinWithSeparator("/", useInfo.getProvinceName(), useInfo.getCityName(), useInfo.getCountyName(), useInfo.getStreetName()));
-            esUpdateParams.put("USE_PLACE_CODE", joinWithSeparator("#", useInfo.getProvince(), useInfo.getCity(), useInfo.getCounty(), useInfo.getFactoryUseSiteStreet()));
-            esUpdateParams.put("ORG_BRANCH_CODE", registration.getOrgBranchCode());
-            esUpdateParams.put("ORG_BRANCH_NAME", registration.getOrgBranchName());
-            esUpdateParams.put("USE_ORG_CODE", useRegistrationCode);
-            resultMap.put(record, esUpdateParams);
-            tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
-        }
-        JgUseRegistrationManage registrationManage;
-        if (flag.get()){
-            //获取使用登记证
-            LambdaQueryWrapper<JgUseRegistrationManage> useRegistrationManageWrapper = new LambdaQueryWrapper<>();
-            useRegistrationManageWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
-                    .isNotNull(JgUseRegistrationManage::getUseRegistrationCode)
-                    .eq(JgUseRegistrationManage::getCertificateStatus, "已登记")
-                    .eq(BaseEntity::getIsDelete, false);
-            registrationManage = useRegistrationManageService.getBaseMapper().selectOne(useRegistrationManageWrapper);
-            //修改使用登记证管理使用单位地址、使用单位代码、接收机构、接收机构公司代码、办理日期、使用单位地址
-            registrationManage.setUseUnitName(registration.getNewUseUnitName());
-            registrationManage.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
-            registrationManage.setReceiveOrgName(registration.getReceiveOrgName());
-            registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
-            registrationManage.setAuditPassDate(registration.getAuditPassDate());
-            registrationManage.setVersion(registrationManage.getVersion() + 1);
-            registrationManage.setChangeReason(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
-            if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {//回填新单位地址
-                TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", registration.getNewUseUnitCreditCode()));
-                if (useCodeResult != null) {
-                    registrationManage.setUseUnitAddress(useCodeResult.getAddress());
-                }
-            }
-            registrationManage.setRecUserId(registration.getCreateUserId());
-            useRegistrationManageService.updateById(registrationManage);
-        }else{
-            registrationManage = new  JgUseRegistrationManage();
-            registrationManage.setSequenceNbr(sequence.nextId());
-            registrationManage.setUseRegistrationCode(useRegistrationCode);
-            //修改使用登记证管理使用单位地址、使用单位代码、接收机构、接收机构公司代码、办理日期、使用单位地址
-            registrationManage.setUseUnitName(registration.getNewUseUnitName());
-            registrationManage.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
-            registrationManage.setReceiveOrgName(registration.getReceiveOrgName());
-            registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
-            registrationManage.setAuditPassDate(registration.getAuditPassDate());
-            registrationManage.setVersion(1);
-            registrationManage.setRegType("0");
-            registrationManage.setChangeReason(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
-            if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {
-                TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", registration.getNewUseUnitCreditCode()));
-                if (useCodeResult != null) {
-                    registrationManage.setUseUnitAddress(useCodeResult.getAddress());
-                }
-            }
-            registrationManage.setRecUserId(registration.getCreateUserId());
-            useRegistrationManageService.save(registrationManage);
-        }
-        // 发送数据变更消息
-        this.sendDataRefreshMsg(registration);
-        //新增使用登记证和设备变更记录
-        this.saveRecord(registration);
-        //创建设备履历
-        this.createResume(records, registration, taskV2Model.getRoutePath());
-        JgChangeRegistrationUnitMapper.updateById(registration);
-        // redis流程实时数据更新
-        commonServiceImpl.saveExecuteFlowData2Redis(dto.getInstanceId(), this.buildInstanceRuntimeData(registration));
-        this.delRepeatUseEquipData(registration.getApplyNo(), registration.getStatus(), registration.getNewUseUnitCreditCode());
-    }
-
-    /**
-     * 处理气瓶单位变更三级审核完成后数据
      */
     private void dealCylinderAuditPassData(JgChangeRegistrationUnitDto dto, String nextTaskId, JgChangeRegistrationUnit registration, String op) {
         List<Map<String, Object>> deviceList = dto.getDeviceList();
@@ -2318,17 +2144,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         // 7. 新增或更新使用登记证管理表
         upsertUseRegistrationManage(registration, useRegistrationCode, existedRegistrationFlag.get());
 
-        // 8. 发送变更消息、保存变更记录、创建设备履历等后置处理
-        this.sendDataRefreshMsg(registration);
-        this.saveRecord(registration);
+//        // 8. 发送变更消息、保存变更记录、创建设备履历等后置处理
+//        this.sendDataRefreshMsg(registration);
+//        this.saveRecord(registration);
         this.createResume(records, registration, taskV2Model.getRoutePath());
-
-        // 9. 更新主表并刷新 redis 实时流程数据
-        JgChangeRegistrationUnitMapper.updateById(registration);
-        commonServiceImpl.saveExecuteFlowData2Redis(dto.getInstanceId(), this.buildInstanceRuntimeData(registration));
-
-        // 10. 删除重复使用标识
-        this.delRepeatUseEquipData(registration.getApplyNo(), registration.getStatus(), registration.getNewUseUnitCreditCode());
+//
+//        // 9. 更新主表并刷新 redis 实时流程数据
+//        JgChangeRegistrationUnitMapper.updateById(registration);
+//        commonServiceImpl.saveExecuteFlowData2Redis(dto.getInstanceId(), this.buildInstanceRuntimeData(registration));
+//
+//        // 10. 删除重复使用标识
+//        this.delRepeatUseEquipData(registration.getApplyNo(), registration.getStatus(), registration.getNewUseUnitCreditCode());
     }
 
     private String findOrGenerateUseRegistrationCode(JgChangeRegistrationUnitDto dto, JgChangeRegistrationUnit registration,
@@ -2337,6 +2163,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         // 查询新单位存在的已登记使用登记证（只取以 "瓶30" 开头的）系统生成的证号
         JgUseRegistrationManageDto queryDto = new JgUseRegistrationManageDto();
         queryDto.setCertificateStatus(CertificateStatusEnum.YIDENGJI.getName());
+        queryDto.setRegistrationType("0");
         queryDto.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
         List<JgUseRegistrationManageDto> found = jgUseRegistrationManageMapper.queryByUseUnitCreditCode(queryDto);
         if (!CollectionUtils.isEmpty(found)) {
@@ -2367,16 +2194,16 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     .setEstateUnitName(enterpriseInfo.getUseUnit());
         }
 
-        String safetyManager = Optional.ofNullable(dto.getSafetyManager())
-                .map(s -> s.split(","))
+        String safetyManager = Optional.ofNullable(registration.getSafetyManager())
+                .map(s -> s.split("_"))
                 .filter(arr -> arr.length > 1)
                 .map(arr -> arr[1])
                 .orElse("");
-
-        useInfo.setPhone(dto.getPhone());
+        useInfo.setPhone(registration.getPhone());
         useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
         useInfo.setUseUnitName(registration.getNewUseUnitName());
         useInfo.setSafetyManager(safetyManager);
+        useInfo.setUsePlace(registration.getUsePlace());
 
         // 地区/地址字段回填（保持原字段赋值顺序与语义）
         useInfo.setProvinceName("陕西省")
@@ -2458,7 +2285,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             newManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
             newManage.setAuditPassDate(registration.getAuditPassDate());
             newManage.setVersion(1);
-            newManage.setRegType("使用登记");
+            newManage.setRegType("单位变更登记");
+            newManage.setRegistrationType("0");
             newManage.setManageType("unit");
             newManage.setApplyNo(registration.getApplyNo());
             newManage.setEquUseAddress(registration.getEquAddress());
@@ -2647,6 +2475,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     }
                 }
                 registrationManage.setRecUserId(registration.getCreateUserId());
+                registrationManage.setRegistrationType("0");
+                registrationManage.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName());
                 useRegistrationManageService.save(registrationManage);
                 //更新装置表
                 idxBizJgProjectContraption.setUseRegistrationCode(code);

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

@@ -565,6 +565,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             // 生成新的使用登记证编号
             String code = this.generateVehicleUseRegistrationCode(receiveCompanyCode, manage.getEquDefineCode());
             manage.setUseRegistrationCode(code);
+            manage.setRegistrationType("0");
             // 更新设备使用登记证信息
             LambdaQueryWrapper<IdxBizJgRegisterInfo> lambda = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
             lambda.in(IdxBizJgRegisterInfo::getRecord, collect);

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

@@ -840,6 +840,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         resultMap.put("sequenceNbr", enableDisable.getSequenceNbr());
         resultMap.put("applyNo", enableDisable.getApplyNo());
         resultMap.put("auditStatus", enableDisable.getAuditStatus());
+        resultMap.put("useUnitCreditCode", enableDisable.getUseUnitCreditCode());
         commonService.convertStringToJsonobject(resultMap, new String[]{"otherAccessories"});
         new FillingEditPermForCurrentUser(new JSONObject(resultMap), company, BusinessTypeEnum.JG_EQUIPMENT_START_STOP).getData();
         return resultMap;

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

@@ -900,6 +900,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     }
 
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
     public JgMaintenanceContract cancelApplication(Long sequenceNbr, String cancelReason) {
         JgMaintenanceContract maintenanceContract = this.getById(sequenceNbr);
         // 1.更新为已作废

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

@@ -242,6 +242,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 jgUseRegistrationManage.setManageType(useRegistration.getManageType());
                 jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
                 jgUseRegistrationManage.setUseRegistrationCode(useRegistration.getUseRegistrationCode());
+                jgUseRegistrationManage.setRegistrationType("1".equals(useRegistration.getRegType()) ? "1" : "0");
                 jgUseRegistrationManage.setUseUnitCreditCode(useRegistration.getUseUnitCreditCode());
                 jgUseRegistrationManage.setReceiveCompanyCode(useRegistration.getReceiveCompanyCode());
                 jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, useRegistration.getAuditPassDate(), useRegistration.getReceiveCompanyCode()));
@@ -285,6 +286,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 jgUseRegistrationManage.setCarNumber(vehicleInformation.getCarNumber());
                 jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
                 jgUseRegistrationManage.setUseRegistrationCode(vehicleInformation.getUseRegistrationCode());
+                jgUseRegistrationManage.setRegistrationType("1".equals(vehicleInformation.getRegType()) ? "1" : "0");
                 jgUseRegistrationManage.setUseUnitCreditCode(vehicleInformation.getUseUnitCreditCode());
                 jgUseRegistrationManage.setReceiveCompanyCode(vehicleInformation.getReceiveCompanyCode());
                 jgUseRegistrationManage.setGasNum(vehicleInformation.getGasNum());
@@ -736,7 +738,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         }
         List<JSONObject> deviceList = this.queryEquByCertificate(manage);
         if (ValidationUtil.isEmpty(deviceList)) {
-            throw new BadRequest("设备信息为空，导出失败！");
+            throw new BadRequest("使用登记证下无设备，导出失败！");
         }
         Map<String, Object> params = buildExportParams(manage, deviceList);
         JSONObject tagJson = Optional.ofNullable(manage.getCertificatePrintTag())

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

@@ -1709,6 +1709,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistrationManage.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());
         jgUseRegistrationManage.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyCode());
         jgUseRegistrationManage.setManageType(jgUseRegistration.getManageType());
+        jgUseRegistrationManage.setRegistrationType("1".equals(jgUseRegistration.getRegType()) ? "1" : "0");
         jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, new Date(), jgUseRegistration.getReceiveCompanyCode()));
         this.setSuperviseOrgInfo(jgUseRegistrationManage, jgUseRegistration);
         jgUseRegistrationManageService.save(jgUseRegistrationManage);

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

@@ -1542,7 +1542,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     }
 
     @Transactional(rollbackFor = Exception.class)
-    @GlobalTransactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
     public JgVehicleInformation cancelApplication(Long sequenceNbr, String cancelReason) {
         JgVehicleInformation vehicleInformation = this.getById(sequenceNbr);
         // 0.作废校验
@@ -1839,6 +1839,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         jgUseRegistrationManage.setCertificateNo(commonService.generateCertificateNo(equType, new Date(), jgVehicleInformation.getReceiveCompanyCode()));
         jgUseRegistrationManage.setSuperviseOrgName(jgVehicleInformation.getOrgBranchName());
         jgUseRegistrationManage.setSuperviseOrgCode(jgVehicleInformation.getOrgBranchCode());
+        jgUseRegistrationManage.setRegistrationType("1".equals(jgVehicleInformation.getRegType())? "1": "0");
         jgUseRegistrationManageService.save(jgUseRegistrationManage);
     }
 

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

@@ -402,6 +402,7 @@ public class ShCarServiceImpl extends BaseService<ShCar, ShCar, ShCarMapper> imp
                 .carNumber(jgVehicleInformation.getCarNumber())
                 .createDate(new Date())
                 .gasNum(equList.size())
+                .registrationType("1".equals(jgVehicleInformation.getRegType()) ? "1" : "0")
                 .useUnitAddress(jgVehicleInformation.getUseUnitAddress())
                 .manageType("unit")
                 .isScrap("0")