From d9ed6da645223ed2bfebec1e2b254b74921c5518 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Fri, 14 Apr 2023 15:46:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=BE=85=E5=8A=9E=EF=BC=8C=E5=85=A8?=
 =?UTF-8?q?=E8=AF=8D=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=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        | 75 ++++++++++++++++---
 .../impl/ProcessInfoEOServiceImpl.java        |  4 +-
 2 files changed, 68 insertions(+), 11 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 0a92b391d..1081945ae 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
@@ -50,16 +50,35 @@
                 pi.buss_document_library_id,
                 pi.acti_proc_inst_id,
                 <!--pni.project_name,-->
-                concat( pni.project_name, '-', pyni.year_name ) AS project_name,
+                <!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
+                concat(
+                    pni.project_name, '-',
+                    pyni.year_name, '-',
+                    (
+                        SELECT
+                            <if test="params.cut == 'cn'">
+                                CASE WHEN GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( item_text SEPARATOR ',' ) END AS item_text
+                            </if>
+                            <if test="params.cut == 'en'">
+                                CASE WHEN GROUP_CONCAT( en_name SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( en_name SEPARATOR ',' ) END AS item_text
+                            </if>
+                        FROM
+                            sys_dict_item
+                        WHERE
+                            FIND_IN_SET( item_value, plb.target_market ) > 0
+                            AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
+                    ) , '-',
+                    plb.project_version
+                ) AS 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,
+                    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,
+                    concat(pli.serial_number,' ',bdl.title_en) as standard_info,
                 </if>
                 pi.flow_type,
                 pi.create_by,
@@ -124,16 +143,35 @@
                    pi.buss_document_library_id,
                    pi.acti_proc_inst_id,
                    <!--pni.project_name,-->
-                   concat( pni.project_name, '-', pyni.year_name ) AS project_name,
+                   <!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
+                    concat(
+                        pni.project_name, '-',
+                        pyni.year_name, '-',
+                        (
+                            SELECT
+                                <if test="params.cut == 'cn'">
+                                    CASE WHEN GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( item_text SEPARATOR ',' ) END AS item_text
+                                </if>
+                                <if test="params.cut == 'en'">
+                                    CASE WHEN GROUP_CONCAT( en_name SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( en_name SEPARATOR ',' ) END AS item_text
+                                </if>
+                            FROM
+                                sys_dict_item
+                            WHERE
+                                FIND_IN_SET( item_value, plb.target_market ) > 0
+                                AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
+                        ) , '-',
+                        plb.project_version
+                    ) AS 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,
+                        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,
+                        concat(pli.serial_number,' ',bdl.title_en) as standard_info,
                    </if>
                    pi.flow_type,
                    pi.create_by,
@@ -175,7 +213,26 @@
                    pi.buss_document_library_id,
                    pi.acti_proc_inst_id,
                     <!--pni.project_name,-->
-                    concat( pni.project_name, '-', pyni.year_name ) AS project_name,
+                    <!--concat( pni.project_name, '-', pyni.year_name ) AS project_name,-->
+                    concat(
+                        pni.project_name, '-',
+                        pyni.year_name, '-',
+                        (
+                            SELECT
+                                <if test="params.cut == 'cn'">
+                                    CASE WHEN GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( item_text SEPARATOR ',' ) END AS item_text
+                                </if>
+                                <if test="params.cut == 'en'">
+                                    CASE WHEN GROUP_CONCAT( en_name SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( en_name SEPARATOR ',' ) END AS item_text
+                                </if>
+                            FROM
+                                sys_dict_item
+                            WHERE
+                                FIND_IN_SET( item_value, plb.target_market ) > 0
+                                AND dict_id = ( SELECT id FROM sys_dict WHERE dict_code = 'region' )
+                        ) , '-',
+                        plb.project_version
+                    ) AS project_name,
                    pyni.year_name,
                    '--' as serial_number,
                    '--' as standard_info,
@@ -267,10 +324,10 @@
                 bdl.title,
                 bdl.title_en,
                 <if test="params.cut == 'cn'">
-                    concat(bdl.serial_number,'、',bdl.title) as standard_info,
+                    concat(bdl.serial_number,' ',bdl.title) as standard_info,
                 </if>
                 <if test="params.cut == 'en'">
-                    concat(bdl.serial_number,'、',bdl.title_en) as standard_info,
+                    concat(bdl.serial_number,' ',bdl.title_en) as standard_info,
                 </if>
                 pi.flow_type,
                 pi.end_time,
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 f6f5758c9..469f80723 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
@@ -642,7 +642,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 					}
 				}
 
-				if (StringUtils.isNotBlank(data.getTargetMarket())) {
+				/*if (StringUtils.isNotBlank(data.getTargetMarket())) {
 					//目标市场
 					List<DictModel> targetMarketList = this.sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 
@@ -657,7 +657,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 
 					//data.setProjectName(data.getProjectName() + "-" + data.getYearName() + "-" + targetMarket + "-" + projectVersion);
 					data.setProjectName(data.getProjectName() + "-" + targetMarket + "-" + projectVersion);
-				}
+				}*/
 
 				//设置任务清单明细表id
 				if(CollectionUtils.isNotEmpty(finalTaskInventoryDetailList)){