Skip to content

A
amos-boot-biz
Commit 046bf4c7 authored by tianyiming's avatar tianyiming
Browse files
Options

大屏检验检测、监管列表添加业务状态筛选

parent ffc7fd68
Show whitespace changes
Inline Side-by-side
Showing with 168 additions and 0 deletions
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamDto.java
View file @ 046bf4c7
...@@ -80,4 +80,9 @@ public class DPFilterParamDto { ...@@ -80,4 +80,9 @@ public class DPFilterParamDto {
* 设备类别code * 设备类别code
*/ */
private String equCategoryCode; private String equCategoryCode;
/**
* 业务状态
*/
private String status;
} }
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamForDetailDto.java
View file @ 046bf4c7
...@@ -103,4 +103,9 @@ public class DPFilterParamForDetailDto { ...@@ -103,4 +103,9 @@ public class DPFilterParamForDetailDto {
*/ */
private String address; private String address;
/**
* 业务状态
*/
private String status;
} }
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/JGStatisticsMapper.xml
View file @ 046bf4c7
...@@ -960,6 +960,12 @@ ...@@ -960,6 +960,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and equ_category_code = #{dto.equCategoryCode} and equ_category_code = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and notice_status != 6616
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and notice_status = 6616
</if>
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
union all union all
...@@ -1002,6 +1008,12 @@ ...@@ -1002,6 +1008,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and equ_category = #{dto.equCategoryCode} and equ_category = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and notice_status != 6616
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and notice_status = 6616
</if>
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
union all union all
...@@ -1044,6 +1056,12 @@ ...@@ -1044,6 +1056,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and equ_category_code = #{dto.equCategoryCode} and equ_category_code = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and notice_status != 6616
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and notice_status = 6616
</if>
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
union all union all
...@@ -1088,6 +1106,12 @@ ...@@ -1088,6 +1106,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and notice_status != 6616
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and notice_status = 6616
</if>
GROUP BY tn.sequence_nbr GROUP BY tn.sequence_nbr
</if> </if>
order by createDate desc order by createDate desc
...@@ -1133,6 +1157,12 @@ ...@@ -1133,6 +1157,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjur.status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjur.status = '已完成'
</if>
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
union all union all
...@@ -1177,6 +1207,12 @@ ...@@ -1177,6 +1207,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjvi.status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjvi.status = '已完成'
</if>
GROUP BY tjvi.sequence_nbr GROUP BY tjvi.sequence_nbr
</if> </if>
order by createDate desc order by createDate desc
...@@ -1222,6 +1258,12 @@ ...@@ -1222,6 +1258,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjcrr.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjcrr.audit_status = '已完成'
</if>
GROUP BY tjcrr.sequence_nbr GROUP BY tjcrr.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -1267,6 +1309,12 @@ ...@@ -1267,6 +1309,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjcrt.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjcrt.audit_status = '已完成'
</if>
GROUP BY tjcrt.sequence_nbr GROUP BY tjcrt.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -1312,6 +1360,12 @@ ...@@ -1312,6 +1360,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjcru.status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjcru.status = '已完成'
</if>
GROUP BY tjcru.sequence_nbr GROUP BY tjcru.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -1357,6 +1411,12 @@ ...@@ -1357,6 +1411,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and 1 = 2 and 1 = 2
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjcrn.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjcrn.audit_status = '已完成'
</if>
GROUP BY tjcrn.sequence_nbr GROUP BY tjcrn.sequence_nbr
</if> </if>
order by createDate desc order by createDate desc
...@@ -1404,6 +1464,12 @@ ...@@ -1404,6 +1464,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjed.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjed.audit_status = '已完成'
</if>
GROUP BY tjed.sequence_nbr GROUP BY tjed.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -1451,6 +1517,12 @@ ...@@ -1451,6 +1517,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjed.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjed.audit_status = '已完成'
</if>
GROUP BY tjed.sequence_nbr GROUP BY tjed.sequence_nbr
</if> </if>
order by createDate desc order by createDate desc
...@@ -1498,6 +1570,12 @@ ...@@ -1498,6 +1570,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjsc.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjsc.audit_status = '已完成'
</if>
GROUP BY tjsc.sequence_nbr GROUP BY tjsc.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -1545,6 +1623,12 @@ ...@@ -1545,6 +1623,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjsc.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjsc.audit_status = '已完成'
</if>
GROUP BY tjsc.sequence_nbr GROUP BY tjsc.sequence_nbr
</if> </if>
order by createDate desc order by createDate desc
...@@ -1588,6 +1672,12 @@ ...@@ -1588,6 +1672,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and equ_category_code = #{dto.equCategoryCode} and equ_category_code = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and notice_status != 6616
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and notice_status = 6616
</if>
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
union all union all
...@@ -1630,6 +1720,12 @@ ...@@ -1630,6 +1720,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and equ_category = #{dto.equCategoryCode} and equ_category = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and notice_status != 6616
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and notice_status = 6616
</if>
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
union all union all
...@@ -1672,6 +1768,12 @@ ...@@ -1672,6 +1768,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and equ_category_code = #{dto.equCategoryCode} and equ_category_code = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and notice_status != 6616
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and notice_status = 6616
</if>
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
union all union all
...@@ -1716,6 +1818,12 @@ ...@@ -1716,6 +1818,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and notice_status != 6616
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and notice_status = 6616
</if>
GROUP BY tn.sequence_nbr GROUP BY tn.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -1761,6 +1869,12 @@ ...@@ -1761,6 +1869,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjur.status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjur.status = '已完成'
</if>
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
union all union all
...@@ -1805,6 +1919,12 @@ ...@@ -1805,6 +1919,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjvi.status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjvi.status = '已完成'
</if>
GROUP BY tjvi.sequence_nbr GROUP BY tjvi.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -1850,6 +1970,12 @@ ...@@ -1850,6 +1970,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjcrr.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjcrr.audit_status = '已完成'
</if>
GROUP BY tjcrr.sequence_nbr GROUP BY tjcrr.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -1895,6 +2021,12 @@ ...@@ -1895,6 +2021,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjcrt.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjcrt.audit_status = '已完成'
</if>
GROUP BY tjcrt.sequence_nbr GROUP BY tjcrt.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -1940,6 +2072,12 @@ ...@@ -1940,6 +2072,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjcru.status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjcru.status = '已完成'
</if>
GROUP BY tjcru.sequence_nbr GROUP BY tjcru.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -1985,6 +2123,12 @@ ...@@ -1985,6 +2123,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and 1 = 2 and 1 = 2
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjcrn.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjcrn.audit_status = '已完成'
</if>
GROUP BY tjcrn.sequence_nbr GROUP BY tjcrn.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -2034,6 +2178,12 @@ ...@@ -2034,6 +2178,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjed.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjed.audit_status = '已完成'
</if>
GROUP BY tjed.sequence_nbr GROUP BY tjed.sequence_nbr
</if> </if>
<if test="treeValue != null"> <if test="treeValue != null">
...@@ -2083,6 +2233,12 @@ ...@@ -2083,6 +2233,12 @@
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
and ri.EQU_CATEGORY = #{dto.equCategoryCode} and ri.EQU_CATEGORY = #{dto.equCategoryCode}
</if> </if>
<if test="dto.status != null and dto.status != '' and dto.status != '6616'">
and tjsc.audit_status != '已完成'
</if>
<if test="dto.status != null and dto.status != '' and dto.status == '6616'">
and tjsc.audit_status = '已完成'
</if>
GROUP BY tjsc.sequence_nbr GROUP BY tjsc.sequence_nbr
</if> </if>
</select> </select>
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java
View file @ 046bf4c7
...@@ -3345,6 +3345,7 @@ public class JGDPStatisticsServiceImpl { ...@@ -3345,6 +3345,7 @@ public class JGDPStatisticsServiceImpl {
filterParamDto.setBusinessTypeCode(dpFilterParamForDetailDto.getBusinessTypeCode()); filterParamDto.setBusinessTypeCode(dpFilterParamForDetailDto.getBusinessTypeCode());
filterParamDto.setEquCategoryCode(dpFilterParamForDetailDto.getEquCategoryCode()); filterParamDto.setEquCategoryCode(dpFilterParamForDetailDto.getEquCategoryCode());
filterParamDto.setEquListCode(dpFilterParamForDetailDto.getEquListCode()); filterParamDto.setEquListCode(dpFilterParamForDetailDto.getEquListCode());
filterParamDto.setStatus(dpFilterParamForDetailDto.getStatus());
if (null != dpFilterParamForDetailDto.getTimeSearchOne()) { if (null != dpFilterParamForDetailDto.getTimeSearchOne()) {
filterParamDto.setBeginDate(dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate()); filterParamDto.setBeginDate(dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate());
filterParamDto.setEndDate(dpFilterParamForDetailDto.getTimeSearchOne().getEndDate()); filterParamDto.setEndDate(dpFilterParamForDetailDto.getTimeSearchOne().getEndDate());
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JYJCDPStatisticsServiceImpl.java
View file @ 046bf4c7
...@@ -1113,6 +1113,7 @@ public class JYJCDPStatisticsServiceImpl { ...@@ -1113,6 +1113,7 @@ public class JYJCDPStatisticsServiceImpl {
filterParamDto.setSuperviseUnitName(dpFilterParamForDetailDto.getSuperviseUnitName()); filterParamDto.setSuperviseUnitName(dpFilterParamForDetailDto.getSuperviseUnitName());
filterParamDto.setEquListCode(dpFilterParamForDetailDto.getEquListCode()); filterParamDto.setEquListCode(dpFilterParamForDetailDto.getEquListCode());
filterParamDto.setEquCategoryCode(dpFilterParamForDetailDto.getEquCategoryCode()); filterParamDto.setEquCategoryCode(dpFilterParamForDetailDto.getEquCategoryCode());
filterParamDto.setStatus(dpFilterParamForDetailDto.getStatus());
if (null != dpFilterParamForDetailDto.getTimeSearchOne()) { if (null != dpFilterParamForDetailDto.getTimeSearchOne()) {
filterParamDto.setBeginDate(dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate()); filterParamDto.setBeginDate(dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate());
filterParamDto.setEndDate(dpFilterParamForDetailDto.getTimeSearchOne().getEndDate()); filterParamDto.setEndDate(dpFilterParamForDetailDto.getTimeSearchOne().getEndDate());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment