From 0995bd6cb35f4f95e4e66f7de38709133821f8c1 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Fri, 15 Mar 2024 16:03:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=9C=B0=E7=9B=B4=E8=BD=AC=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkSiteDirectManageController.java       |  2 +-
 .../material/mapper/BackRecordMapper.java     |  1 -
 .../mapper/material/BackRecordMapper.xml      |  3 ---
 .../material/WorkSiteDirectManageMapper.xml   | 21 +++++++++++++++++++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
index 401050c0..6e7bcaba 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
@@ -180,7 +180,7 @@ public class WorkSiteDirectManageController extends BaseController {
         backApplyInfo.setCode(tcode);
         //创建退料任务（tm_task）
         backApplyInfo.setTaskType(36);
-        backApplyInfo.setTaskStatus("37");
+        backApplyInfo.setTaskStatus("40");
         int res5 = workSiteDirectManageService.insertTmTaskByBackInfo(backApplyInfo);
         if (res5 == 0) {
             return AjaxResult.error("退料任务新建失败");
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java
index 3e431154..61ec39ab 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java
@@ -23,7 +23,6 @@ public interface BackRecordMapper {
      */
     List<BackRecord> getBackRecordList(BackRecord bean);
 
-    int insertBcd(BackApplyInfo backApplyInfo);
 
     int insertCheckDetails(BackApplyInfo backApplyInfo);
 
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
index 372bd129..1b45bd86 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml
@@ -3,9 +3,6 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.sgzb.material.mapper.BackRecordMapper">
-    <insert id="insertBcd">
-
-    </insert>
     <insert id="insertCheckDetails">
         insert into back_check_details
         (
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
index 2679398a..ee2be062 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
@@ -390,6 +390,27 @@
                 LEFT JOIN bm_project_lot bpl1 ON bpl1.lot_id = bai1.project_id
                 LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
                 LEFT JOIN bm_unit_info bui1 ON bui1.unit_id = bai1.unit_id
+        WHERE
+            1=1
+        <if test="record.keyWord != null and record.keyWord != ''">
+            and (bpl.lot_name like concat('%', #{keyWord}, '%') or
+                 bui.unit_name like concat('%', #{keyWord}, '%'))
+        </if>
+        <if test="record.lotId != null and record.lotId != ''">
+            and bpl.lot_id = #{record.lotId}
+        </if>
+        <if test="record.unitId != null and record.unitId != ''">
+            and bui.unitId = #{record.unitId}
+        </if>
+        <if test="record.backMan != null and record.backMan != ''">
+            and dai.back_man like concat('%', #{backMan}, '%')
+        </if>
+        <if test="record.backPhone != null and record.backPhone != ''">
+            and dai.back_phone like concat('%', #{backPhone}, '%')
+        </if>
+        <if test="record.status != null and record.status != ''">
+            and dai.status = #{status}
+        </if>
     </select>
     <select id="getDirectApplyInfoById" resultType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
         select * from direct_apply_info where id = #{id}