From 8805b6838c75f523b38260c12ddc3dfbd4761882 Mon Sep 17 00:00:00 2001
From: ant <antordragon@163.con>
Date: Fri, 12 Jul 2024 11:06:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/project/po/PollingTask.java    |   2 +-
 .../inspection/work/query/ReviewedQuery.java  |   1 +
 .../mapper/ConsumableDetailsMapper.xml        |   4 +-
 .../main/resources/mapper/FiveStoreMapper.xml |  58 ++++----
 .../src/main/resources/mapper/StoreMapper.xml | 125 +++++++++---------
 .../main/resources/mapper/TerminalMapper.xml  |   2 +-
 .../mapper/WrkInfoTerminalRecordMapper.xml    |   9 +-
 .../mapper/WrkProjectContractMapper.xml       |   2 +-
 8 files changed, 98 insertions(+), 105 deletions(-)

diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTask.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTask.java
index 1730f31..b9c616f 100644
--- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTask.java
+++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/PollingTask.java
@@ -81,7 +81,7 @@ public class PollingTask extends BaseEntity {
     private Integer dispatchMethod;
 
     /**
-     * 巡检方式
+     * 审核方式
      */
     @TableField(value = "review_method")
     private Integer reviewMethod;
diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java
index 6e9cf66..2caefcd 100644
--- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java
+++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java
@@ -126,4 +126,5 @@ public class ReviewedQuery extends CommonParam {
      */
     @Condition(name = "lower_task_id", type = Condition.ConditionType.in, tableName = "i")
     private List<Long> lowerTaskIds;
+
 }
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumableDetailsMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumableDetailsMapper.xml
index ee0d533..70e86bc 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumableDetailsMapper.xml
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/ConsumableDetailsMapper.xml
@@ -26,7 +26,7 @@
   <select id="findPage" resultMap="BaseResultMap">
     SELECT cd.*, ct.type FROM consumable_details cd
     LEFT JOIN consumables_total ct ON ct.total_id = cd.total_id
-    <where>
+    WHERE cd.del_state = 0
       <if test="query.taskId != null">
         AND ct.task_id = #{query.taskId}
       </if>
@@ -40,7 +40,5 @@
         <!-- 数据范围过滤 -->
         ${query.sqlParam.get('dataScope')}
       </if>
-    </where>
-
   </select>
 </mapper>
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/FiveStoreMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/FiveStoreMapper.xml
index 8cbfc3f..8d2aa01 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/FiveStoreMapper.xml
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/FiveStoreMapper.xml
@@ -34,45 +34,41 @@
   </sql>
 
   <select id="pageList" resultType="com.chushang.inspection.terminal.vo.FiveStoreVO">
-    SELECT
-      t.terminal_id AS terminalId,
-      fs.five_id AS fiveId,
-      fs.first_level_branch AS firstLevelBranch,
-      fs.secondary_branches AS secondaryBranch,
-      t.terminal_no AS terminalNo,
-      fs.store_id AS storeId,
-      t.store_no AS storeNo,
-      fs.new_year AS logoOfNewlySignedMerchantsThatYear,
-      fs.new_month AS logoOfNewlySignedMerchantsOfTheMonth,
-      fs.new_day AS logoOfNewlySignedMerchantsOnTheDay,
-      fs.client_name AS clientName,
-      fs.marketing_date AS marketingDate,
-      fs.consumption_date AS consumptionDate,
-      fs.marketer AS marketer
-    FROM st_terminal t
-    LEFT JOIN st_five_store fs ON t.terminal_id= fs.terminal_id
-    <where>
+      SELECT t.terminal_id         AS terminalId,
+             fs.five_id            AS fiveId,
+             fs.first_level_branch AS firstLevelBranch,
+             fs.secondary_branches AS secondaryBranch,
+             t.terminal_no         AS terminalNo,
+             fs.store_id           AS storeId,
+             t.store_no            AS storeNo,
+             fs.new_year           AS logoOfNewlySignedMerchantsThatYear,
+             fs.new_month          AS logoOfNewlySignedMerchantsOfTheMonth,
+             fs.new_day            AS logoOfNewlySignedMerchantsOnTheDay,
+             fs.client_name        AS clientName,
+             fs.marketing_date     AS marketingDate,
+             fs.consumption_date   AS consumptionDate,
+             fs.marketer           AS marketer
+      FROM st_terminal t
+               LEFT JOIN st_five_store fs ON t.terminal_id = fs.terminal_id
+      WHERE t.del_state = 0
       <if test="query.terminalNo != null and query.terminalNo != ''">
-        AND t.terminal_no = #{query.terminalNo}
+          AND t.terminal_no = #{query.terminalNo}
       </if>
       <if test="query.no != null and query.no != ''">
-        AND t.store_no = #{query.no}
+          AND t.store_no = #{query.no}
       </if>
       <if test="query.firstLevelBranch != null">
-        AND fs.first_level_branch = #{query.firstLevelBranch}
+          AND fs.first_level_branch = #{query.firstLevelBranch}
       </if>
-      <if test="query.secondaryBranches != null and query.secondaryBranches.size() > 0 ">
-        AND fs.secondary_branches IN
-        <foreach collection="query.secondaryBranches" item="item" index="index" open="(" close=")" separator=",">
-          #{item}
-        </foreach>
+      <if test="query.secondaryBranches != null and query.secondaryBranches.size() > 0">
+          AND fs.secondary_branches IN
+          <foreach collection="query.secondaryBranches" item="item" index="index" open="(" close=")" separator=",">
+              #{item}
+          </foreach>
       </if>
       <if test="1 == 1">
-        ${query.sqlParam.get('dataScpoe')}
+          ${query.sqlParam.get('dataScpoe')}
       </if>
-
-    </where>
-
-    ORDER BY #{query.orderBy} #{query.isAsc}
+      ORDER BY #{query.orderBy} #{query.isAsc}
   </select>
 </mapper>
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml
index 9790bce..8613015 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml
@@ -25,75 +25,74 @@
                LEFT JOIN ta_polling_task pt1 ON s.task_id = pt1.id
                LEFT JOIN ta_polling_task pt2 ON s.lower_task_id = pt2.id
                LEFT JOIN st_terminal t ON s.store_id = t.store_id
-      <where>
-          <if test="query.storeId != null">
-              AND s.store_id = #{query.storeId}
-          </if>
-          <if test="query.storeIds != null and query.storeIds.size() > 0">
-              AND s.store_id IN <foreach collection="query.storeIds" open="(" close=")" separator="," item="storeId">
+      WHERE s.del_state = 0
+      <if test="query.storeId != null">
+          AND s.store_id = #{query.storeId}
+      </if>
+      <if test="query.storeIds != null and query.storeIds.size() > 0">
+          AND s.store_id IN
+          <foreach collection="query.storeIds" open="(" close=")" separator="," item="storeId">
               #{storeId}
           </foreach>
-          </if>
-          <if test="query.storeNo != null ">
-              AND s.store_no = #{query.storeNo}
-          </if>
-          <if test="query.terminalNo != null">
-              AND t.terminal_no = #{query.terminalNo}
-          </if>
+      </if>
+      <if test="query.storeNo != null">
+          AND s.store_no = #{query.storeNo}
+      </if>
+      <if test="query.terminalNo != null">
+          AND t.terminal_no = #{query.terminalNo}
+      </if>
 
-          <if test="query.taskId != null">
-              AND s.task_id = #{query.taskId}
-          </if>
-          <if test="query.lowerTaskIds != null  and query.lowerTaskIds.size() > 0">
-              AND s.lower_task_id IN
-              <foreach collection="query.lowerTaskIds" open="(" close=")" separator="," item="lowerTaskId">
-                  #{lowerTaskId}
-              </foreach>
-          </if>
-          <if test="query.state != null ">
-              AND s.state = #{query.state}
-          </if>
+      <if test="query.taskId != null">
+          AND s.task_id = #{query.taskId}
+      </if>
+      <if test="query.lowerTaskIds != null  and query.lowerTaskIds.size() > 0">
+          AND s.lower_task_id IN
+          <foreach collection="query.lowerTaskIds" open="(" close=")" separator="," item="lowerTaskId">
+              #{lowerTaskId}
+          </foreach>
+      </if>
+      <if test="query.state != null">
+          AND s.state = #{query.state}
+      </if>
 
-          <if test="query.occupy != null ">
-              AND t.occupy = #{query.occupy}
-          </if>
-          <if test="query.terminalSn != null">
-              AND t.terminal_sn = #{query.terminalSn}
-          </if>
-          <if test="query.storeName != null and query.storeName != ''">
-              AND s.store_name like concat('%',#{query.storeName},'%')
-          </if>
-          <if test="query.storeContact != null  and query.storeContact != ''">
-              AND s.store_contact like concat('%',#{query.storeContact},'%')
-          </if>
-          <if test="query.storePhone != null and query.storePhone != ''">
-              AND s.store_phone  like concat('%',#{query.storePhone},'%')
-          </if>
+      <if test="query.occupy != null">
+          AND t.occupy = #{query.occupy}
+      </if>
+      <if test="query.terminalSn != null">
+          AND t.terminal_sn = #{query.terminalSn}
+      </if>
+      <if test="query.storeName != null and query.storeName != ''">
+          AND s.store_name like concat('%', #{query.storeName}, '%')
+      </if>
+      <if test="query.storeContact != null  and query.storeContact != ''">
+          AND s.store_contact like concat('%', #{query.storeContact}, '%')
+      </if>
+      <if test="query.storePhone != null and query.storePhone != ''">
+          AND s.store_phone like concat('%', #{query.storePhone}, '%')
+      </if>
 
-          <if test="query.storeAddress != null and query.storeAddress != ''">
-              AND s.store_address  like concat('%',#{query.storeAddress},'%')
-          </if>
-          <if test="query.specialNum != null and query.specialNum != ''">
-              AND s.special_num  like concat('%',#{query.specialNum},'%')
-          </if>
-          <if test="query.shopName != null and query.shopName != ''">
-              AND s.shop_name  like concat('%',#{query.shopName},'%')
-          </if>
-          <if test="query.startTime != null ">
-              AND s.create_time >= #{query.startTime}
-          </if>
-          <if test="query.endTime != null " >
-              AND s.create_time &lt;= #{query.endTime}
-          </if>
-          <if test="query.createTime != null and query.createTime.size() > 0">
-              AND
-                  s.create_time BETWEEN #{query.createTime[0]}
+      <if test="query.storeAddress != null and query.storeAddress != ''">
+          AND s.store_address like concat('%', #{query.storeAddress}, '%')
+      </if>
+      <if test="query.specialNum != null and query.specialNum != ''">
+          AND s.special_num like concat('%', #{query.specialNum}, '%')
+      </if>
+      <if test="query.shopName != null and query.shopName != ''">
+          AND s.shop_name like concat('%', #{query.shopName}, '%')
+      </if>
+      <if test="query.startTime != null">
+          AND s.create_time >= #{query.startTime}
+      </if>
+      <if test="query.endTime != null">
+          AND s.create_time &lt;= #{query.endTime}
+      </if>
+      <if test="query.createTime != null and query.createTime.size() > 0">
+          AND s.create_time BETWEEN #{query.createTime[0]}
               AND #{query.createTime[1]}
-          </if>
-          <if test="1==1">
-              ${query.sqlParam.get('dataScpoe')}
-          </if>
-      </where>
+      </if>
+      <if test="1 == 1">
+          ${query.sqlParam.get('dataScpoe')}
+      </if>
       ORDER BY #{query.orderBy} #{query.isAsc}
   </select>
 </mapper>
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml
index c4f15d2..9ee494b 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml
@@ -112,8 +112,8 @@
                ti.work_location       AS workLocation,
                ti.work_adderss        AS workAddress
         FROM st_terminal t
+                 LEFT JOIN st_terminal_ins ti ON t.terminal_id = ti.terminal_id
                  INNER JOIN st_store s ON t.store_id = s.store_id
-                 INNER JOIN st_terminal_ins ti ON t.terminal_id = ti.terminal_id
                  INNER JOIN ta_polling_task pt ON t.task_id = pt.id
                  INNER JOIN wrk_project p ON pt.project_id = p.project_id
     </sql>
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoTerminalRecordMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoTerminalRecordMapper.xml
index fd9690b..f841db1 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoTerminalRecordMapper.xml
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkInfoTerminalRecordMapper.xml
@@ -59,11 +59,10 @@
                  INNER JOIN wrk_info_store_record s ON i.wrk_id = s.wrk_id
                  INNER JOIN wrk_info_terminal_record t ON i.wrk_id = t.wrk_id
                  LEFT JOIN wrk_info_terminal_ins_record ti ON i.wrk_id = ti.wrk_id
-        <where>
-            <if test="1 == 1">
-                ${query.sqlParam.get('sqlWhere')}
-            </if>
-        </where>
+        WHERE i.del_state = 0
+        <if test="1 == 1">
+            ${query.sqlParam.get('sqlWhere')}
+        </if>
         ORDER BY #{query.orderBy} #{query.isAsc}
     </select>
 </mapper>
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml
index 466cf3b..fa34eab 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectContractMapper.xml
@@ -31,6 +31,6 @@
 
   <select id="queryListByProjectIds" resultMap="BaseResultMap" parameterType="java.util.List">
     select <include refid="Base_Column_List" />  from wrk_project_contract
-             where project_id = #{projectId} order by create_time desc limit 1
+    WHERE del_state = 0 AND project_id = #{projectId} order by create_time desc limit 1
   </select>
 </mapper>