diff --git a/src/main/java/com/uva/api/point/PointService.java b/src/main/java/com/uva/api/point/PointService.java
index 3a4b1451402dcb08eea5b82ea62781e621749c2f..ba2fe4d5d995f2d1b671d627340e42a661e80017 100644
--- a/src/main/java/com/uva/api/point/PointService.java
+++ b/src/main/java/com/uva/api/point/PointService.java
@@ -1,4 +1,4 @@
- package com.uva.api.point;
+package com.uva.api.point;
 
 
 import com.alibaba.fastjson.JSONArray;
@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.deepoove.poi.util.TableTools;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.uva.api.point.mapper.PointMapper;
 import com.uva.api.task.mapper.TaskMapper;
 import com.uva.api.util.DateUtil;
diff --git a/src/main/java/com/uva/api/task/TaskService.java b/src/main/java/com/uva/api/task/TaskService.java
index 8d2c1a426c404db8a884ee15ccd1917046bb5337..f56513b6c9dabfbd9fc38b891d374850f69d007a 100644
--- a/src/main/java/com/uva/api/task/TaskService.java
+++ b/src/main/java/com/uva/api/task/TaskService.java
@@ -195,6 +195,7 @@ public class TaskService {
         String projectName = json.getString("project_name");
         projectName = "%" + projectName + "%";
         String taskName = json.getString("task_name");
+        String picName = json.getString("pic_name"); // 获取图片名称参数
         String organizationKey = "";
         if (json.containsKey("organization_key")) {
             organizationKey = json.getString("organization_key");
@@ -210,15 +211,15 @@ public class TaskService {
         int size = Integer.parseInt(json.getString("size"));
         PageHelper.startPage(page, size);
         List<Map<String, Object>> dataList = taskMapper.getDisResultInfo(organizationKey, projectName, lineName,
-                typeName, startTime, endTime);
+                typeName, startTime, endTime, picName); // 传入picName参数
 
         for (Map<String, Object> map : dataList) {
             long lineId = (long) map.get("id");
-            String picName = (String) map.get("pic_name");
+            String picName1 = (String) map.get("pic_name");
             String filePath = (String) map.get("file_path");
             String fileName = filePath + File.separator + picName;
             map.put("pic", fileName);
-            List<Map<String, String>> picList = taskMapper.getDisResultInfoByIdAndPicName(lineId, picName, typeName);
+            List<Map<String, String>> picList = taskMapper.getDisResultInfoByIdAndPicName(lineId, picName1, typeName);
             JSONArray jsonArray = new JSONArray();
             int count = 0;
             for (Map<String, String> pic : picList) {
@@ -227,7 +228,6 @@ public class TaskService {
                 jsonObject.put("type_name", pic.get("type_name"));
                 jsonArray.set(count, jsonObject);
                 count++;
-
             }
             map.put("data", jsonArray);
             if ("".equals(typeName)) {
@@ -239,7 +239,7 @@ public class TaskService {
         return new PageInfo<Map<String, Object>>(dataList);
     }
 
-    public List<Map<String, Object>> getDisResultInfo(String data) {
+   /* public List<Map<String, Object>> getDisResultInfo(String data) {
         JSONObject json = JSONObject.parseObject(data);
         String projectName = json.getString("project_name");
         String taskName = json.getString("task_name");
@@ -259,7 +259,7 @@ public class TaskService {
             map.put("pic", fileName);
         }
         return dataList;
-    }
+    } */
 
     public String execDisTask(String projectId, String projectName, String inputPath, int model_type) {
         PropertiesUtil propertiesUtil = new PropertiesUtil();
diff --git a/src/main/java/com/uva/api/task/mapper/TaskMapper.java b/src/main/java/com/uva/api/task/mapper/TaskMapper.java
index 33d60bcc7688fb2712014e7ee3861a7eb2a94c4e..405c3894a7222cbb947ba39954d35e3ad422e2c5 100644
--- a/src/main/java/com/uva/api/task/mapper/TaskMapper.java
+++ b/src/main/java/com/uva/api/task/mapper/TaskMapper.java
@@ -24,13 +24,15 @@ public interface TaskMapper {
     List<Map<String, Object>> getDisResultInfo(@Param("organizationKey") String organizationKey,
                                                @Param("projectName") String projectName,
                                                @Param("taskName") String taskName,
-                                               @Param("typeName") String typeName, @Param("startTime") String startTime,
-                                               @Param("endTime") String endTime);
+                                               @Param("typeName") String typeName,
+                                               @Param("startTime") String startTime,
+                                               @Param("endTime") String endTime,
+                                               @Param("picName") String picName);
 
     List<Map<String, Object>> getDisResultInfo2(@Param("organizationKey") String organizationKey,
-                                               @Param("projectName") String projectName, @Param("lineName") String lineName,
-                                               @Param("typeName") String typeName, @Param("startTime") String startTime,@Param("endTime") String endTime,
-                                               @Param("is_illegal") String is_illegal);
+                                                @Param("projectName") String projectName, @Param("lineName") String lineName,
+                                                @Param("typeName") String typeName, @Param("startTime") String startTime,@Param("endTime") String endTime,
+                                                @Param("is_illegal") String is_illegal);
 
     List<Map<String, Object>> getEventResult(@Param("organizationKey")String organizationKey,
                                              @Param("taskId") int taskId, @Param("baseTaskId") int baseTaskId);
@@ -47,7 +49,7 @@ public interface TaskMapper {
                                               @Param("endTime") String endTime);
 
     List<Map<String, String>> staticsTaskByMonth(@Param("lineName") String lineName, @Param("startTime") String startTime,
-                                              @Param("endTime") String endTime);
+                                                 @Param("endTime") String endTime);
 
     int updateDistResult(@Param("tId") int tId, @Param("path") String path);
 
diff --git a/src/main/resources/mapper/task.xml b/src/main/resources/mapper/task.xml
index f91577a7d4305a754a13a51fdcf249c8104379b0..88706844a09c930f35e8e6b1f91c9b2fe890d590 100644
--- a/src/main/resources/mapper/task.xml
+++ b/src/main/resources/mapper/task.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.uva.api.task.mapper.TaskMapper">
     <select id="getTaskList" resultType="HashMap">
         select distinct(t.task_id) as "task_id",
-                  t.task_name
+        t.task_name
         from t_task_info t
         where 1=1
         <if test="organizationKey != ''.toString()">
@@ -18,7 +18,7 @@
         select t.project_name
         from t_task_info t
         where t.project_id = #{projectId}
-        limit 1
+            limit 1
     </select>
 
     <select id="getLineList" resultType="HashMap">
@@ -96,40 +96,43 @@
 
     <select id="getTaskInfoById" resultType="HashMap">
         select to_char(t1.ddatetime, 'yyyyMMddhh24miss') as "ddatetime",
-            t1.id,
-            t1.project_name,
-            t1.project_id,
-            t1.line_name,
-            t1.task_id,
-            t1.task_name,
-            t1.task_type,
-            t1.flight_duration,
-            t1.flyplan,
-            t1.file_path,
-            case when t1.dis_path is null then '' else t1.dis_path end,
-        case when t1.video_path is null then '' else t1.video_path end
-        from t_task_info t1
-        where id = #{id}
-    </select>
-
-    <select id="getDisResultInfo" resultType="HashMap">
-        select to_char(t1.ddatetime, 'yyyyMMddhh24miss') as "ddatetime",
-               t.id,
+               t1.id,
                t1.project_name,
                t1.project_id,
                t1.line_name,
                t1.task_id,
                t1.task_name,
                t1.task_type,
+               t1.flight_duration,
+               t1.flyplan,
                t1.file_path,
-               t1.dis_path,
-               t1.video_path,
-               t.pic_name
+               case when t1.dis_path is null then '' else t1.dis_path end,
+               case when t1.video_path is null then '' else t1.video_path end
+        from t_task_info t1
+        where id = #{id}
+    </select>
+
+    <select id="getDisResultInfo" resultType="HashMap">
+        select to_char(t1.ddatetime, 'yyyyMMddhh24miss') as "ddatetime",
+        t.id,
+        t1.project_name,
+        t1.project_id,
+        t1.line_name,
+        t1.task_id,
+        t1.task_name,
+        t1.task_type,
+        t1.file_path,
+        t1.dis_path,
+        t1.video_path,
+        t.pic_name
         from (select id, pic_name from t_uva_dist_data
         where 1=1
-            <if test="typeName != ''.toString()">
-        and type_name LIKE #{typeName}
-    </if>
+        <if test="typeName != ''.toString()">
+            and type_name LIKE #{typeName}
+        </if>
+        <if test="picName != null and picName != ''.toString()">
+            and pic_name LIKE CONCAT('%', #{picName}, '%')
+        </if>
         group by pic_name, id
         order by pic_name)t, t_task_info t1
         where t.id = t1.id
@@ -192,13 +195,13 @@
 
     <select id="getEventResult" resultType="HashMap">
         select objectid,
-               image_path,
-               project_type,
-               is_illegal,
-               is_new,
-               task_id,
-               base_task_id,
-               b_box
+        image_path,
+        project_type,
+        is_illegal,
+        is_new,
+        task_id,
+        base_task_id,
+        b_box
         from t_uva_event_point
         where 1=1 and task_id = #{taskId} and base_task_id = #{baseTaskId}
         <if test="organizationKey != ''.toString()">
@@ -244,13 +247,13 @@
 
     <select id="getTaskTimeList" resultType="HashMap">
         select to_char(t.ddatetime, 'yyyyMMddhh24miss') as "ddatetime",
-        t.task_id,
-        t.task_name,
-        t.line_name,
-        t.id,
-        t.task_type,
-        t.dis_path,
-        t.video_path
+               t.task_id,
+               t.task_name,
+               t.line_name,
+               t.id,
+               t.task_type,
+               t.dis_path,
+               t.video_path
         from t_task_info t
         where t.line_name=#{lineName}
           and t.ddatetime <![CDATA[>=]]> to_timestamp(#{startTime}, 'yyyyMMddhh24miss')
@@ -288,9 +291,9 @@
 
     <select id="getLineInfoByLineName" resultType="HashMap">
         select
-          lon,
-          lat,
-          order_value
+            lon,
+            lat,
+            order_value
         from t_line_info
         where line_name=#{lineName}
         order by order_value
@@ -329,7 +332,7 @@
     <select id="staticsMonthTaskByYearAndProject" resultType="HashMap">
         select t5.time, coalesce(t6."taskNum",0) as "taskNum", coalesce(t6."planeNum",0) as "planeNum",
                coalesce(t6."flightTotal",0) as "flightTotal", coalesce(t6."picSize",0) as "picSize"
-               from
+        from
             (SELECT LPAD(t.num :: text, 2, '0') AS time
              FROM (
                  SELECT 1 AS num
@@ -346,16 +349,16 @@
                  UNION ALL SELECT 12)t
             )t5
                 left join
-        (select to_char(t.ddatetime::DATE, 'MM') as time,
+            (select to_char(t.ddatetime::DATE, 'MM') as time,
                COUNT(t.task_id) as "taskNum",
                COUNT(t.task_id) as "planeNum",
                sum(flight_duration) as "flightTotal",
                sum(data_size) as "picSize"
-        from t_task_info t
-        where extract (YEAR from ddatetime) = #{year}
-          and project_name = #{projectId}
-        group by time
-        order by time)t6 on t5.time=t6.time
+             from t_task_info t
+             where extract (YEAR from ddatetime) = #{year}
+               and project_name = #{projectId}
+             group by time
+             order by time)t6 on t5.time=t6.time
     </select>
 
     <select id="staticDistInfoById" resultType="HashMap">
@@ -380,10 +383,10 @@
         from t_task_info t where t.project_id=#{projectId}
                              and t.task_type='四乱违法巡检-计划任务'
                              and t.line_name=#{lineName}
-        and t.ddatetime <![CDATA[<]]> (select t1.ddatetime from t_task_info t1
-        where t1.project_id=#{projectId}
-        and t1.task_id=#{taskId}
-        and t1.line_name=#{lineName})
+                             and t.ddatetime <![CDATA[<=]]> (select t1.ddatetime - INTERVAL '15 days' from t_task_info t1
+                                                            where t1.project_id=#{projectId}
+                                                              and t1.task_id=#{taskId}
+                                                              and t1.line_name=#{lineName})
         ORDER BY t.ddatetime desc limit 1;
     </select>