From 0ee4f6361421f82bc4991b30b4780d2ce898fc80 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 21 Oct 2021 13:51:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95->=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BB=8F=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarLawsAttrDetailedListServiceImpl.java   |   8 +-
 .../entity/SarStandProjectLibrary.java        |   1 -
 .../SarStandProjectLibraryServiceImpl.java    |   2 +
 .../SarStandProjectLibraryMapper.xml          | 164 ++++++++++--------
 4 files changed, 102 insertions(+), 73 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
index dad90b45..8c1e51c7 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
@@ -143,7 +143,13 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
                         }
                     }
                 }
-                String completedString = builder.delete(builder.length()-1,builder.length()).toString();
+                /**
+                 * 当""时索引异常
+                 */
+                String completedString="";
+                if (!"".equals(builder.toString())){
+                     completedString = builder.delete(builder.length()-1,builder.length()).toString();
+                }
                 list1.setZRBM(completedString);
             }
             else {
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 06c6a716..e48e20e0 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
@@ -74,7 +74,6 @@ public class SarStandProjectLibrary extends BaseEntity {
     private String projectManager;
 
     @ApiModelProperty(value = "项目经理名称")
-
     @TableField(exist = false)
     private String uName;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index efa696c0..9ad9ae4e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -435,6 +435,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
         IPage<SarStandProjectLibrary> userIPage = new Page<>();
         if (3!=flag) {
+            //6922
             List<SarStandProjectLibrary> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPages(current, pageSize, wrapper, flag);
             Integer count = sarStandProjectLibraryDao.selectCount(wrapper, flag);
             userIPage.setCurrent(current);
@@ -444,6 +445,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             return userIPage;
         }
         else {
+            //6922
             flag=2;
             List<SarStandProjectLibrary> sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagesWorkFlow(current, pageSize, wrapper, flag);
             Integer count = sarStandProjectLibraryDao.selectCountWorkFlow(wrapper, flag);
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 e6d90b5e..e57eafad 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
@@ -41,57 +41,59 @@
 
     <select id="selectCount" resultType="java.lang.Integer">
         SELECT
-        count(sar_stand_project_library.id ) as total
+        count(
+        library.id
+        ) AS total
         FROM
-        sar_stand_project_library
-        LEFT JOIN ts_user tu ON project_manager = tu.USID
+        sar_stand_project_library as library
+        LEFT JOIN sar_stand_project_team as team ON team.project_code = library.project_number
         WHERE
 
         <if test="flag == 1">
-            id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
         <if test="flag == 2">
-            id IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
         <if test="flag == 4">
             1=1
         </if>
         <if test="qu != null">
             <if test="qu.projectNumber != null">
-                AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
+                AND library.project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
             </if>
             <if test="qu.projectName != null">
-                AND project_name LIKE concat(concat('%',#{qu.projectName}),'%')
+                AND library.project_name LIKE concat(concat('%',#{qu.projectName}),'%')
             </if>
             <if test="qu.projectClassification != null">
-                AND project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
+                AND library.project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
             </if>
             <if test="qu.projectPlatfor != null">
-                AND project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
+                AND library.project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
             </if>
             <if test="qu.projectGroup != null">
-                AND project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
+                AND library.project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
             </if>
             <if test="qu.projectStatus != null">
-                AND project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
+                AND library.project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
             </if>
             <if test="qu.currentNode != null">
-                AND current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
+                AND library.current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
             </if>
             <if test="qu.projectLevel != null">
-                AND project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
+                AND library.project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
             </if>
             <if test="qu.projectManager != null">
-                AND project_manager LIKE concat(concat('%',#{qu.projectManager}),'%')
+                AND team.name LIKE concat(concat('%',#{qu.projectManager}),'%')
             </if>
             <if test="qu.productLine != null">
-                AND product_line LIKE concat(concat('%',#{qu.productLine}),'%')
+                AND library.product_line LIKE concat(concat('%',#{qu.productLine}),'%')
             </if>
             <if test="qu.projectStartDate != null">
-                AND project_start_date &gt;= #{qu.projectStartDate}
+                AND library.project_start_date &gt;= #{qu.projectStartDate}
             </if>
             <if test="qu.projectEndDate != null">
-                AND project_end_date &lt;= #{qu.projectEndDate}
+                AND library.project_end_date &lt;= #{qu.projectEndDate}
             </if>
         </if>
 
@@ -99,57 +101,59 @@
 
     <select id="selectPages" resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
         SELECT
-        sar_stand_project_library.*,
-        tu.UNAME as uName
+        library.*,
+        team.`name` as uName
         FROM
-        sar_stand_project_library
-        LEFT JOIN ts_user tu ON project_manager = tu.USID
+        sar_stand_project_library as library
+        LEFT JOIN sar_stand_project_team as team
+        ON team.project_code = library.project_number
         WHERE
         <if test="flag == 1">
-            id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
         <if test="flag == 2">
-            id IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
         <if test="flag == 4">
             1=1
         </if>
         <if test="qu != null">
+
             <if test="qu.projectNumber != null">
-                AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
+                AND library.project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
             </if>
             <if test="qu.projectName != null">
-                AND project_name LIKE concat(concat('%',#{qu.projectName}),'%')
+                AND library.project_name LIKE concat(concat('%',#{qu.projectName}),'%')
             </if>
             <if test="qu.projectClassification != null">
-                AND project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
+                AND library.project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
             </if>
             <if test="qu.projectPlatfor != null">
-                AND project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
+                AND library.project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
             </if>
             <if test="qu.projectGroup != null">
-                AND project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
+                AND library.project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
             </if>
             <if test="qu.projectStatus != null">
-                AND project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
+                AND library.project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
             </if>
             <if test="qu.currentNode != null">
-                AND current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
+                AND library.current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
             </if>
             <if test="qu.projectLevel != null">
-                AND project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
+                AND library.project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
             </if>
             <if test="qu.projectManager != null">
-                AND project_manager LIKE concat(concat('%',#{qu.projectManager}),'%')
+                AND team.name LIKE concat(concat('%',#{qu.projectManager}),'%')
             </if>
             <if test="qu.productLine != null">
-                AND product_line LIKE concat(concat('%',#{qu.productLine}),'%')
+                AND library.product_line LIKE concat(concat('%',#{qu.productLine}),'%')
             </if>
             <if test="qu.projectStartDate != null">
-                AND project_start_date &gt;= #{qu.projectStartDate}
+                AND library.project_start_date &gt;= #{qu.projectStartDate}
             </if>
             <if test="qu.projectEndDate != null">
-                AND project_end_date &lt;= #{qu.projectEndDate}
+                AND library.project_end_date &lt;= #{qu.projectEndDate}
             </if>
         </if>
 
@@ -158,54 +162,61 @@
     <select id="selectPagesWorkFlow"
             resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
         SELECT
-        sar_stand_project_library.*,
-        tu.UNAME as uName
+        library.*, team.`name` AS uName
         FROM
-        sar_stand_project_library
-        LEFT JOIN ts_user tu ON project_manager = tu.USID
+        sar_stand_project_library as library
+        LEFT JOIN sar_stand_project_team as team ON team.project_code = library.project_number
         WHERE
         (
-        id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id NOT in ( SELECT DISTINCT
-        STAND_ID FROM
+        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
         )
         )
         <if test="qu != null">
             <if test="qu.projectNumber != null">
-                AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
+                AND library.project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
             </if>
             <if test="qu.projectName != null">
-                AND project_name LIKE concat(concat('%',#{qu.projectName}),'%')
+                AND library.project_name LIKE concat(concat('%',#{qu.projectName}),'%')
             </if>
             <if test="qu.projectClassification != null">
-                AND project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
+                AND library.project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
             </if>
             <if test="qu.projectPlatfor != null">
-                AND project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
+                AND library.project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
             </if>
             <if test="qu.projectGroup != null">
-                AND project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
+                AND library.project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
             </if>
             <if test="qu.projectStatus != null">
-                AND project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
+                AND library.project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
             </if>
             <if test="qu.currentNode != null">
-                AND current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
+                AND library.current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
             </if>
             <if test="qu.projectLevel != null">
-                AND project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
+                AND library.project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
             </if>
             <if test="qu.projectManager != null">
-                AND project_manager LIKE concat(concat('%',#{qu.projectManager}),'%')
+                AND team.name LIKE concat(concat('%',#{qu.projectManager}),'%')
             </if>
             <if test="qu.productLine != null">
-                AND product_line LIKE concat(concat('%',#{qu.productLine}),'%')
+                AND library.product_line LIKE concat(concat('%',#{qu.productLine}),'%')
             </if>
             <if test="qu.projectStartDate != null">
-                AND project_start_date &gt;= #{qu.projectStartDate}
+                AND library.project_start_date &gt;= #{qu.projectStartDate}
             </if>
             <if test="qu.projectEndDate != null">
-                AND project_end_date &lt;= #{qu.projectEndDate}
+                AND library.project_end_date &lt;= #{qu.projectEndDate}
             </if>
         </if>
         )
@@ -214,53 +225,64 @@
     </select>
     <select id="selectCountWorkFlow" resultType="java.lang.Integer">
         SELECT
-        count(sar_stand_project_library.id ) as total
+        count(
+        library.id
+        ) AS total
         FROM
-        sar_stand_project_library
-        LEFT JOIN ts_user tu ON project_manager = tu.USID
+        sar_stand_project_library AS library
+        LEFT JOIN sar_stand_project_team AS team ON team.project_code = library.project_number
         WHERE
         (
-        id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id NOT in ( SELECT DISTINCT
-        STAND_ID FROM
+        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
-        ))
+        )
+        )
 
         <if test="qu != null">
             <if test="qu.projectNumber != null">
-                AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
+                AND library.project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
             </if>
             <if test="qu.projectName != null">
-                AND project_name LIKE concat(concat('%',#{qu.projectName}),'%')
+                AND library.project_name LIKE concat(concat('%',#{qu.projectName}),'%')
             </if>
             <if test="qu.projectClassification != null">
-                AND project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
+                AND library.project_classification LIKE concat(concat('%',#{qu.projectClassification}),'%')
             </if>
             <if test="qu.projectPlatfor != null">
-                AND project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
+                AND library.project_platfor LIKE concat(concat('%',#{qu.projectPlatfor}),'%')
             </if>
             <if test="qu.projectGroup != null">
-                AND project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
+                AND library.project_group LIKE concat(concat('%',#{qu.projectGroup}),'%')
             </if>
             <if test="qu.projectStatus != null">
-                AND project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
+                AND library.project_status LIKE concat(concat('%',#{qu.projectStatus}),'%')
             </if>
             <if test="qu.currentNode != null">
-                AND current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
+                AND library.current_node LIKE concat(concat('%',#{qu.currentNode}),'%')
             </if>
             <if test="qu.projectLevel != null">
-                AND project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
+                AND library.project_level LIKE concat(concat('%',#{qu.projectLevel}),'%')
             </if>
             <if test="qu.projectManager != null">
-                AND project_manager LIKE concat(concat('%',#{qu.projectManager}),'%')
+                AND team.name LIKE concat(concat('%',#{qu.projectManager}),'%')
             </if>
             <if test="qu.productLine != null">
-                AND product_line LIKE concat(concat('%',#{qu.productLine}),'%')
+                AND library.product_line LIKE concat(concat('%',#{qu.productLine}),'%')
             </if>
             <if test="qu.projectStartDate != null">
-                AND project_start_date &gt;= #{qu.projectStartDate}
+                AND library.project_start_date &gt;= #{qu.projectStartDate}
             </if>
             <if test="qu.projectEndDate != null">
-                AND project_end_date &lt;= #{qu.projectEndDate}
+                AND library.project_end_date &lt;= #{qu.projectEndDate}
             </if>
         </if>
         )