标准预警查询

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java

@@ -5,6 +5,7 @@ import com.adc.da.base.web.BaseController;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
+import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO;
 import com.adc.da.slrs.sarStandWarning.service.Impl.EarlyWarningEOServiceImpl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -53,6 +54,16 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
         IPage<EarlyWarningEO> list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警
         return getResponseMessage(list1, list2, list3, list4);
     }
+
+    @GetMapping("/StandWarning")
+    @ApiOperation("标准预警查询")
+    public ResponseMessage<IPage<StandWarningEO>> getStandWaring(StandWarningEO queryPageEO){
+        IPage<StandWarningEO> standWarning = earlyWarningEOService.getStandWarning(queryPageEO);
+        return Result.success(standWarning);
+    }
+
+
+
     private ResponseMessage getResponseMessage(IPage<EarlyWarningEO> list1, IPage<EarlyWarningEO> list2, IPage<EarlyWarningEO> list3, IPage<EarlyWarningEO> list4) {
         List<Map<String, Object>> listMap = new ArrayList<Map<String,Object>>();
         Map<String, Object> map = new HashMap<String, Object>();
@@ -71,7 +82,7 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
     * date 2021-06-15
     **/
     @GetMapping("/ChangePermissions")
-    @ApiOperation("更改权限")
+    @ApiOperation("取消预警")
     public ResponseMessage ChangePermissions(String id) {
         String power = earlyWarningEOService.ChangePermissions(id);
         return Result.success("200",power);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java

@@ -2,14 +2,13 @@ package com.adc.da.slrs.sarStandWarning.dao;
 
 
 import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;
 
 public interface EarlyWarningEODao extends BaseMapper<EarlyWarningEO> {
 
-    IPage<EarlyWarningEO> selectWarningPage(IPage<EarlyWarningEO> page, @Param(Constants.WRAPPER) QueryWrapper<EarlyWarningEO> queryWrapper);
+    IPage<StandWarningEO> selectWarningPage(IPage<StandWarningEO> page, @Param("waringEO") StandWarningEO warningEO);
 
 }

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.Tag;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,21 +25,27 @@ public class EarlyWarningEO extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("id")
     @TableId("ID")
     private String id;
 
+    @ApiModelProperty("标准id")
     @TableField("STAND_ID")
     private String standId;
 
+    @ApiModelProperty("标准类别")
     @TableField("STAND_TYPE")
     private String standType;
 
+    @ApiModelProperty("标准编号")
     @TableField("STAND_CODE")
     private String standCode;
 
+    @ApiModelProperty("标准名称")
     @TableField("STAND_NAME")
     private String standName;
 
+    @ApiModelProperty("发布日期")
     @TableField("PUT_TIME")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date putTime;
@@ -45,18 +53,23 @@ public class EarlyWarningEO extends BaseEntity {
     @TableField(exist = false)
     private Date lastTime;
 
+    @ApiModelProperty("适用车型")
     @TableField("APPLY_TYPE")
     private String applyType;
 
+    @ApiModelProperty("责任工程师")
     @TableField("DUTY_ENGINEER")
     private String dutyEngineer;
 
+    @ApiModelProperty("条款（分解单）id")
     @TableField("ITEMS_ID")
     private String itemsId;
 
+    @ApiModelProperty("条款（分解单）编号")
     @TableField("ITEMS_NUM")
     private String itemsNum;
 
+    @ApiModelProperty("条款（分解单）名称")
     @TableField("ITEMS_NAME")
     private String itemsName;
 

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

@@ -0,0 +1,35 @@
+package com.adc.da.slrs.sarStandWarning.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class StandWarningEO extends EarlyWarningEO {
+    private static final long serialVersionUID = 1L;
+
+    @DateTimeFormat(pattern = "YYYY-MM-dd")
+    private Date XCXSSRQ;
+
+    @DateTimeFormat(pattern = "YYYY-MM-dd")
+    private Date ZCCSSRQ;
+
+    @DateTimeFormat(pattern = "YYYY-MM-dd")
+    private Date SSRQ;
+
+    private String standNum;
+
+    private String standSort;
+
+    private String standYear;
+
+    private String issueTime;
+
+    private Integer page;
+
+    private Integer pageSize;
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java

@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandWarning.service;
 
 
 import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
+import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -16,4 +17,7 @@ public interface EarlyWarningEOService extends IService<EarlyWarningEO> {
     IPage<EarlyWarningEO> oldPolicyQuery(int current,int pageSize);
     String batchSave(List<EarlyWarningEO> earlyWarningEOS);
     String ChangePermissions(String id);
+
+
+    IPage<StandWarningEO> getStandWarning(StandWarningEO queryPage);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java

@@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandWarning.service.Impl;
 import com.adc.da.scheduled.entity.DataDTO;
 import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao;
 import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
+import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO;
 import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService;
 import com.adc.da.sys.util.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -106,6 +107,17 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         }
         return "更改成功";
     }
+
+    /**
+     * 分页查询标准预警
+     * @return
+     */
+    @Override
+    public IPage<StandWarningEO> getStandWarning(StandWarningEO queryPage) {
+        IPage<StandWarningEO> iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize());
+        return earlyWarningEODao.selectWarningPage(iPage,queryPage);
+    }
+
     private IPage<EarlyWarningEO> getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper<EarlyWarningEO> wrapper) {
         wrapper.eq("power",1);
         Page<EarlyWarningEO> page = new Page<>(current, pageSize);
@@ -144,4 +156,8 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
             wrapper.like("APPLY_TYPE", earlyWarningEO.getApplyType());
         }
     }
