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,
- concat( pni.project_name, '-', pyni.year_name ) AS project_name,
+
+ concat(
+ pni.project_name, '-',
+ pyni.year_name, '-',
+ (
+ SELECT
+
+ CASE WHEN GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( item_text SEPARATOR ',' ) END AS item_text
+
+
+ CASE WHEN GROUP_CONCAT( en_name SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( en_name SEPARATOR ',' ) END AS item_text
+
+ 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,
- concat(pli.serial_number,'、',pli.title) as standard_info,
+ concat(pli.serial_number,' ',pli.title) as standard_info,
- concat(pli.serial_number,'、',bdl.title_en) as standard_info,
+ concat(pli.serial_number,' ',bdl.title_en) as standard_info,
pi.flow_type,
pi.create_by,
@@ -124,16 +143,35 @@
pi.buss_document_library_id,
pi.acti_proc_inst_id,
- concat( pni.project_name, '-', pyni.year_name ) AS project_name,
+
+ concat(
+ pni.project_name, '-',
+ pyni.year_name, '-',
+ (
+ SELECT
+
+ CASE WHEN GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( item_text SEPARATOR ',' ) END AS item_text
+
+
+ CASE WHEN GROUP_CONCAT( en_name SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( en_name SEPARATOR ',' ) END AS item_text
+
+ 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,
- concat(pli.serial_number,'、',pli.title) as standard_info,
+ concat(pli.serial_number,' ',pli.title) as standard_info,
- concat(pli.serial_number,'、',bdl.title_en) as standard_info,
+ concat(pli.serial_number,' ',bdl.title_en) as standard_info,
pi.flow_type,
pi.create_by,
@@ -175,7 +213,26 @@
pi.buss_document_library_id,
pi.acti_proc_inst_id,
- concat( pni.project_name, '-', pyni.year_name ) AS project_name,
+
+ concat(
+ pni.project_name, '-',
+ pyni.year_name, '-',
+ (
+ SELECT
+
+ CASE WHEN GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( item_text SEPARATOR ',' ) END AS item_text
+
+
+ CASE WHEN GROUP_CONCAT( en_name SEPARATOR ',' ) IS NULL THEN '' ELSE GROUP_CONCAT( en_name SEPARATOR ',' ) END AS item_text
+
+ 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,
- concat(bdl.serial_number,'、',bdl.title) as standard_info,
+ concat(bdl.serial_number,' ',bdl.title) as standard_info,
- concat(bdl.serial_number,'、',bdl.title_en) as standard_info,
+ concat(bdl.serial_number,' ',bdl.title_en) as standard_info,
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 targetMarketList = this.sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
@@ -657,7 +657,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl