车型项目库数据传递bug修改~~

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);
     }
     /**

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();
 }

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);

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;

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>