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/controller/ShCarController.java

@@ -122,7 +122,8 @@ public class ShCarController extends BaseController {
                         record.setClaimedFlag("是");
                         JgUseRegistrationManage manage = jgUseRegistrationManageServiceImpl.getBaseMapper()
                                 .selectOne(new LambdaQueryWrapper<JgUseRegistrationManage>()
-                                        .eq(JgUseRegistrationManage::getUseRegistrationCode, record.getUseRegistrationCode()));
+                                        .eq(JgUseRegistrationManage::getUseRegistrationCode, record.getUseRegistrationCode())
+                                        .eq(JgUseRegistrationManage::getIsDelete, false));
                         record.setCertificateSeq(manage != null ? String.valueOf(manage.getSequenceNbr()) : null);
                     } else if ("0".equals(record.getClaimedFlag())) {
                         record.setClaimedFlag("否");

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/DataHandlerServiceImpl.java

@@ -1363,19 +1363,19 @@ public class DataHandlerServiceImpl {
                     }
                     //  3.未纳管且有使用登记证为空
                     String whetherVehicleCylinder = StringUtils.isEmpty(equip.getWhetherVehicleCylinder()) ? "0" : equip.getWhetherVehicleCylinder();
-                    // 3.1非车用气瓶逻辑 1
+                    // 3.1非车用气瓶逻辑 3 未纳管气瓶没有使用登记，直接都为3级
                     if ((!equip.getIsIntoManagement()) && StringUtils.isNotEmpty(equip.getUseOrgCode()) && "0".equals(whetherVehicleCylinder)) {
-                        EquipWaitRefreshDataQualityScore waitRefreshDataQualityScore = new EquipWaitRefreshDataQualityScore(equip.getRecord(), 1);
+                        EquipWaitRefreshDataQualityScore waitRefreshDataQualityScore = new EquipWaitRefreshDataQualityScore(equip.getRecord(), 3);
                         refreshDataQualityScores.add(waitRefreshDataQualityScore);
                     }
                     // 3.2车用气瓶逻辑, 单位内部编号、出场编号全有时刷为1；缺少任意一项时刷为2
                     if ((!equip.getIsIntoManagement()) && StringUtils.isNotEmpty(equip.getUseOrgCode()) && "1".equals(whetherVehicleCylinder)) {
                         if (StringUtils.isEmpty(equip.getUseInnerCode()) || StringUtils.isEmpty(equip.getFactoryNum())) {
-                            EquipWaitRefreshDataQualityScore waitRefreshDataQualityScore = new EquipWaitRefreshDataQualityScore(equip.getRecord(), 2);
+                            EquipWaitRefreshDataQualityScore waitRefreshDataQualityScore = new EquipWaitRefreshDataQualityScore(equip.getRecord(), 3);
                             refreshDataQualityScores.add(waitRefreshDataQualityScore);
                         }
                         if (StringUtils.isNotEmpty(equip.getUseInnerCode()) && StringUtils.isNotEmpty(equip.getFactoryNum())) {
-                            EquipWaitRefreshDataQualityScore waitRefreshDataQualityScore = new EquipWaitRefreshDataQualityScore(equip.getRecord(), 1);
+                            EquipWaitRefreshDataQualityScore waitRefreshDataQualityScore = new EquipWaitRefreshDataQualityScore(equip.getRecord(), 2);
                             refreshDataQualityScores.add(waitRefreshDataQualityScore);
                         }
                     }

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

@@ -3970,8 +3970,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         if (!ObjectUtils.isEmpty(dto)) {
             long time = Timestamp.valueOf(map.get("REC_DATE").toString().substring(0, 19)).getTime();
+            long createTime;
+            if (map.get("CREATE_DATE") == null) {
+                createTime = time;
+            } else {
+                createTime = Timestamp.valueOf(map.get("CREATE_DATE").toString().substring(0, 19)).getTime();
+            }
             dto.setREC_DATE(time);
-            dto.setCREATE_DATE(time);
+            dto.setCREATE_DATE(createTime);
             // 需要安装的设备 安装告知审批通过 清除设备的USC_UNIT_CREDIT_CODE安装单位信息
             // 使用单位编辑 防止更新设备时将安改维单位信息更新到es中
             CompanyBo company = getSelectedOrgInfo().getCompany();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml

@@ -76,6 +76,8 @@
     <select id="selectDataById" resultType="java.util.Map">
         SELECT SEQUENCE_NBR,
                REC_DATE,
+               CREATE_DATE,
+               DATA_QUALITY_SCORE,
                ORG_BRANCH_NAME,
                ORG_BRANCH_CODE,
                USE_UNIT_NAME,