修改查看交付物历史记录接口

tall/src/main/java/com/ccsens/tall/service/InputDocService.java

@@ -685,7 +685,6 @@ public class InputDocService implements IInputDocService {
                                 deliverHistory.setFileList(fileList);
                             }
                         }
-                }
                     }else{
                         if (StrUtil.isNotBlank(deliverHistory.getFileIds())){
                             List<String> idList = new ArrayList<>();
@@ -702,6 +701,7 @@ public class InputDocService implements IInputDocService {
                         }
                     }
                 }
+            }
             return new PageInfo<>(historyList);
         }
 
@@ -725,8 +725,7 @@ public class InputDocService implements IInputDocService {
                                 deliverHistory.setFileList(fileList);
                             }
                         }
-                }
+                    }else {
-                }else{
                         if (StrUtil.isNotBlank(deliverHistory.getFileIds())){
                             List<String> idList = new ArrayList<>();
                             idList.add(deliverHistory.getFileIds());
@@ -742,6 +741,7 @@ public class InputDocService implements IInputDocService {
                         }
                     }
                 }
+            }
             return  new PageInfo<>(historyList);
         }
         return null;

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>