fix(jg)：bug修改,设备注册时补充注册表REGISTER_STATE字段为“未注册”，使用登记审核通过后改成“已注册”

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

@@ -1194,13 +1194,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     /**
-     * 获取类型为ZC的“已注册”的字典值
+     * 获取类型为ZC的“未注册”的字典值
      * @return code
      */
     private String getRegCode(){
         QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("type", "ZC");
-        queryWrapper.eq("name", "已注册");
+        queryWrapper.eq("name", "未注册");
         queryWrapper.eq("is_delete", false);
         List<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
         if (!list.isEmpty() && list.get(0) != null) {

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

@@ -5,8 +5,12 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
@@ -92,6 +96,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     CmWorkflowServiceImpl cmWorkflowService;
     @Autowired
     IdxBizJgSupervisionInfoMapper idxBizJgSupervisionInfoMapper;
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
 
     private static final String DEFINITION_KEY = "useRegistration";
 
@@ -174,6 +180,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 更新检验检测信息
 //        inspectionDetectionInfo.setInspectReport(null);
         inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
+        // 更新注册登记信息表
+        LambdaQueryWrapper<JgUseRegistrationEq> jgUseRegEqWrapper = new QueryWrapper<JgUseRegistrationEq>().lambda();
+        jgUseRegEqWrapper.eq(JgUseRegistrationEq::getEquipTransferId,currentDocumentId);
+        jgUseRegEqWrapper.eq(JgUseRegistrationEq::getIsDelete, false);
+        JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(jgUseRegEqWrapper);
+        LambdaUpdateWrapper<IdxBizJgRegisterInfo> IdxBizJgRegLambda = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda();
+        IdxBizJgRegLambda.eq(IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId()).set(IdxBizJgRegisterInfo::getRegisterState, this.getRegCode());
+        idxBizJgRegisterInfoService.update(IdxBizJgRegLambda);
         // 更新设备监管部门
         IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = new IdxBizJgSupervisionInfo();
         if (map.containsKey("orgBranchCode") && !ObjectUtils.isEmpty(map.get("orgBranchCode"))) {
@@ -189,6 +203,23 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         createCode(String.valueOf(map.get("equipId")), map, useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + useInfo.getStreetName(), jgUseRegistration);
     }
 
+    /**
+     * 获取类型为ZC的“已注册”的字典值
+     * @return code
+     */
+    private String getRegCode(){
+        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", "ZC");
+        queryWrapper.eq("name", "已注册");
+        queryWrapper.eq("is_delete", false);
+        List<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+        if (!list.isEmpty() && list.get(0) != null) {
+            DataDictionary dictionary = list.get(0);
+            return Optional.ofNullable(dictionary).map(DataDictionary::getCode).orElse("");
+        }
+        return "";
+    }
+
     public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode) {
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();