From d9fb4623c6ec621692908d93e8ba024eedbcffa7 Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Wed, 21 Apr 2021 11:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E7=9C=8B=E4=BA=A4?=
 =?UTF-8?q?=E4=BB=98=E7=89=A9=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/tall/service/InputDocService.java  | 52 +++++++++----------
 .../mapper_dao/ProDeliverHistoryRecordDao.xml |  6 ++-
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java
index 9568188d..d73eceb1 100644
--- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java
@@ -685,19 +685,19 @@ public class InputDocService implements IInputDocService {
                                 deliverHistory.setFileList(fileList);
                             }
                         }
-                }
-                }else{
-                    if (StrUtil.isNotBlank(deliverHistory.getFileIds())){
-                        List<String> idList = new ArrayList<>();
-                        idList.add(deliverHistory.getFileIds());
-                        //获取文件项目的路径
-                        String requestUrl = PropUtil.filedeal;
-                        //通过文件id查询文件信息
-                        String c = RestTemplateUtil.postBody1(requestUrl, idList);
-                        JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class);
-                        if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) {
-                            List<FileVo.FilePosition> fileList = a.getData();
-                            deliverHistory.setFileList(fileList);
+                    }else{
+                        if (StrUtil.isNotBlank(deliverHistory.getFileIds())){
+                            List<String> idList = new ArrayList<>();
+                            idList.add(deliverHistory.getFileIds());
+                            //获取文件项目的路径
+                            String requestUrl = PropUtil.filedeal;
+                            //通过文件id查询文件信息
+                            String c = RestTemplateUtil.postBody1(requestUrl, idList);
+                            JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class);
+                            if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) {
+                                List<FileVo.FilePosition> fileList = a.getData();
+                                deliverHistory.setFileList(fileList);
+                            }
                         }
                     }
                 }
@@ -725,19 +725,19 @@ public class InputDocService implements IInputDocService {
                                 deliverHistory.setFileList(fileList);
                             }
                         }
-                }
-                }else{
-                    if (StrUtil.isNotBlank(deliverHistory.getFileIds())){
-                        List<String> idList = new ArrayList<>();
-                        idList.add(deliverHistory.getFileIds());
-                        //获取文件项目的路径
-                        String requestUrl = PropUtil.filedeal;
-                        //通过文件id查询文件信息
-                        String c = RestTemplateUtil.postBody1(requestUrl, idList);
-                        JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class);
-                        if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) {
-                            List<FileVo.FilePosition> fileList = a.getData();
-                            deliverHistory.setFileList(fileList);
+                    }else {
+                        if (StrUtil.isNotBlank(deliverHistory.getFileIds())){
+                            List<String> idList = new ArrayList<>();
+                            idList.add(deliverHistory.getFileIds());
+                            //获取文件项目的路径
+                            String requestUrl = PropUtil.filedeal;
+                            //通过文件id查询文件信息
+                            String c = RestTemplateUtil.postBody1(requestUrl, idList);
+                            JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class);
+                            if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) {
+                                List<FileVo.FilePosition> fileList = a.getData();
+                                deliverHistory.setFileList(fileList);
+                            }
                         }
                     }
                 }
diff --git a/tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml b/tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml
index 6936cc95..a621ce5c 100644
--- a/tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml
+++ b/tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml
@@ -18,11 +18,12 @@
         FROM
             t_pro_deliver_history_record AS pdhr
         LEFT JOIN t_pro_role AS pr ON pdhr.role_id = pr.id and pr.rec_status = 0
-        LEFT JOIN t_pro_task_input_record AS ptir ON ptir.id = pdhr.deliver_record_id and ptir.rec_status = 0
+        LEFT JOIN t_pro_task_input_record AS ptir ON ptir.id = pdhr.deliver_record_id
         LEFT JOIN t_pro_member AS pm ON pm.id = pdhr.member_id and pm.rec_status = 0
         WHERE
             pdhr.deliver_id = #{deliverId}
         and pdhr.rec_status = 0
+        ORDER BY pdhr.created_at DESC
     </select>
 
     <select id="finOutPutHistory" resultType="com.ccsens.tall.bean.vo.InputDocVo$DeliverHistory">
@@ -40,11 +41,12 @@
         FROM
             t_pro_deliver_history_record AS pdhr
         LEFT JOIN t_pro_role AS pr ON pdhr.role_id = pr.id and pr.rec_status = 0
-        LEFT JOIN t_pro_task_deliver_post_log AS ptdpl ON ptdpl.id = pdhr.deliver_record_id and ptdpl.rec_status = 0
+        LEFT JOIN t_pro_task_deliver_post_log AS ptdpl ON ptdpl.id = pdhr.deliver_record_id
         LEFT JOIN t_pro_member AS pm ON pm.id = pdhr.member_id and pm.rec_status = 0
         WHERE
             pdhr.deliver_id = #{deliverId}
         and pdhr.rec_status = 0
+        ORDER BY pdhr.created_at DESC
     </select>
 
 </mapper>
\ No newline at end of file