预警

adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java

@@ -6,7 +6,6 @@ import com.adc.da.scheduled.dao.SarStandardItemDao;
 import com.adc.da.scheduled.dao.SarStandardWarningDao;
 import com.adc.da.scheduled.entity.TermDTO;
 
-import com.adc.da.slrs.ActivityDatas.entity.DataList;
 import com.adc.da.slrs.processModel.utils.TrainFormDate;
 import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
 import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
@@ -22,8 +21,6 @@ import com.adc.da.sys.service.IDicTypeEOService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
-
-
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -35,17 +32,12 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.PostConstruct;
-import java.lang.reflect.InvocationTargetException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 
 @EnableScheduling

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java

@@ -95,4 +95,8 @@ public class StandWarningEO extends EarlyWarningEO {
     @ApiModelProperty("范围查询发布日期结束")
     @DateTimeFormat(pattern = "YYYY-MM-dd")
     private String endIssueTime;
+
+    @ExcelIgnore
+    @ApiModelProperty("stand标准 item条款")
+    private String mark;
 }

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml

@@ -209,7 +209,12 @@
         LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID
         <where>
             POWER = '1'
-            AND (MARK = 'stand')
+            <if test="waringEO.mark != null and waringEO.mark != ''">
+                AND (MARK = #{mark})
+            </if>
+            <if test="waringEO.mark == null or waringEO.mark == ''">
+                AND (MARK = 'stand')
+            </if>
             AND sarInfo.VALID_FLAG='0'
             <include refid="stand_where"/>
             <if test="waringEO.applyType != null and waringEO.applyType != ''">AND attr.CLLX LIKE CONCAT('%',
@@ -255,7 +260,12 @@
         LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEM_ID
         <where>
             POWER = '1'
-            AND (MARK = 'item')
+            <if test="waringEO.mark != null and waringEO.mark != ''">
+                AND (MARK = #{mark})
+            </if>
+            <if test="waringEO.mark == null or waringEO.mark == ''">
+                AND (MARK = 'item')
+            </if>
             AND sarInfo.VALID_FLAG='0'
             <include refid="stand_where"/>
             <if test="waringEO.applyType != null and waringEO.applyType != ''">