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

3-29 bug 修复

Browse Source
This commit is contained in:
yuezhihang
2022-03-30 09:02:19 +08:00
parent 1769fd4218
commit 61d6bff12b
2 changed files with 19 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/service/impl/SarLawsAttrDetailedListServiceImpl.java
+6 -1
View File
@@ -50,7 +50,12 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
//查询标准id
List<String> lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto);
if (CollectionUtils.isEmpty(lawsIds)){
return null;
IPage<LawsDto> list1 = new Page<>();
list1.setCurrent(selectPage.getCurrent());
list1.setTotal(selectPage.getTotal());
list1.setSize(selectPage.getSize());
list1.setPages(selectPage.getPages());
return list1;
}
List<LawsDto> list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto);
for (LawsDto lawsDto:list){
adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml
+13 -13
View File
@@ -20,7 +20,7 @@
</sql>
<select id="findPage" resultMap="IssueTrackPage" parameterType="com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo">
(
SELECT
CONCAT(
sarInfo.STAND_SORT,
@@ -39,7 +39,7 @@
del_flag=0
<if test="pageVo.lawCode != null and pageVo.lawCode != ''">
trim(replace(CONCAT(
and trim(replace(CONCAT(
sarInfo.STAND_SORT,
' ',
sarInfo.STAND_NUMBER,
@@ -51,17 +51,17 @@
<if test="pageVo.lawName != null and pageVo.lawName != ''">
sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
and sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
</if>
<if test="pageVo.productType != null and pageVo.productType != ''">
issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
and issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
</if>
</where>
) UNION ALL (
UNION ALL
SELECT
sarInfo.LAWS_NUMBER AS law_code,
sarInfo.LAWS_NAME AS law_name,
@@ -73,20 +73,20 @@
del_flag=0
<if test="pageVo.lawCode != null and pageVo.lawCode != ''">
sarInfo.LAWS_NUMBER LIKE CONCAT('%',#{pageVo.lawCode},'%')
and sarInfo.LAWS_NUMBER LIKE CONCAT('%',#{pageVo.lawCode},'%')
</if>
<if test="pageVo.lawName != null and pageVo.lawName != ''">
sarInfo.LAWS_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
and sarInfo.LAWS_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
</if>
<if test="pageVo.productType != null and pageVo.productType != ''">
issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
and issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
</if>
</where>
) UNION ALL (
UNION ALL
SELECT
sarInfo.STAND_CODE AS law_code,
sarInfo.STAND_NAME AS law_name,
@@ -100,21 +100,21 @@
del_flag=0
<if test="pageVo.lawCode != null and pageVo.lawCode != ''">
sarInfo.STAND_CODE LIKE CONCAT('%',#{pageVo.lawCode},'%')
and sarInfo.STAND_CODE LIKE CONCAT('%',#{pageVo.lawCode},'%')
</if>
<if test="pageVo.lawName != null and pageVo.lawName != ''">
sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
and sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
</if>
<if test="pageVo.productType != null and pageVo.productType != ''">
issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
and issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
</if>
</where>
)
</select>
</mapper>