Merge branch 'develop_tzs_register' of…

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

@@ -908,6 +908,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 updateRegisterWrapper.eq(IdxBizJgRegisterInfo::getRecord, registerInfo.getRecord());
                 updateRegisterWrapper.set(true, IdxBizJgRegisterInfo::getUseOrgCode, code);
                 updateRegisterWrapper.set(IdxBizJgRegisterInfo::getRegisterState, this.getRegCode());
+                updateRegisterWrapper.set(IdxBizJgRegisterInfo::getCarNumber, jgVehicleInformation.getCarNumber());
                 idxBizJgRegisterInfoService.update(updateRegisterWrapper);
 
                 // 查询其他信息
@@ -1077,6 +1078,12 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         useInfo.setUseDate(jgVehicleInformation.getUseDate());
         useInfo.setEstateUnitCreditCode(jgVehicleInformation.getEstateUnitCreditCode());
         useInfo.setEstateUnitName(jgVehicleInformation.getEstateUnitName());
+        useInfo.setSafetyManagerId(jgVehicleInformation.getSafetyManagerId());
+        useInfo.setSafetyManager(jgVehicleInformation.getSafetyManagerName());
+        useInfo.setPhone(jgVehicleInformation.getPhone());
+        useInfo.setUseDate(jgVehicleInformation.getUseDate());
+        useInfo.setUseInnerCode(jgVehicleInformation.getCarNumber());
+
         LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
         lambda.eq(IdxBizJgUseInfo::getRecord, map.get("record"));
 
@@ -1109,8 +1116,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             LambdaQueryWrapper<IdxBizJgSupervisionInfo> eq = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda().eq(IdxBizJgSupervisionInfo::getRecord, map.get("record"));
             idxBizJgSupervisionInfoMapper.update(idxBizJgSupervisionInfo, eq);
         }
-        // 更新设备使用登记证
-        idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("record")), useOrgCode);
         // 车用气瓶生成监管码
         this.createCode(jgVehicleInformation, registerInfo, otherInfo);
     }