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

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!263
This commit is contained in:
王夏晖
2021-12-01 20:54:21 +08:00
parent 895289a1a0 fbca49f8e9
commit e7302f306d
15 changed files with 193 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+16 -38
View File
@@ -47,11 +47,11 @@
),' ','')) LIKE trim(replace(CONCAT('%',#{waringEO.standCode},'%'),' ',''))
</if>
<if test="waringEO.standName != null and waringEO.standName != ''">
AND sarInfo.STAND_NAME = #{waringEO.standName}
AND sarInfo.STAND_NAME like concat('%', #{waringEO.standName},'%')
</if>
<if test="waringEO.startPutTime != null and waringEO.startPutTime != '' and waringEO.endPutTime != null and waringEO.endPutTime != '' ">
AND (
DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT(
DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT(
#{waringEO.endPutTime},
'%Y-%m-%d'
)
@@ -65,16 +65,10 @@
</if>
<if test="waringEO.startSSRQ != null and waringEO.startSSRQ != '' and waringEO.endSSRQ != null and waringEO.endSSRQ != ''">
AND (
DATE_FORMAT( attr.SSRQ, '%Y-%m-%d') &gt;= DATE_FORMAT(
#{waringEO.startSSRQ},
'%Y-%m-%d'
)
sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE
DATE_FORMAT(t.SSRQ, '%Y-%m-%d') &gt;= DATE_FORMAT(#{waringEO.startSSRQ}, '%Y-%m-%d')
AND
DATE_FORMAT( attr.SSRQ, '%Y-%m-%d') &lt;= DATE_FORMAT(
#{waringEO.endSSRQ},
'%Y-%m-%d'
)
DATE_FORMAT(t.SSRQ, '%Y-%m-%d') &lt;= DATE_FORMAT(#{waringEO.endSSRQ}, '%Y-%m-%d') AND t.time_name = 'SSRQ' )
)
</if>
</sql>
@@ -98,37 +92,23 @@
LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID
<where>
POWER = '1'
AND (MARK = 'stand')
<include refid="stand_where"/>
<if test="waringEO.applyType != null and waringEO.applyType != ''">
AND attr.CLLX LIKE CONCAT('%', #{waringEO.applyType},'%')
</if>
<if test="waringEO.startXCXSSRQ != null and waringEO.startXCXSSRQ != '' and waringEO.endXCXSSRQ != null and waringEO.endXCXSSRQ != ''">
AND (
DATE_FORMAT( attr.XCXSSRQ, '%Y-%m-%d') &gt;= DATE_FORMAT(
#{waringEO.startXCXSSRQ},
'%Y-%m-%d'
)
AND
DATE_FORMAT( attr.XCXSSRQ, '%Y-%m-%d') &lt;= DATE_FORMAT(
#{waringEO.endXCXSSRQ},
'%Y-%m-%d'
)
sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE
DATE_FORMAT(t.SSRQ, '%Y-%m-%d') between DATE_FORMAT(#{waringEO.startXCXSSRQ}, '%Y-%m-%d') AND DATE_FORMAT(#{waringEO.endXCXSSRQ}, '%Y-%m-%d')
AND t.time_name = 'XCXSSRQ' )
)
</if>
<if test="waringEO.startZCCSSRQ != null and waringEO.startZCCSSRQ != '' and waringEO.endZCCSSRQ != null and waringEO.endZCCSSRQ != ''">
AND (
DATE_FORMAT( attr.ZCCSSRQ, '%Y-%m-%d') &gt;= DATE_FORMAT(
#{waringEO.startZCCSSRQ},
'%Y-%m-%d'
)
AND
DATE_FORMAT( attr.ZCCSSRQ, '%Y-%m-%d') &lt;= DATE_FORMAT(
#{waringEO.endZCCSSRQ},
'%Y-%m-%d'
)
sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE
DATE_FORMAT(t.SSRQ, '%Y-%m-%d') between DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') AND DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d')
AND t.time_name = 'ZCCSSRQ' )
)
</if>
</where>
@@ -156,7 +136,7 @@
LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID
<where>
POWER = '1'
AND (MARK = 'item')
<include refid="stand_where"/>
<if test="waringEO.applyType != null and waringEO.applyType != ''">
AND items.APPLY_ARCTIC LIKE CONCAT('%', #{waringEO.applyType},'%')
@@ -164,17 +144,15 @@
<if test="waringEO.startXCXSSRQ != null and waringEO.startXCXSSRQ != '' and waringEO.endXCXSSRQ != null and waringEO.endXCXSSRQ != ''">
AND (
DATE_FORMAT( items.XCXSSRQ, '%Y-%m-%d') &gt;= DATE_FORMAT(#{waringEO.startXCXSSRQ},'%Y-%m-%d')
DATE_FORMAT( items.XCXSSRQ, '%Y-%m-%d') between DATE_FORMAT(#{waringEO.startXCXSSRQ},'%Y-%m-%d')
AND
DATE_FORMAT( items.XCXSSRQ, '%Y-%m-%d') &lt;= DATE_FORMAT(#{waringEO.endXCXSSRQ},'%Y-%m-%d')
DATE_FORMAT(#{waringEO.endXCXSSRQ},'%Y-%m-%d')
)
</if>
<if test="waringEO.startZCCSSRQ != null and waringEO.startZCCSSRQ != '' and waringEO.endZCCSSRQ != null and waringEO.endZCCSSRQ != ''">
AND(
DATE_FORMAT( items.ZCCSSRQ, '%Y-%m-%d') &gt;= DATE_FORMAT(#{waringEO.startZCCSSRQ},'%Y-%m-%d')
AND
DATE_FORMAT( items.ZCCSSRQ, '%Y-%m-%d') &lt;= DATE_FORMAT(#{waringEO.endZCCSSRQ},'%Y-%m-%d' )
DATE_FORMAT( items.ZCCSSRQ, '%Y-%m-%d') between DATE_FORMAT(#{waringEO.startZCCSSRQ},'%Y-%m-%d') AND DATE_FORMAT(#{waringEO.endZCCSSRQ},'%Y-%m-%d' )
)
</if>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<!-- </resultMap>-->
<!-- 查询条件 -->
<select id="selectWithinTerm" resultType="java.lang.String" parameterType="com.adc.da.scheduled.entity.DataDTO">
<select id="selectWithinTerm" resultType="java.lang.String" parameterType="com.adc.da.scheduled.entity.TermDTO">
SELECT
info.ID
FROM
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<result column="STAND_YEAR" property="standYear"/>
</resultMap>
<!-- 查询条件 -->
<select id="selectWithinTerm" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
<select id="selectWithinTerm" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.TermDTO">
SELECT
items.ID,
items.ITEMS_NUM,
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml
+54 -10
View File
@@ -4,30 +4,74 @@
<insert id="ignoreInsert" parameterType="java.util.LinkedList">
REPLACE INTO sar_stand_warning (ID,STAND_ID, STAND_TYPE, STAND_CODE,STAND_NAME,PUT_TIME,APPLY_TYPE,DUTY_ENGINEER,ITEMS_ID,ITEMS_NUM,ITEMS_NAME,POLICY_ID,POLICY_NAME,MARK,POWER)
REPLACE INTO sar_stand_warning (ID,STAND_ID,ITEMS_ID,POLICY_ID,MARK,POWER)
VALUES
<if test="warningEOS !=null and warningEOS.size()!=0">
<foreach collection="warningEOS" item="item" index="index" separator=",">
(
#{item.id}
,#{item.standId}
,#{item.standType}
,#{item.standCode}
,#{item.standName}
,#{item.putTime}
,#{item.applyType}
,#{item.dutyEngineer}
,#{item.itemsId}
,#{item.itemsNum}
,#{item.itemsName}
,#{item.policyId}
,#{item.policyName}
,#{item.mark}
,#{item.power}
)
</foreach>
</if>
</insert>
<delete id="autoCancelWarning">
UPDATE sar_stand_warning
SET POWER ='0'
WHERE
STAND_ID IN (
SELECT
law_id
FROM
warning_date
WHERE
DATE_FORMAT(SSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
UNION
SELECT
ID
FROM
sar_standards_info
WHERE
DATE_FORMAT(PUT_TIME, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
UNION
SELECT
STAND_ID
FROM
sar_stand_items
WHERE
DATE_FORMAT(XCXSSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
OR DATE_FORMAT(ZCCSSRQ, '%Y-%m-%d') &lt; DATE_FORMAT(now(), '%Y-%m-%d')
)
</delete>
<select id="getWarningId" resultType="com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO">
SELECT
law_id as STAND_ID,
'-1' AS itemsId,
'stand' AS mark,
'1' as power
FROM
warning_date AS warning
WHERE
DATE_FORMAT(warning.SSRQ,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m-%d') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d')
UNION
SELECT
STAND_ID,
ID AS itemsId,
'item' AS mark,
'1' as power
FROM
sar_stand_items AS item
WHERE
DATE_FORMAT(item.XCXSSRQ,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m-%d') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d')
OR
DATE_FORMAT(item.ZCCSSRQ,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m-%d') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d')
</select>
</mapper>