Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/vo/LeavePlanTaskPointVo.java

@@ -12,6 +12,25 @@ public class LeavePlanTaskPointVo {
 	private String pointNO;
 	private String offline;
 	private String status;
+	private int shotMinNumber;
+	private int shotMaxNumber;
+
+	public int getShotMinNumber() {
+		return shotMinNumber;
+	}
+
+	public void setShotMinNumber(int shotMinNumber) {
+		this.shotMinNumber = shotMinNumber;
+	}
+
+	public int getShotMaxNumber() {
+		return shotMaxNumber;
+	}
+
+	public void setShotMaxNumber(int shotMaxNumber) {
+		this.shotMaxNumber = shotMaxNumber;
+	}
+
 	private String isFixed;
 	private String orderNo;
 	private String remark;

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

@@ -5979,33 +5979,13 @@
             from
             cb_water_resource
             <where>
-                <if test="bizOrgCode != null and bizOrgCode != ''">
-                    biz_org_code like concat(#{bizOrgCode}, '%')
-                </if>
-            </where>
-            ) AS total,
-            (select
-            count(sequence_nbr)
-            from
-            cb_water_resource
-            <where>
-                resource_type = 'hydrant'
-                <if test="bizOrgCode != null and bizOrgCode != ''">
-                    AND biz_org_code like concat(#{bizOrgCode}, '%')
-                </if>
-            </where>
-            ) AS hydrant,
-            (select
-            count(sequence_nbr)
-            from
-            cb_water_resource
-            <where>
-                resource_type = 'crane'
+                (resource_type = 'industryPool' or resource_type = 'pool')
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                   AND  biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
             </where>
-            ) AS crane,
+            ) AS total,
+
             (select
             count(sequence_nbr)
             from
@@ -6022,28 +6002,6 @@
             from
             cb_water_resource
             <where>
-                resource_type = 'natural'
-                <if test="bizOrgCode != null and bizOrgCode != ''">
-                    AND biz_org_code like concat(#{bizOrgCode}, '%')
-                </if>
-            </where>
-            ) AS `natural`,
-            (select
-            count(sequence_nbr)
-            from
-            cb_water_resource
-            <where>
-                resource_type = 'waterTank'
-                <if test="bizOrgCode != null and bizOrgCode != ''">
-                    AND biz_org_code like concat(#{bizOrgCode}, '%')
-                </if>
-            </where>
-            ) AS waterTank,
-            (select
-            count(sequence_nbr)
-            from
-            cb_water_resource
-            <where>
                 resource_type = 'industryPool'
                 <if test="bizOrgCode != null and bizOrgCode != ''">
                     AND biz_org_code like concat(#{bizOrgCode}, '%')
@@ -6068,7 +6026,7 @@
                     'red'
                 END AS statusCode
         from
-            cb_water_resource
+            (select * from cb_water_resource where resource_type = 'industryPool' or resource_type = 'pool')
         <where>
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 biz_org_code like concat(#{bizOrgCode}, '%')

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

@@ -826,6 +826,8 @@
 			p.offline,
 			ptd.is_finish status,
 			p.is_fixed isFixed,
+		    p.shot_max_number shotMaxNumber,
+			p.shot_min_number shotMinNumber,dc-center/dc-center/
 			pt.route_id routeId,
 			c.id checkId,
 			pt.id planTaskId,