增加isdelete判断

ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/ClaimVerificationServiceImpl.java

@@ -315,7 +315,7 @@ public class ClaimVerificationServiceImpl implements ClaimVerificationService {
 
     private String getPartHoursList(JSONObject warrantyJson) {
         if (warrantyJson == null || !warrantyJson.containsKey("warrantyReport")) {
-            return " ";
+            return null;
         }
         
         // 获取warrantyReport对象
@@ -323,11 +323,11 @@ public class ClaimVerificationServiceImpl implements ClaimVerificationService {
         
         // 检查partItems是否存在且是数组
         if (!warrantyReport.containsKey("partItems")) {
-            return " ";
+            return null;
         } else {
             Object value = warrantyReport.get("partItems");
             if (!(value instanceof JSONArray)) {
-                return " ";
+                return null;
             }
         }
         
@@ -345,12 +345,13 @@ public class ClaimVerificationServiceImpl implements ClaimVerificationService {
             }
         }
         if (partNoList.isEmpty()) {
-            return " ";
+            return null;
         }
         List<ClaimVerificationPartHoursDTO> result = tmClaimVerificationPartHoursMappingMapper.queryConfigByPartId(partNoList);
         if (result.isEmpty()) {
-            return " ";
+            return null;
         }
+        log.info("索赔检核主零件工时配置信息: {}", result.toString());
         return JSONObject.toJSONString(result);
     }
 

ai-analytic-center-biz/src/main/resources/mapper/TmClaimVerificationPartHoursMappingMapper.xml

@@ -8,7 +8,8 @@
             m.hours_id as hoursId
         FROM
         `tm_claim_verification_part_hours_mapping` m
-        WHERE m.part_id IN
+        WHERE m.is_deleted = 0
+        AND m.part_id IN
         <foreach collection="partIds" item="partId" open="(" separator="," close=")">
             #{partId}
         </foreach>

ai-analytic-center-biz/target/classes/mapper/TmClaimVerificationPartHoursMappingMapper.xml

@@ -8,7 +8,8 @@
             m.hours_id as hoursId
         FROM
         `tm_claim_verification_part_hours_mapping` m
-        WHERE m.part_id IN
+        WHERE m.is_deleted = 0
+        AND m.part_id IN
         <foreach collection="partIds" item="partId" open="(" separator="," close=")">
             #{partId}
         </foreach>