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:
zhaokaiyao@91isoft.com
2022-01-10 12:49:56 +08:00
parent 9791fd13e9
commit 557a9f756c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+1 -1
View File
@@ -130,7 +130,7 @@ public class ScheduledJob {
for (String s : item.getSSRQ().split(",")) { for (String s : item.getSSRQ().split(",")) {
String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}$"; String pattern = term.getTermStr();
Pattern r = Pattern.compile(pattern); Pattern r = Pattern.compile(pattern);
Matcher m = r.matcher(s); Matcher m = r.matcher(s);
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+2
View File
@@ -205,6 +205,7 @@
<where> <where>
POWER = '1' POWER = '1'
AND (MARK = 'stand') AND (MARK = 'stand')
AND sarInfo.VALID_FLAG='0'
<include refid="stand_where"/> <include refid="stand_where"/>
<if test="waringEO.applyType != null and waringEO.applyType != ''">AND attr.CLLX LIKE CONCAT('%', <if test="waringEO.applyType != null and waringEO.applyType != ''">AND attr.CLLX LIKE CONCAT('%',
#{waringEO.applyType},'%') #{waringEO.applyType},'%')
@@ -249,6 +250,7 @@
<where> <where>
POWER = '1' POWER = '1'
AND (MARK = 'item') AND (MARK = 'item')
AND sarInfo.VALID_FLAG='0'
<include refid="stand_where"/> <include refid="stand_where"/>
<if test="waringEO.applyType != null and waringEO.applyType != ''"> <if test="waringEO.applyType != null and waringEO.applyType != ''">
AND items.APPLY_ARCTIC LIKE CONCAT('%', #{waringEO.applyType},'%') AND items.APPLY_ARCTIC LIKE CONCAT('%', #{waringEO.applyType},'%')