From 9c332a4d1ba7c6fa56b8aff1586b38ba2d5f609f Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Thu, 14 Dec 2023 15:04:03 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E6=96=87=E4=BB=B6=E6=94=B9=E6=88=90=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/TodoTaskController.java              | 32 ++++++++++++++++++-
 .../business_auth/LawsUserInfoService.java    |  3 ++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
index 70c2ca40..17630a45 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
@@ -881,10 +881,17 @@ public class TodoTaskController extends BaseAction {
         }
 
         JSONObject object3 = JSONObject.parseObject(list.get(0).getMesg());
+
+        // 对文件排序
+        compareFile("FBGBUSS",object3);
+        compareFile("BZSMBUSS",object3);
+        compareFile("LSBBBUSS",object3);
+        compareFile("QTWJBUSS",object3);
+
         JSONArray arr2 = new JSONArray();
         object3.put("taskBreak", arr2);
         processNew.setMesg(object3.toJSONString());
-        QueryWrapper wrapper = new QueryWrapper();
+        QueryWrapper<OaTaskExec> wrapper = new QueryWrapper<>();
         wrapper.eq("TODO_ID",processNew.getId());
         wrapper.eq("EXEC_TYPE",2);
         wrapper.eq("EXEC_STATUS",0);
@@ -3317,4 +3324,27 @@ public class TodoTaskController extends BaseAction {
         return processNew;
 
     }
+
+    /**
+     * 用于对文件字段的文件根据上传时间倒序
+     * @param attFileField 文件字段
+     * @param object 传输对象
+     */
+    private void compareFile(String attFileField, JSONObject object) {
+        String attFileId = object.getString(attFileField);
+        // 字段不为空并且文件数量大于1，才需要排序
+        if (StringUtils.isNotBlank(attFileId) && attFileId.split(",").length > 1) {
+            ResponseMessage<List<AttFileEO>> attInfoByAttIds = lawsUserInfoService.getAttInfoByAttIds(attFileId);
+            List<AttFileEO> attFileEOList = attInfoByAttIds.getData();
+            attFileEOList.sort(Comparator.comparing(AttFileEO::getCreationTime).reversed());
+            List<String> attFileIdList = new ArrayList<>();
+            List<String> attFileNameList = new ArrayList<>();
+            for (AttFileEO attFileEO : attFileEOList) {
+                attFileIdList.add(attFileEO.getId());
+                attFileNameList.add(attFileEO.getOldFileName());
+            }
+            object.put(attFileField, String.join(",", attFileIdList));
+            object.put(attFileField + "Name", String.join(",", attFileNameList));
+        }
+    }
 }
diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
index 7b7c7914..599ab5e8 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
@@ -194,6 +194,9 @@ public interface LawsUserInfoService {
     @GetMapping("/lawss/SarBussStandAttrInfo/getBussAttrInfo")
     public Map<String,Object> getBussAttrInfo(@RequestParam("standId") String standId);
 
+    @GetMapping("/att/attFile/getMultiFileInfos")
+    public ResponseMessage<List<AttFileEO>> getAttInfoByAttIds(@RequestParam("fileIds") String fileIds);
+
 
     @PostMapping("/sarStandUnqualified/sar-stand-unqualified/updateBatch")
     public ResponseMessage<Object> updateBatch(@RequestBody List<SarStandUnqualified> sarStandUnqualified);