修改巡检bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -1405,7 +1405,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         colModel.add(temph4);
         colModel.add(temph5);
         HashMap<String, Object> dataGridMock = new HashMap<>();
-        dataGridMock.put("current",result.getNumber());
+        dataGridMock.put("current",result.getNumber()+1);
         dataGridMock.put("total",result.getTotalElements());
         dataGridMock.put("pagination",true);
         dataGridMock.put("totalPage",result.getTotalPages());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -1458,7 +1458,7 @@ public class PointServiceImpl implements IPointService {
         colModel.add(temph8);
 
         HashMap<String, Object> dataGridMock = new HashMap<>();
-        dataGridMock.put("current",result.getNumber());
+        dataGridMock.put("current",result.getNumber()+1);
         dataGridMock.put("total",result.getTotalElements());
         dataGridMock.put("pagination",true);
         dataGridMock.put("totalPage",result.getTotalPages());

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/entity/mybatis/extend/LatentDangerBo.java

@@ -38,7 +38,7 @@ public class LatentDangerBo {
      * 隐患等级（1：一般隐患；2：重大隐患；0：安全问题）
      */
     private Integer dangerLevel;
-
+    private String dangerLevelName;
     /**
      * 隐患地点
      */

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

@@ -29,6 +29,10 @@
             <if test="dangerLevel != null">
                 danger_level,
             </if>
+            <if test="dangerLevelName != null">
+                danger_level_name,
+            </if>
+
             <if test="dangerPosition != null">
                 danger_position,
             </if>
@@ -106,6 +110,10 @@
             <if test="dangerLevel != null">
                 #{dangerLevel},
             </if>
+            <if test="dangerLevelName != null">
+                #{dangerLevelName},
+            </if>
+
             <if test="dangerPosition != null">
                 #{dangerPosition},
             </if>
@@ -184,6 +192,10 @@
             <if test="dangerLevel != null">
                 danger_level = #{dangerLevel},
             </if>
+            <if test="dangerLevelName != null">
+                danger_level_name = #{dangerLevelName},
+            </if>
+
             <if test="dangerPosition != null">
                 danger_position = #{dangerPosition},
             </if>
@@ -459,7 +471,7 @@
             <if test="departmentId != null and departmentId != -1">
                 and d.belong_department_id = #{departmentId}
             </if>
-            AND a.danger_type IN ( 2, 3 ) -- 2：巡检隐患；3：有码无计划隐患
+            AND a.danger_type IN ( 2, 3 ) -- 2：巡检；3：有码无计划隐患
 
             AND (
             a.danger_state IN ( 2, 3, 4 ) -- 2：待治理；3：安措计划中；4：待验证；5：治理完毕

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

@@ -570,7 +570,7 @@
 		SELECT
 		count(1)
 		FROM p_point
-		where is_delete = 0
+		where is_delete = 0 and  biz_org_code is not null
 		<if test="orgCode!=null"> and biz_org_code LIKE CONCAT( #{orgCode}, '%' )</if>
 		<if test="level!=null"> and Level = #{level}</if>
 		<if test="checkType!=null"> and catalog_id = #{checkType}</if>

amos-boot-system-supervision/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -26,6 +26,9 @@
             <if test="dangerLevel != null">
                 danger_level,
             </if>
+            <if test="dangerLevelName != null">
+                danger_level_name,
+            </if>
             <if test="dangerPosition != null">
                 danger_position,
             </if>
@@ -100,6 +103,9 @@
             <if test="dangerLevel != null">
                 #{dangerLevel},
             </if>
+            <if test="dangerLevelName != null">
+                #{dangerLevelName},
+            </if>
             <if test="dangerPosition != null">
                 #{dangerPosition},
             </if>
@@ -178,6 +184,9 @@
             <if test="dangerLevel != null">
                 danger_level = #{dangerLevel},
             </if>
+            <if test="dangerLevelName != null">
+                danger_level_name=#{dangerLevelName},
+            </if>
             <if test="dangerPosition != null">
                 danger_position = #{dangerPosition},
             </if>