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