修改bug

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

@@ -882,15 +882,26 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
 
             String useRegistrationCode = null;
+            Long useRegistrationManageSeq = null;
             Boolean flag = Boolean.FALSE;
             String equCategoryCode = String.valueOf(mapData.get("EQU_CATEGORY_CODE"));
             String equDefineCode = String.valueOf(mapData.get("EQU_DEFINE_CODE"));
+            if (mapData.containsKey("equipmentLists") && !ObjectUtils.isEmpty(mapData.get("equipmentLists"))){
+                JSONArray objects = JSONObject.parseArray(mapData.get("equipmentLists").toString());
+                if (!ObjectUtils.isEmpty(objects)){
+                    JSONObject object = JSONObject.parseObject(JSON.toJSONString(objects.get(0)));
+                    if (object.containsKey("equDefine")){
+                        equDefineCode = String.valueOf(object.get("equDefine"));
+                    }
+                }
+            }
             //如果是气瓶或工业管道判断之前是否已经做过使用登记
             if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategoryCode) || PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)) {
                 // 获取最新的使用登记记录
                 String useUnitCreditCode = jgUseRegistration.getUseUnitCreditCode();
                 JgUseRegistrationManage jgUseRegistrationManage = commonServiceImpl.getLatestJgUseRegistrationManage(useUnitCreditCode, equDefineCode);
                 useRegistrationCode = ObjectUtils.isEmpty(jgUseRegistrationManage) ? useRegistrationCode : jgUseRegistrationManage.getUseRegistrationCode();
+                useRegistrationManageSeq = ObjectUtils.isEmpty(jgUseRegistrationManage) ? useRegistrationManageSeq : jgUseRegistrationManage.getSequenceNbr();
                 flag = ObjectUtils.isEmpty(useRegistrationCode) ? flag : Boolean.TRUE;
             }
 
@@ -930,7 +941,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
 
             // 生成证书管理表
-            generateRegistrationManage(jgUseRegistration, registerInfo, flag, useRegistrationCode);
+            generateRegistrationManage(jgUseRegistration, registerInfo, flag, useRegistrationManageSeq);
 
             // 生成一条tzs_jg_certificate_change_record记录
             generateCertificateChangeRecord(jgUseRegistration, registerInfo, changeRecordId, taskV2Model, flag);
@@ -979,13 +990,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * @param jgUseRegistration 使用登记单
      * @param registerInfo 一码通设备注册信息表
      */
-    private void generateRegistrationManage(JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo, Boolean flag, String useRegistrationCode) {
+    private void generateRegistrationManage(JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo, Boolean flag, Long useRegistrationManageSeq) {
 
         if (flag) {
-            LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode);
-            JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageMapper.selectOne(queryWrapper);
+//            LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<>();
+//            queryWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode);
+//            JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageMapper.selectOne(queryWrapper);
+            JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage();
             jgUseRegistrationManage.setAuditPassDate(jgUseRegistration.getAuditPassDate());
+            jgUseRegistrationManage.setSequenceNbr(useRegistrationManageSeq);
             jgUseRegistrationManageMapper.updateById(jgUseRegistrationManage);
             return;
         }