From 152c49ce026891a890342a72a2fa2d0d30c95c1d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 4 Mar 2022 10:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandProjectLibrary.java | 3 + .../SarStandProjectLibraryMapper.xml | 124 +++++++++++------- 2 files changed, 76 insertions(+), 51 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index 80663883..e9f942be 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -89,6 +89,9 @@ public class SarStandProjectLibrary extends BaseEntity { @ApiModelProperty(value = "项目细分类名称") private String categoryName; + @ApiModelProperty(value = "项目清单维护情况 ( 1：已维护 其他未维护)") + private String flag; + //标准编号 @TableField(exist = false) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 79ffb5e3..8dbfdb77 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -57,14 +57,24 @@ ) AS total FROM sar_stand_project_library as library - LEFT JOIN sar_stand_project_team as team ON team.project_code = library.project_number + LEFT JOIN ( + SELECT + GROUP_CONCAT(sar_stand_project_team.name) as name ,sar_stand_project_team.project_code + FROM + sar_stand_project_team + LEFT JOIN sar_stand_project_team AS a ON a.project_code = sar_stand_project_team.project_code + AND a.id != sar_stand_project_team.id + group by + sar_stand_project_team.project_code + ) + as team ON team.project_code = library.project_number WHERE - library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) + (library.flag != '1' or library.flag IS NULL) - library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) + library.flag = '1' 1=1 @@ -116,14 +126,24 @@ team.`name` as uName FROM sar_stand_project_library as library - LEFT JOIN sar_stand_project_team as team + LEFT JOIN ( + SELECT + GROUP_CONCAT(sar_stand_project_team.name) as name ,sar_stand_project_team.project_code + FROM + sar_stand_project_team + LEFT JOIN sar_stand_project_team AS a ON a.project_code = sar_stand_project_team.project_code + AND a.id != sar_stand_project_team.id + group by + sar_stand_project_team.project_code + ) + as team ON team.project_code = library.project_number WHERE - library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) + (library.flag != '1' or library.flag IS NULL) - library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) + library.flag = '1' 1=1 @@ -181,14 +201,24 @@ FROM sar_stand_project_library as library - LEFT JOIN sar_stand_project_team as team + LEFT JOIN ( + SELECT + GROUP_CONCAT(sar_stand_project_team.name) as name ,sar_stand_project_team.project_code + FROM + sar_stand_project_team + LEFT JOIN sar_stand_project_team AS a ON a.project_code = sar_stand_project_team.project_code + AND a.id != sar_stand_project_team.id + group by + sar_stand_project_team.project_code + ) + as team ON team.project_code = library.project_number WHERE - library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) + (library.flag != '1' or library.flag IS NULL) - library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL ) + library.flag = '1' 1=1 @@ -201,22 +231,20 @@ library.*, team.`name` AS uName FROM sar_stand_project_library as library - LEFT JOIN sar_stand_project_team as team ON team.project_code = library.project_number + LEFT JOIN ( + SELECT + GROUP_CONCAT(sar_stand_project_team.name) as name ,sar_stand_project_team.project_code + FROM + sar_stand_project_team + LEFT JOIN sar_stand_project_team AS a ON a.project_code = sar_stand_project_team.project_code + AND a.id != sar_stand_project_team.id + group by + sar_stand_project_team.project_code + ) + as team ON team.project_code = library.project_number WHERE ( - library.id IN ( - SELECT DISTINCT - project_id - FROM - sar_stand_project_relation - WHERE - project_id NOT IN ( - SELECT DISTINCT - STAND_ID - FROM - sar_stand_items - ) - ) + library.flag = '1' AND library.project_number LIKE concat(concat('%',#{qu.projectNumber}),'%') @@ -280,22 +308,19 @@ FROM sar_stand_project_library as library - LEFT JOIN sar_stand_project_team as team ON team.project_code = library.project_number + LEFT JOIN ( + SELECT + GROUP_CONCAT(sar_stand_project_team.name) as name ,sar_stand_project_team.project_code + FROM + sar_stand_project_team + LEFT JOIN sar_stand_project_team AS a ON a.project_code = sar_stand_project_team.project_code + AND a.id != sar_stand_project_team.id + group by + sar_stand_project_team.project_code + ) as team ON team.project_code = library.project_number WHERE ( - library.id IN ( - SELECT DISTINCT - project_id - FROM - sar_stand_project_relation - WHERE - project_id NOT IN ( - SELECT DISTINCT - STAND_ID - FROM - sar_stand_items - ) - ) + library.flag = '1' )