Merge remote-tracking branch 'origin/develop_master' into develop_1

2021-09-06 18:29:25 +08:00
parent 912cda6762 abad09c2ea
commit 446f8f54e9
10 changed files with 374 additions and 66 deletions
@@ -363,6 +363,17 @@
        left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0)
        where 1=1
        <trim suffixOverrides="," >
+
+            <if test="putTime!=null">
+                and put_time=#{putTime}
+            </if>
+            <if test="issueTime!=null">
+                and issue_time=#{issueTime}
+            </if>
+            <if test="textStatusBuss!=null">
+                and text_status_buss=#{textStatusBuss}
+            </if>
+
            <if test="standCode != null" >
                <!-- and (
                (concat(dicstandSort.DIC_TYPE_NAME, ' ', SAR_BUSSIONESS_STAND.STAND_CODE, '-', SAR_BUSSIONESS_STAND.STAND_YEAR)
@@ -308,7 +308,6 @@
        <if test="fileType != null">
            and SAR_STANDARDS_INFO.STAND_TYPE = #{fileType}
        </if>
-        GROUP BY  STAND_ID
        order by SAR_STAND_FILE.modify_time desc,SAR_STAND_FILE.id
        )  tmp_tb limit ${pager.startIndex-1},${pageSize}) a
    </select>