From 6e9cf7adf40c6c29a3e63568b8e59ee7e7ef054b Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Tue, 24 Aug 2021 11:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE=E5=BA=93?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=A0=E9=80=92bug=E4=BF=AE=E6=94=B9~~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandProjectLibraryController.java         |  4 ++--
 .../dao/SarStandProjectLibraryDao.java            |  1 +
 .../service/SarStandProjectLibraryService.java    |  2 +-
 .../impl/SarStandProjectLibraryServiceImpl.java   | 15 +++++++++++++--
 .../SarStandProjectLibraryMapper.xml              |  6 +++++-
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
index 968efad0..61e87707 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
@@ -114,14 +114,14 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
     @GetMapping("/queryStandInfo")
     @ApiOperation("查询标准信息")
     public ResponseMessage queryStandInfo(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize,
-                                          String id){
+                                          String id,String cars){
 //        List<SarStandProjectLibrary> list = sarStandProjectLibraryService.queryStandId(id);
 //        List<String> list1 = new ArrayList();
 //        for(SarStandProjectLibrary s:list){
 //            list1.add(s.getStandId());
 //        }
 //        System.out.println(list1);
-        IPage<StandAttrInfoDto> list = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id);
+        IPage<StandAttrInfoDto> list = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id,cars);
         return Result.success("200",list);
     }
     /**
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
index dbf3a185..c079727f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
@@ -25,4 +25,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         List<SarStandProjectLibrary> selectPagesWorkFlow(@Param("page")Integer page, @Param("size")Integer size,@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag);
         Integer selectCountWorkFlow(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag);
         List<String> getAllStands();
+        List<String> getAllStand();
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java
index 56140cad..6ac5a723 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java
@@ -14,7 +14,7 @@ public interface SarStandProjectLibraryService {
     IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize);
     List<SarStandProjectLibrary> queryByProductLine(String productLine);
     List<SarStandProjectLibrary> queryStandId(String standId);
-    IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId);
+    IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId, String cars);
     void deleteByIds(List<StandProjectRelationDto> ids);
     void batchInsert(@Param("ids") List<StandProjectRelationDto> list);
     List<StandAttrInfoDto> exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId);
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 17c88668..a7cb5326 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
@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import redis.clients.jedis.ScanResult;
+
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -159,8 +161,17 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         return list;
     }
     @Override
-    public IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId) {
-        List<String> ids=sarStandProjectLibraryDao.getAllStands();
+    public IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId, String cars) {
+
+        System.out.println(cars);
+        List<String> ids =new ArrayList<>();
+        if ("1".equals(cars)){
+            ids=sarStandProjectLibraryDao.getAllStand();
+        }
+        else {
+            ids=sarStandProjectLibraryDao.getAllStands();
+        }
+
         String id="";
         for (String s:ids) {
             id="'"+s+"',"+id;
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 f67877f2..36f8b9de 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
@@ -249,6 +249,10 @@
         )
     </select>
     <select id="getAllStands" resultType="java.lang.String">
-        SELECT DISTINCT ID FROM sar_standards_info
+        SELECT DISTINCT STAND_ID FROM sar_stand_items
+    </select>
+
+    <select id="getAllStand" resultType="java.lang.String">
+        SELECT DISTINCT ID FROM sar_standards_info where VALID_FLAG=0
     </select>
 </mapper>