修改线路名称

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

@@ -645,8 +645,8 @@ public class TaskServiceImpl implements ITaskService {
         HashMap<String, Object> temph1 = new HashMap<>();
         temph1.put("fid","name");
         temph1.put("dataIndex","name");
-        temph1.put("name"," 巡检区域");
-        temph1.put("title","巡检区域");
+        temph1.put("name"," 巡检对象名称");
+        temph1.put("title","巡检对象名称");
         temph1.put("type","dataGrid");
         temph1.put("key","name");
         colModel.add(temph1);

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

@@ -1156,6 +1156,7 @@
     ( ifnull( sum( p_plan_task.`point_num` ), 0 ) - ifnull( sum( p_plan_task.`finish_num` ), 0 ) ) AS `wxj`
     from p_plan_task   left join p_plan
     on  p_plan_task.plan_id=p_plan.id
+    LEFT JOIN p_route on p_route.id= p_plan.route_id
     <where>
         <choose>
             <when test="timeType == 'dt'">
@@ -1174,7 +1175,7 @@
         </choose>
 
     <if test="name != null and name!=''">
-        and p_plan.`name`  like CONCAT( '%',#{name}, '%')
+        and p_route.`name`  like CONCAT( '%',#{name}, '%')
     </if>
     </where>
     </select>
@@ -1187,7 +1188,8 @@
     on  p_plan_task.plan_id=p_plan.id
     LEFT JOIN p_plan_task_detail
     ON  p_plan_task_detail.task_no=p_plan_task.id
-    <where>
+    LEFT JOIN p_route on p_route.id= p_plan.route_id
+        <where>
         <choose>
             <when test="timeType == 'dt'">
                 and DATE(p_plan_task.begin_time) = DATE(curdate())
@@ -1204,7 +1206,7 @@
 
         </choose>
      <if test="name != null and name!=''">
-         and  p_plan.`name`  like CONCAT('%',#{name}, '%')
+         and  p_route.`name`  like CONCAT('%',#{name}, '%')
     </if>
     </where>
     </select>
@@ -1212,10 +1214,11 @@
     <select id="getLinetype" resultType="java.util.Map">
 
      select
-       distinct SUBSTRING_INDEX(p_plan.name,'-',-1) as `name_measure` from   p_plan
+       distinct SUBSTRING_INDEX(p_route.name,'-',-1) as `name_measure` from   p_route
       <where>
+          p_route.is_delete=0
         <if test="name != null and name!=''">
-              p_plan.`name`  like CONCAT('%',#{name}, '%')
+          and  p_route.`name`  like CONCAT('%',#{name}, '%')
         </if>
     </where>
         limit #{offset},#{pageSize}
@@ -1223,10 +1226,10 @@
     <select id="getLinetypecount" resultType="long">
 
         select
-        COUNT(1) AS num from   p_plan
+        COUNT(1) AS num from   p_route
         <where>
             <if test="name != null and name!=''">
-                p_plan.`name`  like CONCAT('%',#{name}, '%')
+                p_route.`name`  like CONCAT('%',#{name}, '%')
             </if>
         </where>
     </select>
@@ -1250,11 +1253,12 @@
         RIGHT JOIN p_plan_task_detail pptd ON ppt.ID = pptd.TASK_NO
         LEFT JOIN p_plan pp ON ppt.plan_id = pp.id
         LEFT JOIN p_point ppo ON ppo.id = pptd.point_id
+        LEFT JOIN p_route on p_route.id= pp.route_id
         <where>
         pptd.`status` = 2
         <if test="name != null and name !=''">
 
-         and pp.`name`  like CONCAT('%',#{name}, '%')
+         and p_route.`name`  like CONCAT('%',#{name}, '%')
         </if>
         <choose>
             <when test="timeType == 'dt'">
@@ -1295,10 +1299,12 @@
                 RIGHT JOIN p_plan_task_detail pptd ON ppt.ID = pptd.TASK_NO
                 LEFT JOIN p_plan pp ON ppt.plan_id = pp.id
                 LEFT JOIN p_point ppo ON ppo.id = pptd.point_id
-           <where>
+               LEFT JOIN p_route on p_route.id= pp.route_id
+
+        <where>
                  pptd.`status` = 2
                 <if test="name != null and name !=''">
-                    and  pp.`name`  like CONCAT('%',#{name}, '%')
+                    and  p_route.`name`  like CONCAT('%',#{name}, '%')
                 </if>
                <choose>
                    <when test="timeType == 'dt'">
@@ -1359,7 +1365,7 @@
 
         </choose>
         <if test="name != null and name !=''">
-            and  pp.`name`  like CONCAT('%',#{name}, '%')
+            and  pr.`name`  like CONCAT('%',#{name}, '%')
         </if>
         </where>
         GROUP BY
@@ -1376,7 +1382,7 @@
             (
             SELECT
                 ppo.point_no pointNum_measure,
-                ppo.route_name routeName_measure,
+                pr.name routeName_measure,
                 ppo.`name` name_measure,
                 ppo.biz_org_name bizOrgName_measure,
                 pr.boss_name AS actor_measure,
@@ -1406,7 +1412,7 @@
 
                 </choose>
                 <if test="name != null and name !=''">
-                    and   pp.`name`  like CONCAT('%',#{name}, '%')
+                    and   pr.`name`  like CONCAT('%',#{name}, '%')
                 </if>
            </where>
                 GROUP BY