Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!209

adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java

@@ -713,12 +713,14 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
      */
     public HashMap<String, String> analysisStandId(ImportDto importDto) {
         HashMap<String, String> result = new HashMap<>();
-        if (importDto.getStandId() == null) {
+        String standId = importDto.getStandId();
+
+        if (standId == null) {
             importDto.setErrorStr("标准号为空");
             error.add(importDto);
             return null;
         } else {
-            String standId = importDto.getStandId();
+//            String standId = importDto.getStandId();
             //格式 非空格字符+空格+非空格字符+‘-’或‘—’或空格+年份  如Q/FT F003—2001
             Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$");
             if (!pattern.matcher(standId).matches()) {
@@ -730,7 +732,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
             String sort = "";
             String number = "";
             String year = "";
-            String[] split = importDto.getStandId().split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割
+            String[] split = standId.split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割
 
 
 //      多种格式(╯‵□′)╯︵┻━┻      Q-FL T015-2021  Q/ FL T015-2021 Q/FL T015-2021

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 {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java

@@ -3,13 +3,10 @@ package com.adc.da.slrs.sarModelTree.controller;
 
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
-import com.adc.da.slrs.sarModelTree.entity.ResponseResult;
 import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService;
 import com.adc.da.slrs.sarModelTree.service.ISarModuleTreeService;
-import com.adc.da.slrs.sarModelTree.service.impl.SarModuleTreeServiceImpl;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Company;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.ResponseDto;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java

@@ -1,7 +1,7 @@
 package com.adc.da.slrs.sarModelTree.service;
 
 import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 
 import java.util.List;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java

@@ -4,7 +4,7 @@ import com.adc.da.slrs.sarModelTree.dao.SarModuleTreeDao;
 import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
 import com.adc.da.slrs.sarModelTree.entity.SarModuleTree;
 import com.adc.da.slrs.sarModelTree.service.ISarModuleTreeService;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -2,17 +2,13 @@ package com.adc.da.slrs.sarStandProjectLibrary.controller;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto;
 import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl;
-import com.adc.da.sys.util.UUIDUtils;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -21,8 +17,6 @@ import com.adc.da.base.web.BaseController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 /**
  * <p>
@@ -50,7 +44,7 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
      **/
     @GetMapping("/queryProject")
     @ApiOperation("车型/项目库")
-    public ResponseMessage queryMaintenanceProject(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,
+    public ResponseMessage queryMaintenanceProject(@RequestParam(defaultValue = "1", required=false,value = "page")int Page, @RequestParam(defaultValue = "10", required=false,value = "pageSize") int PageSize,
                                                    SarStandProjectLibraryDto sarDto) {
         IPage<SarStandProjectLibrary> MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProject(Page,PageSize,sarDto);
         IPage<SarStandProjectLibrary> notMaintenanceList = sarStandProjectLibraryService.queryNotMaintenanceProject(Page,PageSize,sarDto);
@@ -231,13 +225,9 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
     public ResponseDto save(@RequestBody String jsonStr){
         log.info(jsonStr);
         Head head = sarStandProjectLibraryService.AnalysisJsonAndStorage(jsonStr);
-        ArrayList<Company> companies = new ArrayList<>();
+
-        ResponseDto responseDto = new ResponseDto(head,companies);
+        ResponseDto responseDto = new ResponseDto(head);
-        //todo 未确定返回内容
+
-        Company company = new Company();
-        company.setCOMPANY_CODE("");
-        company.setFISCAL_YEAR("");
-        companies.add(company);
         return responseDto;
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/Company.java

@@ -1,10 +0,0 @@
-package com.adc.da.slrs.sarStandProjectLibrary.entity;
-
-import lombok.Data;
-
-@Data
-public class Company {
-    private String COMPANY_CODE;
-
-    private String FISCAL_YEAR;
-}

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;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/myResponse/Head.java

@@ -1,6 +1,7 @@
-package com.adc.da.slrs.sarStandProjectLibrary.entity;
+package com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -24,4 +25,30 @@ public class Head extends BaseEntity {
     }
 
     public Head(){};
+
+
+    @JsonProperty("BIZTRANSACTIONID")
+    public String getBIZTRANSACTIONID() {
+        return BIZTRANSACTIONID;
+    }
+    @JsonProperty("RESULT")
+    public String getRESULT() {
+        return RESULT;
+    }
+    @JsonProperty("ERRORCODE")
+    public String getERRORCODE() {
+        return ERRORCODE;
+    }
+    @JsonProperty("ERRORINFO")
+    public String getERRORINFO() {
+        return ERRORINFO;
+    }
+    @JsonProperty("COMMENTS")
+    public String getCOMMENTS() {
+        return COMMENTS;
+    }
+    @JsonProperty("SUCCESSCOUNT")
+    public String getSUCCESSCOUNT() {
+        return SUCCESSCOUNT;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/myResponse/MyResult.java

@@ -0,0 +1,24 @@
+package com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class MyResult {
+//    private String COMPANY_CODE;
+//
+//    private String FISCAL_YEAR;
+
+    private String msg;
+
+    private String code;
+
+    private boolean success;
+
+
+    public MyResult(){
+        this.msg="";
+        this.code="";
+        this.success=true;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/myResponse/ResponseDto.java

@@ -1,9 +1,10 @@
-package com.adc.da.slrs.sarStandProjectLibrary.entity;
+package com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 @Data
 public class ResponseDto {
@@ -26,12 +27,19 @@ public class ResponseDto {
     }
 
     public ResponseDto(Head HEAD) {
-        ArrayList<Company> companies = new ArrayList<>();
+
-        Company company = new Company();
+
-        company.setCOMPANY_CODE("");
+        this.LIST=Arrays.asList(new MyResult());
-        company.setFISCAL_YEAR("");
-        companies.add(company);
-        this.LIST=companies;
         this.HEAD=HEAD;
     }
+
+    @JsonProperty("HEAD")
+    public Head getHEAD() {
+        return HEAD;
+    }
+
+    @JsonProperty("LIST")
+    public List<?> getLIST() {
+        return LIST;
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandProjectLibrary.service;
 
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -4,6 +4,7 @@ import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
 import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
 import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.slrs.sarStandProjectLibrary.service.SarStandProjectLibraryService;
 import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
@@ -75,25 +76,23 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             //把刚刚拿到的值存到实体类里
             SarStandProjectLibrary projectInfo = new SarStandProjectLibrary();
             projectInfo
-                    .setProjectPlatfor(projectObject.get("projectPlatfor").getAsString())
+                    .setProjectPlatfor(projectObject.get("eng_platform").getAsString())
-                    .setProjectNumber(projectObject.get("projectNumber").getAsString())
+                    .setProjectNumber(projectObject.get("code").getAsString())
-                    .setProjectName(projectObject.get("projectName").getAsString())
+                    .setProjectName(projectObject.get("name").getAsString())
-                    .setProjectClassification(projectObject.get("projectClassification").getAsString())
+                    .setProjectClassification(projectObject.get("catalog_name").getAsString())
-                    .setProjectStatus(projectObject.get("projectStatus").getAsString())
+                    .setProjectStatus(projectObject.get("project_status").getAsString())
-                    .setProjectGroup(projectObject.get("projectGroup").getAsString())
+                    .setProjectGroup(projectObject.get("project_group_name").getAsString())
-                    .setCurrentNode(projectObject.get("currentNode").getAsString())
+                    .setCurrentNode(projectObject.get("project_current_milestone").getAsString())
-                    .setProjectLevel(projectObject.get("projectLevel").getAsString())
+                    .setProjectLevel(projectObject.get("project_level").getAsString())
-                    .setProductLine(projectObject.get("productLine").getAsString());
+                    .setProductLine(projectObject.get("eng_product_line").getAsString());
-
-            projectObject.get("projectEndDate").getAsString();
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
 
-            Date targetBeginOn = null;
-            try {
-                targetBeginOn = simpleDateFormat.parse(projectObject.get("projectStartDate").getAsString());
 
-                Date targetEndOn = simpleDateFormat.parse(projectObject.get("projectEndDate").getAsString());
+            try {
+                Date targetBeginOn = simpleDateFormat.parse(projectObject.get("target_begin_on").getAsString());
+
+                Date targetEndOn = simpleDateFormat.parse(projectObject.get("target_end_on").getAsString());
                 projectInfo
                         .setProjectStartDate(targetBeginOn)
                         .setProjectEndDate(targetEndOn);
@@ -436,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);
@@ -445,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);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java

@@ -2,9 +2,8 @@ package com.adc.da.slrs.sarStandProjectTeam.controller;
 
 
 import com.adc.da.base.web.BaseController;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Company;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.ResponseDto;
 import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam;
 import com.adc.da.slrs.sarStandProjectTeam.service.ISarStandProjectTeamService;
 import io.swagger.annotations.Api;
@@ -16,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-
 
 /**
 * <p>
@@ -41,13 +38,8 @@ public class SarStandProjectTeamController extends BaseController<SarStandProjec
     public ResponseDto save(@RequestBody String jsonStr){
         log.info(jsonStr);
         Head head = sarStandProjectTeamService.AnalysisJsonAndStorage(jsonStr);
-        ArrayList<Company> companies = new ArrayList<>();
         //todo 未确定返回内容
-        Company company = new Company();
+        ResponseDto responseDto = new ResponseDto(head);
-        company.setCOMPANY_CODE("");
-        company.setFISCAL_YEAR("");
-        companies.add(company);
-        ResponseDto responseDto = new ResponseDto(head,companies);
         return responseDto;
 
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/ISarStandProjectTeamService.java

@@ -1,6 +1,6 @@
 package com.adc.da.slrs.sarStandProjectTeam.service;
 
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam;
 import com.baomidou.mybatisplus.extension.service.IService;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/impl/SarStandProjectTeamServiceImpl.java

@@ -1,15 +1,13 @@
 package com.adc.da.slrs.sarStandProjectTeam.service.impl;
 
-import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
+import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam;
 import com.adc.da.slrs.sarStandProjectTeam.dao.SarStandProjectTeamDao;
 import com.adc.da.slrs.sarStandProjectTeam.service.ISarStandProjectTeamService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.springframework.stereotype.Service;

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
+        sar_stand_project_library as library
-        LEFT JOIN ts_user tu ON project_manager = tu.USID
+        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.*,
+        library.*,
-        tu.UNAME as uName
+        team.`name` as uName
         FROM
-        sar_stand_project_library
+        sar_stand_project_library as library
-        LEFT JOIN ts_user tu ON project_manager = tu.USID
+        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.*,
+        library.*, team.`name` AS uName
-        tu.UNAME as uName
         FROM
-        sar_stand_project_library
+        sar_stand_project_library as library
-        LEFT JOIN ts_user tu ON project_manager = tu.USID
+        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
+        library.id IN (
-        STAND_ID FROM
+        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
+        sar_stand_project_library AS library
-        LEFT JOIN ts_user tu ON project_manager = tu.USID
+        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
+        library.id IN (
-        STAND_ID FROM
+        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>
         )