From 1b03a76ca3d087248546a5ca4724be6f2cb67312 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 22 Jan 2024 19:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BB=BB=E5=8A=A1-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/mapper/xml/TodoCenterMapper.xml | 6 +++--- .../cert/collect/mapper/xml/ParamsManifestEOMapper.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml index c69444d63..6bd82351a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml @@ -61,13 +61,13 @@ pm.id as id, pm.title as title, pm.state as state, - pm.project_id as project_id, + pm.project_version_id as project_id, pm.create_time as create_time, pm.version as version, concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.project_version) as project_name, plb.project_status from params_manifest pm - left join project_library_base as plb on plb.id = pm.project_id + left join project_library_base as plb on plb.id = pm.project_version_id left join project_name_info as pni on plb.project_name_id = pni.id left join project_year_name_info as pyni on plb.year_name_id=pyni.id where plb.project_status !=#{projectStatus} @@ -80,7 +80,7 @@ FROM project_library_base a JOIN mysql.help_topic b ON b.help_topic_id < ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp - WHERE user_id = #{userId}) a ON pm.project_id = a.id + WHERE user_id = #{userId}) a ON pm.project_version_id = a.id UNION SELECT DISTINCT pcm.params_manifest_id AS pm FROM params_collect_manifest pcm WHERE sdt = #{userName} and state in('2','5') diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 873f4b9eb..b91f5ce12 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -166,13 +166,13 @@ pm.id as id, pm.title as title, pm.state as state, - pm.project_id as project_id, + pm.project_version_id as project_id, pm.create_time as create_time, pm.version as version, concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.project_version) as project_name, plb.project_status from params_manifest pm - left join project_library_base as plb on plb.id = pm.project_id + left join project_library_base as plb on plb.id = pm.project_version_id left join project_name_info as pni on plb.project_name_id = pni.id left join project_year_name_info as pyni on plb.year_name_id=pyni.id ) tmp_tb @@ -184,7 +184,7 @@ FROM project_library_base a JOIN mysql.help_topic b ON b.help_topic_id < ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp - WHERE user_id = #{userId}) a ON pm.project_id = a.id + WHERE user_id = #{userId}) a ON pm.project_version_id = a.id UNION SELECT DISTINCT pcm.params_manifest_id AS pm FROM params_collect_manifest pcm WHERE sdt = #{userName} and state in('2','5')