Merge branch 'develop_migration' into 'develop_master'

Develop migration

See merge request LiuChao/foton-slrs-system-rest!538

adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java

@@ -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");

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/controller/SarBussionessStandStateController.java

@@ -4,6 +4,7 @@ package com.adc.da.slrs.sarBussionessStandState.controller;
 import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
+import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
 import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
 import com.adc.da.util.LoginUserUtil;
@@ -12,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;
@@ -36,6 +38,17 @@ public class SarBussionessStandStateController extends BaseController<SarBussion
     @Autowired
     private ISarBussionessStandStateService bussionessStandStateService;
 
+    /**
+     * 查询当天企标复审列表
+     * @param page  标准信息
+     * @return
+     */
+    @ApiOperation(value = "|SarBussionessStandState|查询当天企标复审")
+    @PostMapping("/getSarBussionessStandStateProcessList")
+    public List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page){
+        return bussionessStandStateService.getSarBussionessStandStateProcessList(page);
+    }
+
     /**
      * 自定义分页复审流程查询列表
      * @param page  标准信息

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/dao/SarBussionessStandStateDao.java

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarBussionessStandState.dao;
 
+import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,6 +17,8 @@ import java.util.List;
  */
 public interface SarBussionessStandStateDao extends BaseMapper<SarBussionessStandState> {
 
+    List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page);
+
     List<SarBussionessStandState> getBussionessStandStatePage(SarBussionessStandStatePage page);
 
     int getBussionessStandStateCount(SarBussionessStandStatePage page);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/ModelData.java

@@ -0,0 +1,45 @@
+/**
+  * Copyright 2022 bejson.com 
+  */
+package com.adc.da.slrs.sarBussionessStandState.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Auto-generated: 2022-06-23 15:31:2
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+@Data
+public class ModelData {
+
+    private String id;
+    private String standId;
+    private String standName;
+    private String standCode;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String reviewTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String issueTime;
+    private String reviewResults;
+    private String reviewProcessNum;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String creationTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String modifyTime;
+    private int validFlag;
+    private String param1;
+    private String param2;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String putTime;
+    private String standSort;
+    private String qcdw;
+    private String fsrqbuss;
+    private String qcrbuss;
+    private String processStatus;
+    private String bussFsSubUser1;
+    private String bussFsSubUser1Name;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/ISarBussionessStandStateService.java

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarBussionessStandState.service;
 
+import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,6 +17,8 @@ import java.util.List;
  */
 public interface ISarBussionessStandStateService extends IService<SarBussionessStandState> {
 
+    List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page);
+
     List<SarBussionessStandState> getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception;
 
     List<SarBussionessStandState> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/service/impl/SarBussionessStandStateServiceImpl.java

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarBussionessStandState.service.impl;
 
+import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
 import com.adc.da.slrs.sarBussionessStandState.dao.SarBussionessStandStateDao;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
@@ -20,6 +21,12 @@ import java.util.List;
 @Service
 public class SarBussionessStandStateServiceImpl extends ServiceImpl<SarBussionessStandStateDao, SarBussionessStandState> implements ISarBussionessStandStateService {
 
+    @Override
+    public List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page){
+        List<ModelData> stateList = this.baseMapper.getSarBussionessStandStateProcessList(page);
+        return stateList;
+    }
+
     @Override
     public List<SarBussionessStandState> getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception{
         Integer rowCount = this.baseMapper.getBussionessStandStateCountNo(page);

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -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>
 

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml

@@ -5,6 +5,9 @@
     <resultMap id="BaseResultMap" type="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState" >
     </resultMap>
 
+    <resultMap id="BaseResultStandStateMap" type="com.adc.da.slrs.sarBussionessStandState.entity.ModelData" >
+    </resultMap>
+
     <sql id="Base_Column_List" >
         sar_bussioness_stand_state.ID,
         sar_bussioness_stand_state.STAND_ID,
@@ -33,6 +36,60 @@
         sar_bussioness_stand.VALID_FLAG
     </sql>
 
+    <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}),'%')
+            </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">
         where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0'
         <trim suffixOverrides="," >
@@ -113,6 +170,63 @@
         </trim>
     </sql>
 
+    <select id="getSarBussionessStandStateProcessList" resultMap="BaseResultStandStateMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
+        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
+        t.reviewTime DESC,
+        t.issueTime DESC
+    </select>
+
     <!-- 分页查询条件当页数据 -->
     <select id="getSarBussionessStandStatePageNo" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
         SELECT