feat: There is no way the, bug #55972 复审流程自动发起自动发起草稿

2022-06-24 13:49:53 +08:00
parent 7884aaf319
commit 8d51647019
5 changed files with 91 additions and 33 deletions
@@ -54,6 +54,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
    addInterceptor.excludePathPatterns("/api/att/attFile/upload");
    addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel");
    addInterceptor.excludePathPatterns("/api/lawss/sarLawsInfo/exportStandardsInfoExcel");
+    // 提供自动发起复审流程 复审数据
+    addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList");
    //pcms项目数据下发开放接口
    addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save");
    addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save");
@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
 import io.swagger.annotations.Api;
@@ -43,7 +44,7 @@ public class SarBussionessStandStateController extends BaseController<SarBussion
     * @return
     */
    @ApiOperation(value = "|SarBussionessStandState|查询当天企标复审")
-    @GetMapping("/getSarBussionessStandStateProcessList")
+    @PostMapping("/getSarBussionessStandStateProcessList")
    public List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page){
        return bussionessStandStateService.getSarBussionessStandStateProcessList(page);
    }
@@ -33,7 +33,8 @@ public class ModelData {
    private int validFlag;
    private String param1;
    private String param2;
-    private Date putTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String putTime;
    private String standSort;
    private String qcdw;
    private String fsrqbuss;
@@ -392,7 +392,7 @@
        FROM sar_bussioness_stand
        WHERE stand_sort = 'Q/QCBFC'
        AND ISSUE_TIME IS NOT NULL
-        AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
+        AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
        BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY)
        UNION
        SELECT
@@ -401,7 +401,7 @@
        FROM sar_bussioness_stand
        WHERE stand_sort != 'Q/QCBFC'
        AND ISSUE_TIME IS NOT NULL
-        AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
+        AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
        BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY)
    </select>

@@ -36,9 +36,36 @@
        sar_bussioness_stand.VALID_FLAG
    </sql>

-    <sql id="SarBussionInfoRole_Where_Clause_Review_Results_Buss_StandState">
-        where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0'
-        AND DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS, '%Y-%m-%d') = DATE_FORMAT(current_timestamp(), '%Y-%m-%d')
+    <sql id="SarBussionInfoRole_Where_Clause_Review_Results_Buss_StandState_1">
+        where sar_bussioness_stand.stand_sort = 'Q/QCBFC' and sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0'
+        AND DATE_FORMAT(DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') = DATE_FORMAT(current_timestamp(), '%Y-%m-%d')
+        <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_Buss_StandState_2">
+        where sar_bussioness_stand.stand_sort != 'Q/QCBFC' and sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0'
+        AND DATE_FORMAT(DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d') = DATE_FORMAT(current_timestamp(), '%Y-%m-%d')
        <trim suffixOverrides="," >
            <if test="standCode != null and standCode != '' " >
                and STAND_CODE like  concat(concat('%',#{standCode}),'%')
@@ -144,33 +171,60 @@
    </sql>

    <select id="getSarBussionessStandStateProcessList" resultMap="BaseResultStandStateMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
-        SELECT
-        A.ID,
-        A.STAND_ID,
-        A.STAND_NAME,
-        A.STAND_CODE,
-        A.REVIEW_TIME,
-        A.ISSUE_TIME,
-        A.PUT_TIME,
-        A.CREATION_TIME,
-        A.MODIFY_TIME,
-        A.VALID_FLAG,
-        A.QCDW,
-        A.QCRBUSS,
-        A.standSort
-        FROM (
-        select
-        <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.QCRBUSS
-        from sar_bussioness_stand
-        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_StandState"/>
-        ) A
+        SELECT t.* FROM (
+            SELECT
+                A.ID,
+                A.STAND_ID as standId,
+                A.STAND_NAME as standName,
+                A.STAND_CODE as standCode,
+                A.REVIEW_TIME as reviewTime,
+                A.ISSUE_TIME as issueTime,
+                A.PUT_TIME as putTime,
+                A.CREATION_TIME as creationTime,
+                A.MODIFY_TIME as modifyTime,
+                A.VALID_FLAG as validFlag,
+                A.QCDW as qcdw,
+                A.QCRBUSS as qcrbuss,
+                A.standSort
+            FROM (
+            select
+            <include refid="Base_Column_List_buss" />,
+            DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH) AS REVIEW_TIME,
+            sar_buss_stand_attr_info.QCDW,
+            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
+            <include refid="SarBussionInfoRole_Where_Clause_Review_Results_Buss_StandState_1"/>
+            ) A
+            UNION
+            SELECT
+                A.ID,
+                A.STAND_ID as standId,
+                A.STAND_NAME as standName,
+                A.STAND_CODE as standCode,
+                A.REVIEW_TIME as reviewTime,
+                A.ISSUE_TIME as issueTime,
+                A.PUT_TIME as putTime,
+                A.CREATION_TIME as creationTime,
+                A.MODIFY_TIME as modifyTime,
+                A.VALID_FLAG as validFlag,
+                A.QCDW as qcdw,
+                A.QCRBUSS as qcrbuss,
+                A.standSort
+            FROM (
+            select
+            <include refid="Base_Column_List_buss" />,
+            DATE_SUB(DATE_ADD(sar_bussioness_stand.ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH) AS REVIEW_TIME,
+            sar_buss_stand_attr_info.QCDW,
+            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
+            <include refid="SarBussionInfoRole_Where_Clause_Review_Results_Buss_StandState_2"/>
+            ) A
+        ) t
        ORDER BY
-        A.REVIEW_TIME DESC,
-        A.ISSUE_TIME DESC
+        t.reviewTime DESC,
+        t.issueTime DESC
    </select>

    <!-- 分页查询条件当页数据 -->