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

标准维度选数据出现全空数据的问题

Browse Source
This commit is contained in:
yuezhihang
2021-12-21 11:05:26 +08:00
parent caed5e20a3
commit 3880e0c68f
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+1 -17
View File
@@ -154,25 +154,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
page.setPage(findStandDto.getPage()); page.setPage(findStandDto.getPage());
page.setPageSize(findStandDto.getSize()); page.setPageSize(findStandDto.getSize());
page.setUserId(null); page.setUserId(null);
List<SarStandardsInfo> pageInfo = null;
// try {
// pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page);
// } catch (Exception e) {
// e.printStackTrace();
// }
List<String> standId = new ArrayList<>(); List<String> standId = new ArrayList<>();
// for (SarStandardsInfo standardsInfo : pageInfo){ List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType());
//// if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){
// standId.add(standardsInfo.getId());
//// }
// }
List<LawsDto> list=new ArrayList<>();
// if (standId==null || standId.size()==0){
// list = null;
// }else {
list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType());
// }
IPage<LawsDto> page1=new Page<>(); IPage<LawsDto> page1=new Page<>();
page1.setRecords(list); page1.setRecords(list);
page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size()); page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size());
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+4 -4
View File
@@ -189,7 +189,7 @@
left join sar_standards_info a on ssi.stand_id = a.id left join sar_standards_info a on ssi.stand_id = a.id
LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID
<where> <where>
1=1 1=1 and a.ID is not null
<if test="standName != null"> <if test="standName != null">
and and
(a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
@@ -217,7 +217,7 @@
left join sar_standards_info a on ssi.stand_id = a.id left join sar_standards_info a on ssi.stand_id = a.id
LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID
<where> <where>
1=1 1=1 and a.ID is not null
<if test="standName != null"> <if test="standName != null">
and and
(a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
@@ -251,7 +251,7 @@
left join sar_standards_info a on ssi.stand_id = a.id left join sar_standards_info a on ssi.stand_id = a.id
LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID
<where> <where>
1=1 1=1 and a.ID is not null
<if test="standName != null"> <if test="standName != null">
and and
(a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
@@ -280,7 +280,7 @@
left join sar_standards_info a on ssi.stand_id = a.id left join sar_standards_info a on ssi.stand_id = a.id
LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID
<where> <where>
1=1 1=1 and a.ID is not null
<if test="standName != null"> <if test="standName != null">
and and
(a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')