From ff3547f05e20b671c4a760bc19095934804a28a1 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Mon, 19 Jul 2021 14:13:41 +0800 Subject: [PATCH] =?UTF-8?q?update:=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarLawsAttrDetailedListDao.java | 2 ++ .../controller/SarStandItemsController.java | 5 +++-- .../sarStandItems/entity/FindStandDto.java | 17 ++++++++++++++ .../service/ISarStandItemsService.java | 3 ++- .../impl/SarStandItemsServiceImpl.java | 16 ++++++++------ .../SarStandItems/SarStandItemsMapper.xml | 1 + .../SarLawsAttrDetailedListMapper.xml | 22 +++++++++++++++++-- 7 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 7fb3570b..b4f72493 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -23,6 +23,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 List selectLawsById(@Param("param1") List LawsIds, @Param("standName") String standName); + //根据标准id查出数据 + List selectLawsByIdC(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType); //查询适用车型 List selectTypeApplicable(@Param("param1") String LawsId); List selectLawsId2(String standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index b3ce9159..993de484 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; +import com.adc.da.slrs.sarStandItems.entity.FindStandDto; import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; @@ -62,8 +63,8 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "标准查询") @PostMapping("/findStand") - public IPage findStand(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int size){ - IPage sarItems = ServiceImpl.selectLawDto(page,size); + public IPage findStand(FindStandDto findStandDto){ + IPage sarItems = ServiceImpl.selectLawDto(findStandDto); return sarItems; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java new file mode 100644 index 00000000..dfbbe661 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java @@ -0,0 +1,17 @@ +package com.adc.da.slrs.sarStandItems.entity; + +import lombok.Data; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-19 + */ +@Data +public class FindStandDto { + private int page; + private int size; + private String standName; + private String standType; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java index ae927b3b..6c18080a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandItems.service; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; +import com.adc.da.slrs.sarStandItems.entity.FindStandDto; import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; @@ -22,5 +23,5 @@ public interface ISarStandItemsService extends IService { List queryItemsByList(SarStandItemsEOPage page, String resType); List findItemsTime(String type,String ids); - IPage selectLawDto(int page, int size); + IPage selectLawDto(FindStandDto findStandDto); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index ccae3bca..14e15752 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -3,11 +3,8 @@ package com.adc.da.slrs.sarStandItems.service.impl; import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; -import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; -import com.adc.da.slrs.sarStandItems.entity.SarStandItems; +import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; -import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; -import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; @@ -146,9 +143,14 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectLawDto(int page, int size) { - List standId = dao.selectStandId(page-1,size); - List list = sarLawsAttrDetailedListDao.selectLawsById(standId,null); + public IPage selectLawDto(FindStandDto findStandDto) { + List standId = dao.selectStandId((findStandDto.getPage())-1, findStandDto.getSize()); + List list=new ArrayList<>(); + if (standId==null || standId.size()==0){ + list = null; + }else { + list = sarLawsAttrDetailedListDao.selectLawsByIdC(standId,findStandDto.getStandName(), findStandDto.getStandType()); + } for (LawsDto lawsDto:list){ if (sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()).size()!=0){ lawsDto.setTypeApplicable(StringUtils.join(sarLawsAttrDetailedListDao.selectTypeApplicable(lawsDto.getId()), ",")); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index c4f8461e..f42fb7ba 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -671,6 +671,7 @@ LEFT JOIN sar_standards_info b on a.STAND_ID=b.ID WHERE b.VALID_FLAG = 0 + and a.FILE_TYPE ='FBGBJBD' GROUP BY a.STAND_ID limit #{page},#{size} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 63373f6f..f0371de6 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -15,8 +15,7 @@ a.ID IN #{item} - - + @@ -47,6 +46,25 @@ FROM sar_stand_items WHERE ID =#{param1,jdbcType=VARCHAR} +