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:
yanyizhou
2021-08-19 10:04:09 +08:00
parent 801eea7e50
commit 4e588e6579
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
+1 -1
View File
@@ -22,7 +22,7 @@ import java.util.List;
public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetailedList> { public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetailedList> {
//根据清单id，查出标准的id并排序 //根据清单id，查出标准的id并排序
List<String> selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); List<String> selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size,@Param("sar") SarFindDto sarFindDto);
//根据标准id查出数据 //根据标准id查出数据
List<LawsDto> selectLawsById(@Param("param1") List<String> LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); List<LawsDto> selectLawsById(@Param("param1") List<String> LawsIds, @Param("sarFindDto") SarFindDto sarFindDto);
//根据标准id查出数据用于清单查询 //根据标准id查出数据用于清单查询
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
wrapper.eq("detailed_list_id", sarFindDto.getId()); wrapper.eq("detailed_list_id", sarFindDto.getId());
IPage<SarLawsAttrDetailedList> selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); IPage<SarLawsAttrDetailedList> selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper);
//查询标准id //查询标准id
List<String> lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize()); List<String> lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto);
if (CollectionUtils.isEmpty(lawsIds)){ if (CollectionUtils.isEmpty(lawsIds)){
return null; return null;
} }
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+12 -12
View File
@@ -70,18 +70,18 @@
<if test="standId != null"> <if test="standId != null">
and detailed_list_id = #{standId} and detailed_list_id = #{standId}
</if> </if>
<!-- <if test="sar.standSort != null">--> <if test="sar.standSort != null">
<!-- and si.STAND_SORT = #{sar.standSort}--> and si.STAND_SORT = #{sar.standSort}
<!-- </if>--> </if>
<!-- <if test="sar.standType != null">--> <if test="sar.standType != null">
<!-- and si.STAND_TYPE = #{sar.standType}--> and si.STAND_TYPE = #{sar.standType}
<!-- </if>--> </if>
<!-- <if test="sar.standNumber != null">--> <if test="sar.standNumber != null">
<!-- and concat(concat(concat(concat(si.STAND_SORT,' '),si.STAND_NUMBER),'-'),si.STAND_YEAR) like concat(concat('%', #{sar.standNumber}),'%')--> and concat(concat(concat(concat(si.STAND_SORT,' '),si.STAND_NUMBER),'-'),si.STAND_YEAR) like concat(concat('%', #{sar.standNumber}),'%')
<!-- </if>--> </if>
<!-- <if test="sar.standName != null">--> <if test="sar.standName != null">
<!-- and si.STAND_NAME like concat(concat('%', #{sar.standName}),'%')--> and si.STAND_NAME like concat(concat('%', #{sar.standName}),'%')
<!-- </if>--> </if>
</where> </where>
order by number order by number