1. 接口联调

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;

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;
+
 }

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>

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/FiveStoreMapper.xml

@@ -34,8 +34,7 @@
   </sql>
 
   <select id="pageList" resultType="com.chushang.inspection.terminal.vo.FiveStoreVO">
-    SELECT
-      t.terminal_id AS terminalId,
+      SELECT t.terminal_id         AS terminalId,
              fs.five_id            AS fiveId,
              fs.first_level_branch AS firstLevelBranch,
              fs.secondary_branches AS secondaryBranch,
@@ -51,7 +50,7 @@
              fs.marketer           AS marketer
       FROM st_terminal t
                LEFT JOIN st_five_store fs ON t.terminal_id = fs.terminal_id
-    <where>
+      WHERE t.del_state = 0
       <if test="query.terminalNo != null and query.terminalNo != ''">
           AND t.terminal_no = #{query.terminalNo}
       </if>
@@ -70,9 +69,6 @@
       <if test="1 == 1">
           ${query.sqlParam.get('dataScpoe')}
       </if>
-
-    </where>
-
       ORDER BY #{query.orderBy} #{query.isAsc}
   </select>
 </mapper>

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/StoreMapper.xml

@@ -25,12 +25,13 @@
                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>
+      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">
+          AND s.store_id IN
+          <foreach collection="query.storeIds" open="(" close=")" separator="," item="storeId">
               #{storeId}
           </foreach>
       </if>
@@ -86,14 +87,12 @@
           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 s.create_time BETWEEN #{query.createTime[0]}
               AND #{query.createTime[1]}
       </if>
       <if test="1 == 1">
           ${query.sqlParam.get('dataScpoe')}
       </if>
-      </where>
       ORDER BY #{query.orderBy} #{query.isAsc}
   </select>
 </mapper>

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>

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>
+        WHERE i.del_state = 0
         <if test="1 == 1">
             ${query.sqlParam.get('sqlWhere')}
         </if>
-        </where>
         ORDER BY #{query.orderBy} #{query.isAsc}
     </select>
 </mapper>

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>