fix(jg):已完成的使用登记单，作废时作废其使用登记证

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

@@ -2322,7 +2322,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private JgUseRegistrationManage saveRegistrationManage(EquipmentInfoDto equipInfoDto, CompanyBo company) {
         JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
         jgUseRegistrationManage.setApplyNo(this.getApplicationNo());
-        jgUseRegistrationManage.setCertificateStatus("已登记");
+        jgUseRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIDENGJI.getName());
         jgUseRegistrationManage.setReceiveOrgName(equipInfoDto.getReceiveOrgName());
         jgUseRegistrationManage.setAuditPassDate(new Date());
         jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName());

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
 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.CertificateStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
@@ -123,7 +124,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
             jgUseRegistrationManage.setUseUnitName(useRegistration.getUseUnitName());
             jgUseRegistrationManage.setApplyNo(useRegistration.getApplyNo());
-            jgUseRegistrationManage.setCertificateStatus("已登记");
+            jgUseRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIDENGJI.getName());
             jgUseRegistrationManage.setReceiveOrgName(useRegistration.getReceiveOrgName());
             jgUseRegistrationManage.setAuditPassDate(useRegistration.getAuditPassDate());
             jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName());
@@ -164,7 +165,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
             jgUseRegistrationManage.setUseUnitName(vehicleInformation.getUseUnitName());
             jgUseRegistrationManage.setApplyNo(vehicleInformation.getApplyNo());
-            jgUseRegistrationManage.setCertificateStatus("已登记");
+            jgUseRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIDENGJI.getName());
             jgUseRegistrationManage.setReceiveOrgName(vehicleInformation.getReceiveOrgName());
             jgUseRegistrationManage.setAuditPassDate(vehicleInformation.getAuditPassDate());
             jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName());

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

@@ -997,7 +997,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
         jgUseRegistrationManage.setUseUnitName(jgUseRegistration.getUseUnitName());
         jgUseRegistrationManage.setApplyNo(jgUseRegistration.getApplyNo());
-        jgUseRegistrationManage.setCertificateStatus("已登记");
+        jgUseRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIDENGJI.getName());
         jgUseRegistrationManage.setReceiveOrgName(jgUseRegistration.getReceiveOrgName());
         jgUseRegistrationManage.setAuditPassDate(jgUseRegistration.getAuditPassDate());
         jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName());
@@ -1937,7 +1937,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     // 使用单位
                     exportParamsMap.put("useUnitName", jsonObject.get("useUnitName"));
                     // 使用单位地址
-                    exportParamsMap.put("fullAddress", jsonObject.get("fullAddress"));
+                    exportParamsMap.put("fullAddress", ValidationUtil.isEmpty(jsonObject.get("fullAddress")) ? "" :jsonObject.get("fullAddress"));
                     // 工程（装置）名称 取第一个设备的技术参数”工程装置名称“
                     JSONObject eqJSON = (JSONObject) equipmentLists.get(0);
                     String eqId = !ValidationUtil.isEmpty(eqJSON) ? String.valueOf(eqJSON.get("record")) : "";
@@ -2164,6 +2164,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 this.clearUseInfoOfEquip(jgUseRegistration);
                 // 2.清空redis（缓存的流程中及已完成使用登记的设备）
                 this.clearDataForCheckEquipRepeatUsed(jgUseRegistration);
+                // 3.作废对应的使用登记证
+                this.invalidUseRegistrationCertificate(jgUseRegistration);
                 break;
             default:
                 // 流程中
@@ -2208,6 +2210,24 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
+    /**
+     * 作废使用登记证
+     * @param jgUseRegistration
+     */
+    private void invalidUseRegistrationCertificate(JgUseRegistration jgUseRegistration){
+        Integer count = jgUseRegistrationMapper.selectCount(new LambdaQueryWrapper<JgUseRegistration>()
+                .eq(JgUseRegistration::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode()));
+        // 一证对应多条使用登记单时，不作废证
+        if (count > 1){
+            return;
+        }
+        JgUseRegistrationManage registrationManage = new JgUseRegistrationManage();
+        registrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName());
+        LambdaQueryWrapper<JgUseRegistrationManage> wrapper = new LambdaQueryWrapper<JgUseRegistrationManage>()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode());
+        jgUseRegistrationManageMapper.update(registrationManage,wrapper);
+    }
+
     private void rollBackSupervisionInfo(String record) {
         LambdaUpdateWrapper<IdxBizJgSupervisionInfo> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(IdxBizJgSupervisionInfo::getRecord, record);

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

@@ -20,10 +20,7 @@ import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 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.CylinderTypeEnum;
-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.enums.*;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgVehicleInformationService;
@@ -1446,7 +1443,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
         jgUseRegistrationManage.setUseUnitName(jgVehicleInformation.getUseUnitName());
         jgUseRegistrationManage.setApplyNo(jgVehicleInformation.getApplyNo());
-        jgUseRegistrationManage.setCertificateStatus("已登记");
+        jgUseRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIDENGJI.getName());
         jgUseRegistrationManage.setReceiveOrgName(jgVehicleInformation.getReceiveOrgName());
         jgUseRegistrationManage.setAuditPassDate(jgVehicleInformation.getAuditPassDate());
         jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName());