修改代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/EquipFeign.java

@@ -47,7 +47,7 @@ public interface EquipFeign {
     FeignClientResult    getBuildingTreeOne(@RequestParam(value = "instanceId", required = true) String instanceId);
 
     @RequestMapping(value = "${equip.fegin.prefix}"+"/equipSpecific/status/equip", method = RequestMethod.GET ,consumes="application/json")
-    FeignClientResult    updateEquipSpecificStatus(String status, String id);
+    FeignClientResult    updateEquipSpecificStatus(@RequestParam(value = "status", required = true) String status,@RequestParam(value = "id", required = true) String id);
 
 }
 

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -2184,27 +2184,24 @@
             ii.item_no,
             ii.NAME inputItem,
             ci.input_value,
-            CASE ci.is_ok
+            CASE
+                ci.is_ok
                 WHEN 1 THEN
                     '合格'
                 WHEN 2 THEN
-                    '不合格'
-                ELSE
-                    '漏检'
+                    '不合格' ELSE '漏检'
                 END AS is_ok,
             ii.biz_org_code,
             ii.biz_org_name,
-            ci.score,
+            ci.score ,
             ppc.equipment_id
         FROM
-            p_check c,
-            p_check_input ci,
-            p_input_item ii,
-            p_point_classify ppc
+            p_check c
+                LEFT JOIN p_check_input ci ON ci.check_id = c.id
+                LEFT JOIN p_input_item ii ON ii.id = ci.input_id
+                LEFT JOIN p_point_classify ppc on ci.point_classify_id = ppc.id
         WHERE
-            c.id = ci.check_id
-          AND ii.id = ci.input_id
-          AND c.id = #{checkId}
+            c.id = #{checkId}
         ORDER BY
             ci.order_no
     </select>