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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.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.entity.JgInstallationNoticeEq;
@@ -136,12 +138,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     ESEquipmentCategory esEquipmentCategory;
     @Autowired
     ICommonService commonService;
-
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
     @Autowired
     private CategoryOtherInfoMapper categoryOtherInfoMapper;
     @Autowired
     private SuperviseInfoMapper superviseInfoMapper;
-
     @Autowired
     private JgInstallationNoticeEqServiceImpl jgInstallationNoticeEqServiceImpl;
     @Autowired
@@ -1191,6 +1193,20 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         return object;
     }
 
+    /**
+     * 获取类型为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);
+        DataDictionary dictionary = list.get(0);
+        return ObjectUtils.isEmpty(dictionary) ? "" : dictionary.getCode();
+    }
+
     private String batchSubmitOrUpdate(LinkedHashMap equipmentClassForm,LinkedHashMap equipmentInfoForm,LinkedHashMap equipmentParamsForm) {
         Date date = new Date();
         String record = null;
@@ -1253,6 +1269,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // Bean.copyExistPropertis(equipmentClassRegisterInfo, registerInfo);
         registerInfo.setRecord(record);
         registerInfo.setRecDate(date);
+        registerInfo.setRegisterState(this.getRegCode());
         registerInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("REGISTERINFO_SEQ")));
         this.saveOrUpdate(registerInfo);