省测卡片问题

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

@@ -6063,9 +6063,8 @@
                 LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
                 LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
                 LEFT JOIN wl_equipment_category cate ON cate.id = wle.category_id
-                LEFT JOIN wl_stock_detail AS wlsd on  wlsd.equipment_detail_id = det.id
         WHERE
-            find_in_set(#{systemId},spe.system_id) and spe.single = true  and 	wlsd.`status` = 1
+            find_in_set(#{systemId},spe.system_id) and spe.single = true
         ORDER BY
             spe.equip_status desc
     </select>

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

@@ -1371,6 +1371,7 @@
 		<if test="bizOrgCode != null and bizOrgCode != ''">
 			AND org_code LIKE CONCAT(#{bizOrgCode}, '%')
 		</if>
+		UNION ALL
 		SELECT
 		'1' AS `key`,
 		ifnull( sum( `p_plan_task`.`finish_num` ), 0 ) AS `value`,