From 0207efb60752ef82a1da0141ea48318239d20097 Mon Sep 17 00:00:00 2001
From: wangzhijiang <1358525938@qq.com>
Date: Wed, 21 Jun 2023 14:28:24 +0800
Subject: [PATCH] =?UTF-8?q?71162=20=E6=89=8B=E6=9C=BA=E7=AB=AF-=E5=BE=85?=
=?UTF-8?q?=E5=8A=9E=E4=B8=AD=E5=BF=83=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=B3=95?=
=?UTF-8?q?=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E3=80=81=E6=B3=95?=
=?UTF-8?q?=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 6 +++-
.../mapper/xml/ProcessInfoEOMapper.xml | 32 +++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
index f072aca67..706af7d17 100644
--- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
@@ -659,4 +659,8 @@ CREATE TABLE `recent_browse` (
`browse_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览类型',
`browse_data_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览数据id',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '最近浏览' ROW_FORMAT = Dynamic;
\ No newline at end of file
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '最近浏览' ROW_FORMAT = Dynamic;
+
+-- 认证清单表 交付物字段扩大 2023-06-21 未同步生产环境
+ALTER TABLE `project_certification_inventory`
+ MODIFY COLUMN `deliverable` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物' AFTER `duty_territory`;
\ No newline at end of file
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 5024555f4..f6ad28419 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
@@ -537,6 +537,38 @@
#{item}
+
+ union
+ SELECT
+ pi.id,
+ '' as project_library_id,
+ '' as project_laws_inventory_id,
+ pi.buss_document_library_id,
+ pi.acti_proc_inst_id,
+ '--' AS project_name,
+ '' as year_name,
+ bdl.serial_number,
+ concat( bdl.serial_number, ' ', bdl.title ) AS standard_info,
+ bdl.title,
+ bdl.title_en,
+ pi.flow_type,
+ pi.create_by,
+ pi.end_time,
+ pi.STATUS,
+ pi.prc_num,
+ pi.prc_name,
+ '' as project_name_id,
+ '' as target_market,
+ '' as studio_engineer,
+ '' as project_version,
+ '' as parent_id
+ FROM
+ process_info pi
+ LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
+ WHERE
+ pi.flow_type IN ( '5', '6' )
+ 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} ) )
+
)temp
order by