+
+
+
+
 }

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

@@ -3,31 +3,145 @@
 <mapper namespace="com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao">
 
     <!-- Result Map-->
-    <resultMap id="resultMap" type="com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO" >
-        <id column="id" property="id" />
-        <result column="STAND_ID" property="standId" />
-        <result column="STAND_NAME" property="standName" />
-        <result column="STAND_TYPE" property="standType"/>
-        <result column="STAND_CODE" property="standCode"/>
-        <result column="XCXSSRQ" property="XCXSSRQ"/>
-        <result column="ZCCSSRQ" property="ZCCSSRQ"/>
-        <result column="SSRQ"  property="SSRQ"/>
-        <result column="PUT_TIME" property="putTime" />
-        <result column="APPLY_TYPE" property="applyType" />
-        <result column="ITEMS_ID" property="itemsId" />
-        <result column="ITEMS_NUM" property="itemsNum" />
-        <result column="ITEMS_NAME" property="itemsName" />
-        <result column="POLICY_ID" property="policyId" />
-        <result column="POLICY_NAME" property="policyName" />
-        <result column="DUTY_ENGINEER" property="dutyEngineer" />
-        <result column="DUTY_ENGINEER" property="dutyEngineer" />
-        <result column="DUTY_ENGINEER" property="dutyEngineer" />
-        <result column="issue_time" property="issueTime" />
-
+    <resultMap id="resultMap" type="com.adc.da.slrs.sarStandWarning.entity.StandWarningEO" >
+        <id column="ID" property="id" />
+        <result column="STAND_ID"   property="standId"></result>
+        <result column="STAND_TYPE" property="standType"></result>
+        <result column="STAND_CODE" property="standCode"></result>
+        <result column="STAND_NAME" property="standName"></result>
+        <result column="PUT_TIME"    property="putTime"></result>
+        <result column="APPLY_TYPE"    property="applyType"></result>
+        <result column="DUTY_ENGINEER"       property="dutyEngineer"></result>
+        <result column="ITEMS_ID"   property="itemsId"></result>
+        <result column="ITEMS_NUM" property="itemsNum"></result>
+        <result column="ITEMS_NAME"   property="itemsName"></result>
+        <result column="POLICY_ID"  property="policyId"></result>
+        <result column="POLICY_NAME" property="policyName"></result>
+        <result column="MARK"  property="mark"></result>
+        <result column="POWER"  property="power"></result>
 
+        <result column="XCXSSRQ"    property="XCXSSRQ"></result>
+        <result column="ZCCSSRQ"    property="ZCCSSRQ"></result>
+        <result column="SSRQ"       property="SSRQ"></result>
     </resultMap>
 
