From 7a886825d2b0dea4fa7e911f9fa9c35bddfedf1c Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Thu, 27 Oct 2022 11:01:20 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/components/evaluatorFeedbackList.vue      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
index e3cdc3930..f611b6cbc 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
@@ -373,7 +373,11 @@
             antTableHeader[0].style = 'margin-bottom: -8px;padding-bottom: 0px;min-width: 8px;overflow: hidden'
           })
         }
-        if (this.$route.query.taskDefinitionKey != 'pgrqr') {
+        let disabled = false
+        if (this.$route.query.isDisabled) {
+          disabled = JSON.parse(this.$route.query.isDisabled)
+        }
+        if (this.$route.query.taskDefinitionKey != 'pgrqr' && !disabled) {
           this.dataSource.forEach(res => {
             res.sponsorFeedback = ''
           })

From b2100c360f9169d0f4442ee8f19d072574849ca3 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 27 Oct 2022 11:26:59 +0800
Subject: [PATCH 2/7] =?UTF-8?q?61842-=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=B7=B2=E5=8A=9E/=E5=B7=B2=E5=8F=91=20=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=80=92?=
 =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todoCenter/mapper/xml/ProcessInfoEOMapper.xml        | 9 +++++++--
 1 file changed, 7 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 72a3b386a..5cd218e78 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
@@ -92,7 +92,7 @@
         left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id
         LEFT JOIN sys_user createBy on createBy.id = pi.create_by
         <include refid="BaseQuerySql"/>
-        order by pi.end_time asc
+        order by pi.end_time desc
     </select>
     <select id="queryProjectProcessTodoTaskListList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
         select temp.* from (
@@ -280,6 +280,11 @@
                 and pi.flow_type = #{params.flowType}
             </if>
         </where>
-        order by pi.end_time asc
+        <if test="params.queryType == 'todoProcess' ">
+            order by pi.end_time asc
+        </if>
+        <if test="params.queryType != 'todoProcess' ">
+            order by pi.end_time desc
+        </if>
     </select>
 </mapper>

From 60e585043f72ab20eb72af801594446634c00caa Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Thu, 27 Oct 2022 11:35:45 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/evaluatorFeedback.vue           | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
index 66b4c56aa..85420a896 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
@@ -15,7 +15,15 @@
                 <span class="title-text-text" :title="$t('complianceResults')">{{$t('complianceResults')}}</span>
               </div>
               <div class="title-text-right" v-if="disabled">
-                {{formInline.complianceResult == 'Compliance'?$t('accord'):$t('nonConformity')}}
+                <span v-if="formInline.complianceResult == 'Compliance'">
+                   {{$t('accord')}}
+                </span>
+                <span v-else-if="formInline.complianceResult == 'Non-Compliance'">
+                    {{$t('nonConformity')}}
+                </span>
+                <span v-else>
+                   --
+                </span>
               </div>
               <a-form-model-item class="itemModel" v-if="!disabled" :prop="!disabled?'complianceResult':''">
                 <a-radio-group style="margin-top: 2px" class="box-input"
@@ -51,7 +59,7 @@
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
                 <div class="title-text-right" :title="item.relatedSection" v-if="disabled">
-                  {{item.relatedSection}}
+                  {{item.relatedSection ?item.relatedSection : '--'}}
                 </div>
                 <a-form-model-item class="itemModel" v-if="!disabled"
                                    :prop="'dataList.'+index+'.relatedSection'"
@@ -73,7 +81,7 @@
                         :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
                 <div class="title-text-right" :title="item.issueOrSuggest" v-if="disabled">
-                  {{item.issueOrSuggest}}
+                  {{item.issueOrSuggest ? item.issueOrSuggest :'--'}}
                 </div>
                 <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'" v-if="!disabled"
                                    :rules="[{ required: true, message: $t('problemDescription') + $t('cannotEmpty'), trigger: 'blur'},
@@ -121,7 +129,7 @@
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
                 <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.relatedSection">
-                  {{item.relatedSection}}
+                  {{item.relatedSection?item.relatedSection : '--'}}
                 </div>
               </div>
             </a-col>
@@ -132,7 +140,7 @@
                         :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
                 <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.issueOrSuggest">
-                  {{item.issueOrSuggest}}
+                  {{item.issueOrSuggest ? item.issueOrSuggest:'--'}}
                 </div>
               </div>
             </a-col>

From 7dc56839b4d018fe101d17de7ee8c7878cc434d7 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Thu, 27 Oct 2022 14:09:46 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/processForm/regulatoryProcess/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index dfb95253c..181c1f247 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -124,10 +124,16 @@
         })
       },
       lawsOpinionAssessmentResult() {
+        let createBy = ''
+        if (this.$route.query.taskDefinitionKey == 'gcsfq' && this.disabled){
+          createBy = ''
+        }else{
+          createBy = this.userInfo().username
+        }
         getAction(this.url.list, {
           lawsOpinionGatherId: this.queryProject.id,
           actiProcInstId: this.$route.query.prcId,
-          createBy: this.userInfo().username
+          createBy: createBy
         }).then((res) => {
           if (res.success) {
             this.feedbackDataList = res.result || []

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

From ed5354b8a6cdd177f213767d314a90b0c91b5587 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Thu, 27 Oct 2022 14:15:39 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectRegulationTasks/components/SentList.vue    |  6 +++---
 .../projectRegulationTasks/components/dealtWith.vue   | 11 ++++++-----
 .../projectRegulationTasks/components/doneList.vue    |  6 +++---
 .../views/toDoCenter/projectRegulationTasks/index.vue |  2 +-
 .../regulatoryAssessmentTasks/components/SentList.vue |  6 +++---
 .../components/dealtWith.vue                          |  6 +++---
 .../regulatoryAssessmentTasks/components/doneList.vue |  6 +++---
 .../toDoCenter/regulatoryAssessmentTasks/index.vue    |  2 +-
 8 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index 2e445401c..a282c6bd0 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -21,8 +21,8 @@
           <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-       <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text+'、'+record.title">
-          {{text+'、'+record.title}}
+       <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
+          {{text}}
         </a>
         <span v-else>--</span>
       </span>
@@ -63,7 +63,7 @@
           {
             title: this.$t('standardInformation'),
             align: 'center',
-            dataIndex: 'serialNumber',
+            dataIndex: 'standardInfo',
             scopedSlots: { customRender: 'standardInformation' },
             ellipsis: true,
             width: 170
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index 7e7b36dc4..118d34cae 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -22,8 +22,8 @@
           <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text+'、'+record.title">
-          {{text+'、'+record.title}}
+        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
+          {{text}}
         </a>
         <span v-else>--</span>
       </span>
@@ -64,7 +64,7 @@
           {
             title: this.$t('standardInformation'),
             align: 'center',
-            dataIndex: 'serialNumber',
+            dataIndex: 'standardInfo',
             ellipsis: true,
             scopedSlots: { customRender: 'standardInformation' },
             width: 170
@@ -331,7 +331,8 @@
     text-align: right;
     margin-top: 20px;
   }
-  .activeRed{
-     color: red;
+
+  .activeRed {
+    color: red;
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
index 559e9f016..ec3a33458 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
@@ -23,8 +23,8 @@
           </a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text+'、'+record.title">
-          {{text+'、'+record.title}}
+        <a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
+          {{text}}
         </a>
         <span v-else>--</span>
       </span>
@@ -69,7 +69,7 @@
           {
             title: this.$t('standardInformation'),
             align: 'center',
-            dataIndex: 'serialNumber',
+            dataIndex: 'standardInfo',
             ellipsis: true,
             scopedSlots: { customRender: 'standardInformation' },
             width: 170
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
index a97b542c2..bd405bd48 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
@@ -18,7 +18,7 @@
                 <span>{{$t('standardInformation')}}</span>
               </div>
               <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
-                       v-model="queryParam.serialNumber"></a-input>
+                       v-model="queryParam.standardInfo"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
index fb13eae0c..03459bc80 100644
--- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
@@ -18,8 +18,8 @@
              @click="viewClick(record)">{{$t('view')}}</a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" :title="text+'、'+record.title">
-          {{text+'、'+record.title}}
+        <a @click="standardInformationClick(record)" :title="text">
+          {{text}}
         </a>
       </span>
     </a-table>
@@ -54,7 +54,7 @@
           {
             title: this.$t('standardInformation'),
             align: 'center',
-            dataIndex: 'serialNumber',
+            dataIndex: 'standardInfo',
             scopedSlots: { customRender: 'standardInformation' },
             ellipsis: true,
             width: 170
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue
index eba3c634c..f37f9d6b6 100644
--- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue
@@ -19,8 +19,8 @@
           <span :title="text" :class="{'activeRed':record.endTimePastDueFlag}">{{text}}</span>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-        <a @click="standardInformationClick(record)" :title="text+'、'+record.title">
-          {{text+'、'+record.title}}
+        <a @click="standardInformationClick(record)" :title="text">
+          {{text}}
         </a>
       </span>
     </a-table>
@@ -52,7 +52,7 @@
           {
             title: this.$t('standardInformation'),
             align: 'center',
-            dataIndex: 'serialNumber',
+            dataIndex: 'standardInfo',
             scopedSlots: { customRender: 'standardInformation' },
             ellipsis: true,
             width: 170
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
index efc218fae..febfb2bf7 100644
--- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
@@ -18,8 +18,8 @@
              @click="viewClick(record)">{{$t('view')}}</a>
       </span>
       <span slot="standardInformation" slot-scope="text,record">
-       <a @click="standardInformationClick(record)" :title="text+'、'+record.title">
-          {{text+'、'+record.title}}
+       <a @click="standardInformationClick(record)" :title="text">
+          {{text}}
         </a>
       </span>
     </a-table>
@@ -51,7 +51,7 @@
           {
             title: this.$t('standardInformation'),
             align: 'center',
-            dataIndex: 'serialNumber',
+            dataIndex: 'standardInfo',
             ellipsis: true,
             scopedSlots: { customRender: 'standardInformation' },
             width: 170
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue
index 3b8ff22f4..7849db357 100644
--- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue
@@ -9,7 +9,7 @@
                 <span>{{$t('standardInformation')}}</span>
               </div>
               <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardInformation')"
-                       v-model="queryParam.serialNumber"></a-input>
+                       v-model="queryParam.standardInfo"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">

From 5c1f217dcbf10754a2495c5a75b75fd946a4031e Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 27 Oct 2022 15:13:39 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ProcessInfoEOMapper.xml        | 225 +++++++++---------
 .../impl/ProcessInfoEOServiceImpl.java        |   1 +
 2 files changed, 120 insertions(+), 106 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 57501c8f3..546b830d8 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
@@ -19,81 +19,102 @@
 
     <sql id="BaseQuerySql">
         <where>
-            (
-                pi.id IN (
-                    SELECT
-                        pid.process_info_id
-                    FROM
-                        process_info_detail pid
-                    <where>
-                        pid.user_id = #{params.currentUserId}
-                        <if test="params.taskStatus != null and params.taskStatus != ''">
-                            and pid.status = #{params.taskStatus}
-                        </if>
-                    </where>
-                )
-            )
             <if test="params.projectName != null and params.projectName !=''">
                 and (
-                    pni.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
-                    or pyni.year_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
+                    temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
+                    or temp.year_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
                 )
             </if>
-            <if test="params.serialNumber != null and params.serialNumber !=''">
-                and (
-                    pli.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%')
-                )
+            <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>
             <if test="params.status != null and params.status !=''">
-                and pi.status = #{params.status}
-            </if>
-            <if test="params.flowTypeList != null">
-                and pi.flow_type in
-                <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="params.createBy != null and params.createBy != ''">
-                and pi.create_by = #{params.createBy}
+                and temp.status = #{params.status}
             </if>
         </where>
     </sql>
 
     <select id="queryProjectProcessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
-        SELECT
-            pi.id,
-            pi.project_library_id,
-            pi.project_laws_inventory_id,
-            pi.buss_document_library_id,
-            pi.acti_proc_inst_id,
-            pni.project_name,
-            pyni.year_name,
-            pli.serial_number,
-            pli.title,
-            plb.title_en,
-            pi.flow_type,
-            createBy.username as "create_by",
-            pi.end_time,
-            (select detail.task_id from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} order by 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} order by submit_time desc limit 1) as task_definition_key,
-            pi.status,
-            pi.prc_num,
-            pi.prc_name,
-            plb.project_name_id,
-            plb.target_market,
-            plb.studio_engineer
-        FROM
-            process_info pi
-        left join project_library_base plb on plb.id = pi.project_library_id
-        left join project_name_info pni on pni.id = plb.project_name_id
-        left join project_year_name_info pyni on pyni.id = plb.year_name_id
-        left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id
-        LEFT JOIN sys_user createBy on createBy.id = pi.create_by
+        select temp.* from (
+            SELECT
+                pi.id,
+                pi.project_library_id,
+                pi.project_laws_inventory_id,
+                pi.buss_document_library_id,
+                pi.acti_proc_inst_id,
+                pni.project_name,
+                pyni.year_name,
+                pli.serial_number,
+                pli.title,
+                bdl.title_en,
+                <if test="params.cut == 'cn'">
+                    concat(pli.serial_number,'、',pli.title) as standard_info,
+                </if>
+                <if test="params.cut == 'en'">
+                    concat(pli.serial_number,'、',bdl.title_en) as standard_info,
+                </if>
+                pi.flow_type,
+                createBy.username as "create_by",
+                pi.end_time,
+                (
+                    select
+                         detail.task_id
+                    from
+                         process_info_detail detail
+                    where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} order by 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} order by submit_time desc limit 1
+                ) as task_definition_key,
+                pi.status,
+                pi.prc_num,
+                pi.prc_name,
+                plb.project_name_id,
+                plb.target_market,
+                plb.studio_engineer
+            FROM
+                process_info pi
+                left join project_library_base plb on plb.id = pi.project_library_id
+                left join project_name_info pni on pni.id = plb.project_name_id
+                left join project_year_name_info pyni on pyni.id = plb.year_name_id
+                left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id
+                LEFT JOIN sys_user createBy on createBy.id = pi.create_by
+                LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
+            <where>
+                 and pi.id IN (
+                        SELECT
+                            pid.process_info_id
+                        FROM
+                            process_info_detail pid
+                        <where>
+                            pid.user_id = #{params.currentUserId}
+                            <if test="params.taskStatus != null and params.taskStatus != ''">
+                                and pid.status = #{params.taskStatus}
+                            </if>
+                        </where>
+                )
+                <if test="params.flowTypeList != null">
+                    and pi.flow_type in
+                    <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+                <if test="params.queryType == 'issuedProcess'">
+                    <if test="params.createBy != null and params.createBy != ''">
+                        and pi.create_by = #{params.createBy}
+                    </if>
+                </if>
+            </where>
+        ) temp
         <include refid="BaseQuerySql"/>
-        order by pi.end_time desc
+        order by temp.end_time desc
     </select>
     <select id="queryProjectProcessTodoTaskListList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
         select temp.* from (
@@ -107,12 +128,30 @@
                    pyni.year_name,
                    pli.serial_number,
                    pli.title,
-                   plb.title_en,
+                   bdl.title_en,
+                   <if test="params.cut == 'cn'">
+                        concat(pli.serial_number,'、',pli.title) as standard_info,
+                   </if>
+                   <if test="params.cut == 'en'">
+                        concat(pli.serial_number,'、',bdl.title_en) as standard_info,
+                   </if>
                    pi.flow_type,
                    createBy.username AS "create_by",
                    pi.end_time,
-                    (select detail.task_id from process_info_detail detail where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} and detail.`status` = 'NotDone' 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} and detail.`status` = 'NotDone' limit 1) as task_definition_key,
+                    (
+                        select
+                             detail.task_id
+                        from
+                             process_info_detail detail
+                        where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId} and detail.`status` = 'NotDone' 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} and detail.`status` = 'NotDone' limit 1
+                    ) as task_definition_key,
                    pi.STATUS,
                    pi.prc_num,
                    pi.prc_name,
@@ -126,6 +165,7 @@
                    LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
                    LEFT JOIN project_laws_inventory pli ON pi.project_laws_inventory_id = pli.id
                    LEFT JOIN sys_user createBy ON createBy.id = pi.create_by
+                   LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
                where
                      (
                            pi.id IN (
@@ -133,8 +173,7 @@
                                    pid.process_info_id
                                FROM
                                    process_info_detail pid
-                               where
-                                   pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
+                               where pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
                            )
                      )
                      AND pi.flow_type IN
@@ -151,11 +190,18 @@
                    pni.project_name,
                    pyni.year_name,
                    '--' as serial_number,
+                   '--' as standard_info,
                    '' 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,
+                   (
+                       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 task_id,
                    '' as task_definition_key,
                    pi.STATUS,
@@ -178,34 +224,12 @@
                                 pid.process_info_id
                             FROM
                                 process_info_detail pid
-                            where
-                                pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
+                            where pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
                         )
                    )
                    AND pi.flow_type = #{params.qdqrFlowTypeValue}
         )temp
-        <where>
-            <if test="params.projectName != null and params.projectName !=''">
-                and (
-                    temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
-                    or temp.year_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
-                )
-            </if>
-            <if test="params.serialNumber != null and params.serialNumber !=''">
-                and (
-                    temp.serial_number like CONCAT(CONCAT('%',#{params.serialNumber}),'%')
-                )
-            </if>
-            <if test="params.flowType != null and params.flowType !=''">
-                and temp.flow_type = #{params.flowType}
-            </if>
-            <if test="params.status != null and params.status !=''">
-                and temp.status = #{params.status}
-            </if>
-            <if test="params.createBy != null and params.createBy != ''">
-                and temp.create_by = #{params.createBy}
-            </if>
-        </where>
+        <include refid="BaseQuerySql"/>
         order by temp.end_time asc
     </select>
     <select id="queryLawsAssessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
@@ -232,8 +256,7 @@
                         detail.task_id
                     from
                         process_info_detail detail
-                    where detail.process_info_id = pi.id
-                    and detail.user_id = #{params.currentUserId}
+                    where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId}
                     <if test="params.queryType == 'todoProcess'">
                         and detail.`status` = #{params.taskStatus}
                     </if>
@@ -245,8 +268,7 @@
                         detail.task_definition_key
                     from
                         process_info_detail detail
-                    where detail.process_info_id = pi.id
-                    and detail.user_id = #{params.currentUserId}
+                    where detail.process_info_id = pi.id and detail.user_id = #{params.currentUserId}
                     <if test="params.queryType == 'todoProcess'">
                         and detail.`status` = #{params.taskStatus}
                     </if>
@@ -275,22 +297,13 @@
                                 pid.process_info_id
                             FROM
                                 process_info_detail pid
-                            where
-                            pid.user_id = #{params.currentUserId}
-                            and pid.status = #{params.taskStatus}
+                            where pid.user_id = #{params.currentUserId} and pid.status = #{params.taskStatus}
                         )
                     )
                 </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 temp.flow_type = #{params.flowType}
-            </if>
-        </where>
+        <include refid="BaseQuerySql"/>
         <if test="params.queryType == 'todoProcess' ">
             order by temp.end_time asc
         </if>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
index 203a27fe5..5122b30ec 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
@@ -237,6 +237,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 		this.setFlowTypeList(flowTypeList);
 		params.put("flowTypeList",flowTypeList);
 		params.put("currentUserId",currentUser.getId());
+		params.put("queryType","issuedProcess");
 
 		IPage page = new Page(pageNo, pageSize);
 		IPage<ProcessInfoVO> result = this.baseMapper.queryProjectProcessPageList(page,params);