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

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the, 新需求 #52721

See merge request LiuChao/foton-slrs-system-rest!493
This commit is contained in:
super_liu
2022-05-10 16:47:09 +08:00
parent 02c3c9fa6a 16535b304e
commit 35c9a8f096
2 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java
+6
View File
@@ -86,6 +86,12 @@ public class SarBussionessStandState extends BaseEntity {
@TableField("PARAM2") @TableField("PARAM2")
private String param2; private String param2;
@TableField(exist = false)
private String putTime;
@TableField(exist = false)
private String FSRQBUSS;
@TableField(exist = false) @TableField(exist = false)
private String QCDW; private String QCDW;
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
+51 -17
View File
@@ -20,7 +20,45 @@
sar_bussioness_stand_state.PARAM1, sar_bussioness_stand_state.PARAM1,
sar_bussioness_stand_state.PARAM2 sar_bussioness_stand_state.PARAM2
</sql> </sql>
<sql id="Base_Column_List_buss" >
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
</sql>
<sql id="SarBussionInfoRole_Where_Clause_Review_Results_Buss">
where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL
<trim suffixOverrides="," >
<if test="standCode != null and standCode != '' " >
and STAND_CODE like concat(concat('%',#{standCode}),'%')
</if>
<if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd != null and reviewTimeEnd != ''">
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')
</if>
<if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd == null and reviewTimeEnd == ''">
and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') &gt;= DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d')
</if>
<if test="reviewTimeStart == null and reviewTimeStart == '' and reviewTimeEnd != null and reviewTimeEnd != ''">
and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS,'%Y-%m-%d') &lt;= DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')
</if>
<if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd != null and issueTimeEnd != ''">
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')
</if>
<if test="issueTimeStart != null and issueTimeStart != '' and issueTimeEnd == null and issueTimeEnd == ''">
and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') &gt;= DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d')
</if>
<if test="issueTimeStart == null and issueTimeStart == '' and issueTimeEnd != null and issueTimeEnd != ''">
and DATE_FORMAT(sar_bussioness_stand.ISSUE_TIME,'%Y-%m-%d') &lt;= DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d')
</if>
</trim>
</sql>
<sql id="SarBussionInfoRole_Where_Clause_Review_Results_N"> <sql id="SarBussionInfoRole_Where_Clause_Review_Results_N">
where REVIEW_RESULTS IS NULL 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) 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.STAND_CODE,
A.REVIEW_TIME, A.REVIEW_TIME,
A.ISSUE_TIME, A.ISSUE_TIME,
A.REVIEW_RESULTS, A.PUT_TIME,
A.REVIEW_PROCESS_NUM,
A.CREATION_TIME, A.CREATION_TIME,
A.MODIFY_TIME, A.MODIFY_TIME,
A.VALID_FLAG, A.VALID_FLAG,
A.PARAM1,
A.PARAM2,
A.QCDW, A.QCDW,
A.QCRBUSS, A.QCRBUSS,
A.standSort A.standSort
FROM ( FROM (
select select
<include refid="Base_Column_List" />, <include refid="Base_Column_List_buss" />,
sar_buss_stand_attr_info.FSRQBUSS AS REVIEW_TIME,
sar_buss_stand_attr_info.QCDW, sar_buss_stand_attr_info.QCDW,
sar_buss_stand_attr_info.QCRBUSS, sar_buss_stand_attr_info.QCRBUSS
sar_bussioness_stand.stand_sort AS standSort from sar_bussioness_stand
from sar_bussioness_stand_state LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand.id
LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id <include refid="SarBussionInfoRole_Where_Clause_Review_Results_Buss"/>
LEFT JOIN sar_bussioness_stand ON sar_bussioness_stand.id = sar_bussioness_stand_state.stand_id
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
ORDER BY
REVIEW_RESULTS ASC,
REVIEW_TIME DESC,
ISSUE_TIME DESC
) A ) A
ORDER BY
A.REVIEW_TIME DESC,
A.ISSUE_TIME DESC
limit ${pager.startIndex-1},${pageSize} limit ${pager.startIndex-1},${pageSize}
</select> </select>
<select id="getBussionessStandStateCountNo" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage"> <select id="getBussionessStandStateCountNo" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
select count(1) from ( select count(1) from (
select id from sar_bussioness_stand_state select distinct sar_bussioness_stand.id from sar_bussioness_stand
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/> LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand.id
<include refid="SarBussionInfoRole_Where_Clause_Review_Results_Buss"/>
) a ) a
</select> </select>