+    <sql id="stand_column">
+        	sarInfo.ID,
+        	sarInfo.STAND_TYPE,
+        	CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE,
+        	sarInfo.STAND_NAME,
+        	sarInfo.PUT_TIME,
+            attr.SSRQ as SSRQ
+    </sql>
 
 
+    <sql id="stand_where">
+            <if test="waringEO.standCode != null and waringEO.standCode != ''">
+                trim(replace(CONCAT(
+                sarInfo.STAND_SORT,
+                ' ',
+                sarInfo.STAND_NUMBER,
+                '-',
+                sarInfo.STAND_YEAR
+                ),' ','')) LIKE trim(replace(CONCAT('%',#{waringEO.standCode},'%'),' ',''))
+            </if>
+            <if test="waringEO.standName != null and waringEO.standName != ''">
+                sarInfo.STAND_NAME = #{waringEO.standName}
+            </if>
+            <if test="waringEO.putTime != null and waringEO.putTime != ''">
+
+                DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') = DATE_FORMAT(
+                #{waringEO.putTime},
+                '%Y-%m-%d'
+                )
+            </if>
+            <if test="waringEO.SSRQ != null and waringEO.SSRQ != ''">
+                DATE_FORMAT(attr.SSRQ, '%Y-%m-%d') = DATE_FORMAT(
+                #{waringEO.SSRQ},
+                '%Y-%m-%d'
+                )
+            </if>
+    </sql>
+
+    <select id="selectWarningPage" resultMap="resultMap">
+        SELECT
+            <include refid="stand_column"/> ,
+        	attr.CLLX as APPLY_TYPE ,
+        	attr.ZRGCS as DUTY_ENGINEER ,
+        	NULL AS ITEMS_ID ,
+        	NULL AS ITEMS_NUM ,
+        	NULL as  ITEMS_NAME ,
+        	NULL as POLICY_ID ,
+        	NULL as POLICY_NAME ,
+        	MARK ,
+        	POWE R ,
+        	attr.XCXSSRQ as XCXSSRQ ,
+        	attr.ZCCSSRQ as ZCCSSRQ
+        FROM sar_stand_warning as warning
+        LEFT JOIN sar_standards_info as sarInfo on sarInfo.id=warning.STAND_ID
+        LEFT JOIN sar_stand_attr_info as attr on attr.STAND_ID=warning.STAND_ID
+        <where>
+
+            <if test="waringEO.applyType != null and waringEO.applyType != ''">
+                attr.CLLX = #{waringEO.applyType}
+            </if>
+            <if test="waringEO.XCXSSRQ != null and waringEO.XCXSSRQ != ''">
+                DATE_FORMAT(attr.XCXSSRQ, '%Y-%m-%d') = DATE_FORMAT(
+                #{waringEO.XCXSSRQ},
+                '%Y-%m-%d'
+                )
+            </if>
+            <if test="waringEO.ZCCSSRQ != null and waringEO.ZCCSSRQ != ''">
+                DATE_FORMAT(attr.ZCCSSRQ, '%Y-%m-%d') = DATE_FORMAT(
+                #{waringEO.ZCCSSRQ},
+                '%Y-%m-%d'
+                )
+            </if>
+        </where>
+
+
+        UNION ALL
+
+        SELECT
+            <include refid="stand_column"/> ,
+            items.APPLY_ARCTIC AS APPLY_TYPE ,
+        	items.DUTY_ENGINEER AS DUTY_ENGINEER ,
+        	items.ID as ITEMS_ID ,
+        	items.ITEMS_NUM ,
+        	items.ITEMS_NAME ,
+        	NULL as POLICY_ID ,
+        	NULL as POLICY_NAME ,
+        	MARK ,
+        	POWER ,
+        	items.XCXSSRQ as XCXSSRQ ,
+        	items.ZCCSSRQ as ZCCSSRQ
+        FROM
+        	sar_stand_warning AS warning
+        LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID
+        LEFT JOIN sar_stand_items AS items ON items.STAND_ID = warning.STAND_ID
+        LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID
+        <where>
+
+
+            <if test="waringEO.applyType != null and waringEO.applyType != ''">
+                items.APPLY_ARCTIC = #{waringEO.applyType}
+            </if>
+
+            <if test="waringEO.XCXSSRQ != null and waringEO.XCXSSRQ != ''">
+                DATE_FORMAT(items.XCXSSRQ, '%Y-%m-%d') = DATE_FORMAT(
+                #{waringEO.XCXSSRQ},
+                '%Y-%m-%d'
+                )
+            </if>
+            <if test="waringEO.ZCCSSRQ != null and waringEO.ZCCSSRQ != ''">
+                DATE_FORMAT(items.ZCCSSRQ, '%Y-%m-%d') = DATE_FORMAT(
+                #{waringEO.ZCCSSRQ},
+                '%Y-%m-%d'
+                )
+            </if>
+        </where>
+
+    </select>
+
 
 </mapper>