diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java index b1604d9a..26ebd22c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java @@ -83,10 +83,10 @@ public class StandWarningEO extends EarlyWarningEO { @ExcelIgnore @ApiModelProperty("范围查询发布日期开始") @DateTimeFormat(pattern = "YYYY-MM-dd") - private String startPutTime; + private String startIssueTime; @ExcelIgnore @ApiModelProperty("范围查询发布日期结束") @DateTimeFormat(pattern = "YYYY-MM-dd") - private String endPutTime; + private String endIssueTime; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index 494904e7..c84d8a60 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -9,7 +9,7 @@ - + @@ -31,7 +31,7 @@ sarInfo.STAND_TYPE, CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, sarInfo.STAND_NAME, - sarInfo.PUT_TIME, + sarInfo.ISSUE_TIME, attr.SSRQ as SSRQ @@ -50,15 +50,15 @@ AND sarInfo.STAND_NAME like concat('%', #{waringEO.standName},'%') - + AND ( - DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') >= DATE_FORMAT( - #{waringEO.endPutTime}, + DATE_FORMAT(sarInfo.ISSUE_TIME, '%Y-%m-%d') >= DATE_FORMAT( + #{waringEO.startIssueTime}, '%Y-%m-%d' ) AND - DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') <= DATE_FORMAT( - #{waringEO.endPutTime}, + DATE_FORMAT( sarInfo.ISSUE_TIME, '%Y-%m-%d') <= DATE_FORMAT( + #{waringEO.endIssueTime}, '%Y-%m-%d' ) ) @@ -79,7 +79,7 @@ sarInfo.STAND_TYPE, CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, sarInfo.STAND_NAME, - sarInfo.PUT_TIME, + sarInfo.ISSUE_TIME, attr.SSRQ as SSRQ, case stand_type when 'INLAND' then '国内标准'