From 0875d1d7f610909a6a8cec634415e4e20cfc6603 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 13 Oct 2023 15:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E-=E6=B3=95=E8=A7=84=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ProcessInfoEOMapper.xml        | 42 ++++++++++++++++++-
 1 file changed, 40 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 a3c3f2092..317cdd972 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
@@ -168,7 +168,26 @@
                    case
                    when
                    year_name_id is null
-                   THEN plb.project_name_id
+                   THEN
+                        concat(
+                        plb.power,
+                        '-',
+                        plb.producer,
+                        '-',
+                        (
+                        SELECT
+                        CASE
+                        WHEN
+                        GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN
+                        '' ELSE GROUP_CONCAT( item_text 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' )
+                        )
+                        )
                    when year_name_id is not null
                    THEN
                     concat(
@@ -243,7 +262,26 @@
                    case
                    when
                    year_name_id is null
-                   THEN plb.project_name_id
+                   THEN
+                        concat(
+                        plb.power,
+                        '-',
+                        plb.producer,
+                        '-',
+                        (
+                        SELECT
+                        CASE
+                        WHEN
+                        GROUP_CONCAT( item_text SEPARATOR ',' ) IS NULL THEN
+                        '' ELSE GROUP_CONCAT( item_text 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' )
+                        )
+                        )
                    when year_name_id is not null
                    THEN
                     concat(