diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java index 02a7ee49..9f09b90d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java @@ -86,6 +86,12 @@ public class SarBussionessStandState extends BaseEntity { @TableField("PARAM2") private String param2; + @TableField(exist = false) + private String putTime; + + @TableField(exist = false) + private String FSRQBUSS; + @TableField(exist = false) private String QCDW; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml index 31ed85e0..f5c10855 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml @@ -20,7 +20,45 @@ sar_bussioness_stand_state.PARAM1, sar_bussioness_stand_state.PARAM2 + + DISTINCT sar_bussioness_stand.ID, + sar_bussioness_stand.ID AS STAND_ID, + sar_bussioness_stand.stand_sort AS standSort, + sar_bussioness_stand.STAND_NAME, + sar_bussioness_stand.STAND_CODE, + sar_bussioness_stand.ISSUE_TIME, + sar_bussioness_stand.PUT_TIME, + sar_bussioness_stand.CREATION_TIME, + sar_bussioness_stand.MODIFY_TIME, + sar_bussioness_stand.VALID_FLAG + + + where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL + + + and STAND_CODE like concat(concat('%',#{standCode}),'%') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') >= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') <= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME, '%Y-%m-%d') between DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') >= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') + + + and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') <= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d') + + + where REVIEW_RESULTS IS NULL AND DATE_FORMAT(REVIEW_TIME, '%Y-%m-%d') between DATE_FORMAT(current_timestamp(), '%Y-%m-%d') AND DATE_ADD(CURDATE(), INTERVAL 30 DAY) @@ -84,38 +122,34 @@ A.STAND_CODE, A.REVIEW_TIME, A.ISSUE_TIME, - A.REVIEW_RESULTS, - A.REVIEW_PROCESS_NUM, + A.PUT_TIME, A.CREATION_TIME, A.MODIFY_TIME, A.VALID_FLAG, - A.PARAM1, - A.PARAM2, A.QCDW, A.QCRBUSS, A.standSort FROM ( select - , + , + sar_buss_stand_attr_info.FSRQBUSS AS REVIEW_TIME, sar_buss_stand_attr_info.QCDW, - sar_buss_stand_attr_info.QCRBUSS, - sar_bussioness_stand.stand_sort AS standSort - from sar_bussioness_stand_state - LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id - LEFT JOIN sar_bussioness_stand ON sar_bussioness_stand.id = sar_bussioness_stand_state.stand_id - - ORDER BY - REVIEW_RESULTS ASC, - REVIEW_TIME DESC, - ISSUE_TIME DESC + sar_buss_stand_attr_info.QCRBUSS + from sar_bussioness_stand + LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand.id + ) A + ORDER BY + A.REVIEW_TIME DESC, + A.ISSUE_TIME DESC limit ${pager.startIndex-1},${pageSize}