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-11 22:27:36 +08:00
parent e1206d7f80
commit 8a9971c046
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java
+2 -2
View File
@@ -83,10 +83,10 @@ public class StandWarningEO extends EarlyWarningEO {
@ExcelIgnore @ExcelIgnore
@ApiModelProperty("范围查询发布日期开始") @ApiModelProperty("范围查询发布日期开始")
@DateTimeFormat(pattern = "YYYY-MM-dd") @DateTimeFormat(pattern = "YYYY-MM-dd")
private String startPutTime; private String startIssueTime;
@ExcelIgnore @ExcelIgnore
@ApiModelProperty("范围查询发布日期结束") @ApiModelProperty("范围查询发布日期结束")
@DateTimeFormat(pattern = "YYYY-MM-dd") @DateTimeFormat(pattern = "YYYY-MM-dd")
private String endPutTime; private String endIssueTime;
} }
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+8 -8
View File
@@ -9,7 +9,7 @@
<result column="STAND_TYPE" property="standType"></result> <result column="STAND_TYPE" property="standType"></result>
<result column="STAND_CODE" property="standCode"></result> <result column="STAND_CODE" property="standCode"></result>
<result column="STAND_NAME" property="standName"></result> <result column="STAND_NAME" property="standName"></result>
<result column="PUT_TIME" property="putTime"></result> <result column="ISSUE_TIME" property="issueTime"></result>
<result column="APPLY_TYPE" property="applyType"></result> <result column="APPLY_TYPE" property="applyType"></result>
<result column="DUTY_ENGINEER" property="dutyEngineer"></result> <result column="DUTY_ENGINEER" property="dutyEngineer"></result>
<result column="ITEMS_ID" property="itemsId"></result> <result column="ITEMS_ID" property="itemsId"></result>
@@ -31,7 +31,7 @@
sarInfo.STAND_TYPE, sarInfo.STAND_TYPE,
CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE,
sarInfo.STAND_NAME, sarInfo.STAND_NAME,
sarInfo.PUT_TIME, sarInfo.ISSUE_TIME,
attr.SSRQ as SSRQ attr.SSRQ as SSRQ
</sql> </sql>
@@ -50,15 +50,15 @@
<if test="waringEO.standName != null and waringEO.standName != ''"> <if test="waringEO.standName != null and waringEO.standName != ''">
AND sarInfo.STAND_NAME like concat('%', #{waringEO.standName},'%') AND sarInfo.STAND_NAME like concat('%', #{waringEO.standName},'%')
</if> </if>
<if test="waringEO.startPutTime != null and waringEO.startPutTime != '' and waringEO.endPutTime != null and waringEO.endPutTime != '' "> <if test="waringEO.startIssueTime != null and waringEO.startIssueTime != '' and waringEO.endIssueTime != null and waringEO.endIssueTime != '' ">
AND ( AND (
DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT( DATE_FORMAT(sarInfo.ISSUE_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT(
#{waringEO.endPutTime}, #{waringEO.startIssueTime},
'%Y-%m-%d' '%Y-%m-%d'
) )
AND AND
DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT( DATE_FORMAT( sarInfo.ISSUE_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
#{waringEO.endPutTime}, #{waringEO.endIssueTime},
'%Y-%m-%d' '%Y-%m-%d'
) )
) )
@@ -79,7 +79,7 @@
sarInfo.STAND_TYPE, sarInfo.STAND_TYPE,
CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE,
sarInfo.STAND_NAME, sarInfo.STAND_NAME,
sarInfo.PUT_TIME, sarInfo.ISSUE_TIME,
attr.SSRQ as SSRQ, attr.SSRQ as SSRQ,
case stand_type case stand_type
when 'INLAND' then '国内标准' when 'INLAND' then '国内标准'