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 list = sarStandProjectLibraryService.queryStandId(id); // List list1 = new ArrayList(); // for(SarStandProjectLibrary s:list){ // list1.add(s.getStandId()); // } // System.out.println(list1); - IPage list = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id); + IPage 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 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 getAllStands(); + List 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 queryProjectManager(int current, int pageSize); List queryByProductLine(String productLine); List queryStandId(String standId); - IPage queryStandInfo(int current, int pageSize, String standId); + IPage queryStandInfo(int current, int pageSize, String standId, String cars); void deleteByIds(List ids); void batchInsert(@Param("ids") List list); List 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 queryStandInfo(int current, int pageSize, String standId) { - List ids=sarStandProjectLibraryDao.getAllStands(); + public IPage queryStandInfo(int current, int pageSize, String standId, String cars) { + + System.out.println(cars); + List 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 @@ ) + +