FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_1' into 'develop_master'

Browse Source 
update：修改sql语句

See merge request !65
This commit is contained in:
王夏晖
2021-07-28 06:18:22 +00:00
parent e237170f61 6dc14af762
commit a991f1550c
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java
+2 -2
View File
@@ -135,9 +135,9 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
if (CollectionUtils.isEmpty(standExcelVo.getIds())){
List<String> list= sarLawsAttrDetailedListDao.selectLawsId2(standExcelVo.getId());
if (CollectionUtils.isEmpty(list)) return;
data=sarLawsAttrDetailedListDao.selectLawsById(list,null);
data=sarLawsAttrDetailedListDao.selectLawsByIdE(list);
}else {
data=sarLawsAttrDetailedListDao.selectLawsById(standExcelVo.getIds(),null);
data=sarLawsAttrDetailedListDao.selectLawsByIdE(standExcelVo.getIds());
}
//适用车型
Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
+2
View File
@@ -25,6 +25,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetail
List<String> selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size);
//根据标准id查出数据
List<LawsDto> selectLawsById(@Param("param1") List<String> LawsIds, @Param("sarFindDto") SarFindDto sarFindDto);
//用于导出
List<LawsDto> selectLawsByIdE(@Param("param1") List<String> LawsIds);
//根据标准id查出数据
List<LawsDto> selectLawsByIdC(@Param("param1") List<String> LawsIds, @Param("standName") String standName,@Param("standType")String standType);
//查询时间