From 99364d52f34d0e4c74e59fdd374e4fb186fdff77 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 27 Oct 2022 14:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E8=AF=84=E4=BC=B0=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=A4=84=E7=90=86=E6=A0=87=E5=87=86=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E3=80=82=E6=8B=BC=E6=8E=A5=E4=B8=AD=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E5=B1=95=E7=A4=BA=20=E4=B8=8E=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ProcessInfoEOMapper.xml        | 147 ++++++++++--------
 .../modules/todoCenter/vo/ProcessInfoVO.java  |   7 +-
 2 files changed, 85 insertions(+), 69 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 5cd218e78..57501c8f3 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
@@ -73,6 +73,7 @@
             pyni.year_name,
             pli.serial_number,
             pli.title,
+            plb.title_en,
             pi.flow_type,
             createBy.username as "create_by",
             pi.end_time,
@@ -106,6 +107,7 @@
                    pyni.year_name,
                    pli.serial_number,
                    pli.title,
+                   plb.title_en,
                    pi.flow_type,
                    createBy.username AS "create_by",
                    pi.end_time,
@@ -150,6 +152,7 @@
                    pyni.year_name,
                    '--' as serial_number,
                    '' as title,
+                   '' as title_en,
                    pi.flow_type,
                    createBy.username AS "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,
@@ -206,85 +209,93 @@
         order by temp.end_time asc
     </select>
     <select id="queryLawsAssessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
-        SELECT
-            pi.id,
-            pi.buss_document_library_id,
-            bdl.serial_number,
-            bdl.title,
-            pi.flow_type,
-            pi.end_time,
-            pi.STATUS,
-            pi.prc_num,
-            pi.prc_name,
-            (
-                select
-                    detail.task_id
-                from
-                     process_info_detail detail
-                where detail.process_info_id = pi.id
-                and detail.user_id = #{params.currentUserId}
-                <if test="params.queryType == 'todoProcess'">
-                    and detail.`status` = #{params.taskStatus}
+        select temp.* from (
+            SELECT
+                pi.id,
+                pi.buss_document_library_id,
+                bdl.serial_number,
+                bdl.title,
+                bdl.title_en,
+                <if test="params.cut == 'cn'">
+                    concat(bdl.serial_number,'、',bdl.title) as standard_info,
                 </if>
-                order by detail.submit_time desc
-                limit 1
-            ) as task_id,
-            (
-                select
-                    detail.task_definition_key
-                from
-                    process_info_detail detail
-                where detail.process_info_id = pi.id
-                and detail.user_id = #{params.currentUserId}
-                <if test="params.queryType == 'todoProcess'">
-                    and detail.`status` = #{params.taskStatus}
+                <if test="params.cut == 'en'">
+                    concat(bdl.serial_number,'、',bdl.title_en) as standard_info,
                 </if>
-                order by detail.submit_time desc
-                limit 1
-            ) as task_definition_key,
-            createBy.username AS "create_by",
-            pi.acti_proc_inst_id,
-            pi.create_time
-        FROM
+                pi.flow_type,
+                pi.end_time,
+                pi.STATUS,
+                pi.prc_num,
+                pi.prc_name,
+                (
+                    select
+                        detail.task_id
+                    from
+                        process_info_detail detail
+                    where detail.process_info_id = pi.id
+                    and detail.user_id = #{params.currentUserId}
+                    <if test="params.queryType == 'todoProcess'">
+                        and detail.`status` = #{params.taskStatus}
+                    </if>
+                    order by detail.submit_time desc
+                    limit 1
+                ) as task_id,
+                (
+                    select
+                        detail.task_definition_key
+                    from
+                        process_info_detail detail
+                    where detail.process_info_id = pi.id
+                    and detail.user_id = #{params.currentUserId}
+                    <if test="params.queryType == 'todoProcess'">
+                        and detail.`status` = #{params.taskStatus}
+                    </if>
+                    order by detail.submit_time desc
+                    limit 1
+                ) as task_definition_key,
+                createBy.username AS create_by,
+                pi.acti_proc_inst_id,
+                pi.create_time
+            FROM
             process_info pi
-        LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
-        LEFT JOIN sys_user createBy on createBy.id = pi.create_by
-        <where>
-            pi.flow_type IN
-            <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-            <if test="params.queryType == 'issuedProcess'">
-                and pi.create_by = #{params.createBy}
-            </if>
-            <if test="params.queryType != 'issuedProcess'">
-                and (
-                    pi.id IN (
-                        SELECT
-                            pid.process_info_id
-                        FROM
-                            process_info_detail pid
-                        where
-                            pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
+            LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
+            LEFT JOIN sys_user createBy on createBy.id = pi.create_by
+            <where>
+                pi.flow_type IN
+                <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+                <if test="params.queryType == 'issuedProcess'">
+                    and pi.create_by = #{params.createBy}
+                </if>
+                <if test="params.queryType != 'issuedProcess'">
+                    and (
+                        pi.id IN (
+                            SELECT
+                                pid.process_info_id
+                            FROM
+                                process_info_detail pid
+                            where
+                            pid.user_id = #{params.currentUserId}
+                            and pid.status = #{params.taskStatus}
+                        )
                     )
-                )
-            </if>
-
-            <if test="params.serialNumber != null and params.serialNumber != ''">
-                and (
-                    bdl.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%')
-                    or bdl.title like CONCAT(CONCAT('%',#{params.serialNumber}),'%')
-                )
+                </if>
+            </where>
+        ) temp
+        <where>
+            <if test="params.standardInfo != null and params.standardInfo != ''">
+                and temp.standard_info like CONCAT(CONCAT('%',#{params.standardInfo}),'%')
             </if>
             <if test="params.flowType != null and params.flowType !=''">
-                and pi.flow_type = #{params.flowType}
+                and temp.flow_type = #{params.flowType}
             </if>
         </where>
         <if test="params.queryType == 'todoProcess' ">
-            order by pi.end_time asc
+            order by temp.end_time asc
         </if>
         <if test="params.queryType != 'todoProcess' ">
-            order by pi.end_time desc
+            order by temp.end_time desc
         </if>
     </select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
index 75577e278..94a903a45 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
@@ -80,8 +80,10 @@ public class ProcessInfoVO implements Serializable {
 
     /**标准编号*/
     private String serialNumber;
-    /**标准标题*/
+    /**标准标题-中文*/
     private String title;
+    /**标准标题-英文*/
+    private String titleEn;
     /**项目名称*/
     private String projectName;
     /**年份*/
@@ -102,4 +104,7 @@ public class ProcessInfoVO implements Serializable {
     private String personChargeFeedback;
     /**截止日期 过期标识：true为已经过期 false为没有过期**/
     private boolean endTimePastDueFlag = false;
+
+    /**标准信息**/
+    private String standardInfo;
 }