更新巡检查询

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -417,7 +417,7 @@ public interface EquipFeignClient {
     @RequestMapping(value = "equipSpecific/getListByEquipmentCodeEQ/{code}", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>>  getListByEquipmentCodeEQ(@PathVariable("code") String code);
 
-    @RequestMapping(value = "equipSpecific/getListByEquipmentIds", method = RequestMethod.GET)
+    @RequestMapping(value = "equipSpecific/list", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>>  getListByEquipmentSpesById(@RequestParam("ids") String ids, @RequestParam("type") String type);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/ControlScreenController.java

@@ -37,7 +37,7 @@ public class ControlScreenController extends AbstractBaseController {
 
     @GetMapping("/statics")
     @ApiOperation(value = "消防运维信息")
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     public CommonResponse getStatics(@RequestParam(required = false) String companyCode) {
         return CommonResponseUtil.success(iPlanTaskService.getStatics(companyCode));
     }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -2439,6 +2439,15 @@
             ci.order_no
     </select>
 
+    <select id="getCheckId" resultType="String">
+        SELECT
+            ci.check_id AS checkId,
+        FROM
+            p_check_input ci
+        WHERE
+            ci.id = #{checkId}
+    </select>
+
     <select id="getPointById" resultType="Map">
         SELECT
         p.id,

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

@@ -1371,11 +1371,11 @@
 		</if>
 		UNION ALL
 		SELECT
+		'2' AS `key`,
 		ifnull( sum( ppk.`point_num` ), 0 ) AS `value`,
 		'' AS unit,
 		'合格' AS `name`,
-		'xfxchg' AS code,
-		'2' AS `key`
+		'xfxchg' AS code
 		FROM
 		`p_plan_task` ppk
 		LEFT JOIN p_plan_task_detail pptd ON pptd.task_no = ppk.id
@@ -1386,26 +1386,25 @@
 		</if>
 		UNION ALL
 		SELECT
+		'3' AS `key`,
 		'' AS `value`,
 		'%' AS unit,
 		'合格占比' AS `name`,
-		'xfxchgzb' AS code,
-		'3' AS `key`
+		'xfxchgzb' AS code
 		UNION ALL
 		SELECT
+		'4' AS `key`,
 		'' AS `value`,
 		'' AS unit,
 		'不合格' AS `name`,
-		'xfxcbhg' AS code,
-		'4' AS `key`
+		'xfxcbhg' AS code
 		UNION ALL
 		SELECT
+		'5' AS `key`,
 		ifnull( sum( `p_plan_task`.`point_num` ), 0 ) AS `value`,
 		'' AS unit,
 		'今日漏查点位' AS `name`,
-		'currentDayMiss' AS `indexKey`,
-		'xfxcjrlcdw' AS code,
-		'5' AS `key`
+		'xfxcjrlcdw' AS code
 		FROM
 		`p_plan_task`
 		WHERE
@@ -1416,11 +1415,11 @@
 		</if>
 		UNION ALL
 		SELECT
+		'6' AS `key`,
 		'' AS `value`,
-		'' AS unit,
+		'%' AS unit,
 		'漏查率' AS `name`,
-		'xfxclcl' AS code,
-		'6' AS `key`
+		'xfxclcl' AS code
 	</select>
 
 	<select id="queryByCompanyCode" resultType="java.lang.String">