From 77374f668fd5ff3979752a0f75add51b1899d038 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 8 Mar 2023 17:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BE=85=E5=8A=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ProcessInfoEOMapper.xml        | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
index 7fdaf67df..0a2b1654f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
@@ -172,13 +172,41 @@
                    '' as title_en,
                    pi.flow_type,
                    pi.create_by,
-                   (
+                   <!--(
                        select
                             pid.end_time
                        from
                             process_info_detail pid
                        where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' order by pid.end_time asc limit 1
-                   ) as end_time,
+                   ) as end_time,-->
+                    (
+                        case when flow_type = '21' then
+                            (
+                                SELECT
+                                    pci.end_time
+                                FROM
+                                    project_certification_inventory pci
+                                WHERE
+                                    pci.project_library_id = pi.id
+                                    AND ( pci.flow_status = 'List to be checked' OR pci.flow_status = 'Refusal of responsible person' )
+                                ORDER BY
+                                pci.end_time ASC
+                                LIMIT 1
+                            )
+                            when flow_type = '10' then
+                            (
+                                SELECT
+                                    pid.end_time
+                                FROM
+                                    process_info_detail pid
+                                WHERE
+                                    pid.process_info_id = pi.id
+                                    AND pid.STATUS = 'NotDone'
+                                ORDER BY
+                                pid.end_time ASC
+                                LIMIT 1
+                            ) end
+                    )AS end_time,
                    pi.STATUS,
                    pi.prc_num,
                    pi.prc_name,