From 2926cc2a3f66185315aeb082fbd3d2d5ff61dbc6 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Tue, 19 Mar 2024 01:14:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81str=E5=80=BC=E5=92=8C=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=85=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=A2=AB=E5=89=8D=E9=9D=A2?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowTaskServiceImpl.java     | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
index 520fd82d..a570cf4a 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
@@ -1281,34 +1281,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
         for(OcrTaskchildPictureAppro taskchildPicture:list){
 
-            //审批节点 当前如果没有历史操作，则将当前节点赋值到历史审批节点中.
-            if(StringUtils.isBlank(taskchildPicture.getTasknamehis())){
-                taskchildPicture.setTasknamehis(taskchildPicture.getTaskname());
-            }
-
-            if(taskchildPicture.getStatshis() != null){
-                String stateText;
-                switch (taskchildPicture.getStatshis()) {
-                    case 1:
-                        stateText = "待审批";
-                        break;
-                    case 2:
-                        stateText = "通过";
-                        break;
-                    case 3:
-                        stateText = "不通过";
-                        break;
-                    default:
-                        stateText = "未知状态";
-                        break;
-                }
-                // 将中文状态赋值给 flowUnionVo 的状态属性
-                taskchildPicture.setStatshisText(stateText);
-
-            }else {
-                //暂定，后期修改
-                taskchildPicture.setStatshisText("待审批");
-            }
 
             if(taskchildPicture.getPictureid() != null && !taskchildPicture.getPictureid().isEmpty()){
                 Long pictureId = Long.parseLong(taskchildPicture.getPictureid());
@@ -1405,6 +1377,38 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
 
         pageUtils.setTotalCount(count.intValue());
+
+        //补充历史状态名称，检查补充节点信息
+        for (OcrTaskchildPictureAppro ocrTaskchildPictureAppro : list) {
+            //审批节点 当前如果没有历史操作，则将当前节点赋值到历史审批节点中.
+            if(StringUtils.isBlank(ocrTaskchildPictureAppro.getTasknamehis())){
+                ocrTaskchildPictureAppro.setTasknamehis(ocrTaskchildPictureAppro.getTaskname());
+            }
+
+            if(ocrTaskchildPictureAppro.getStatshis() != null){
+                String stateText;
+                switch (ocrTaskchildPictureAppro.getStatshis()) {
+                    case 1:
+                        stateText = "待审批";
+                        break;
+                    case 2:
+                        stateText = "通过";
+                        break;
+                    case 3:
+                        stateText = "不通过";
+                        break;
+                    default:
+                        stateText = "未知状态";
+                        break;
+                }
+                // 将中文状态赋值给 flowUnionVo 的状态属性
+                ocrTaskchildPictureAppro.setStatshisText(stateText);
+
+            }else {
+                //暂定，后期修改
+                ocrTaskchildPictureAppro.setStatshisText("待审批");
+            }
+        }
         pageUtils.setList(list);
     }