From 1e1573cd3d73e6d660e4918f693269a29880e4e9 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Mon, 19 Jun 2023 11:01:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E8=83=BD=E6=8C=89=E7=85=A7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DepositoryRecordMapper.xml              | 14 ++++++++------
 .../service/impl/ExcelServiceImpl.java             |  1 -
 .../mapper/DepositoryRecordMapper.xml              | 14 ++++++++------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 9ac9088a..80b9f692 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -612,6 +612,9 @@
         <if test="aorstate != null and aorstate != ''">
             and aorstate like CONCAT('%', #{state}, '%')
         </if>
+        <if test="mname != null and mname != ''">
+            and mname like CONCAT('%', #{mname}, '%')
+        </if>
         <if test="istransfer != null and istransfer != ''">
             and istransfer = #{istransfer}
         </if>
@@ -675,7 +678,7 @@
             and mcode = #{mcode}
         </if>
         <if test="mname != null and mname != ''">
-            and mname = #{mname}
+            and mname like CONCAT('%', #{mname}, '%')
         </if>
         <if test="code != null and code != null">
             and aorcode = #{code}
@@ -727,7 +730,7 @@
             and mcode = #{mcode}
         </if>
         <if test="mname != null and mname != ''">
-            and mname = #{mname}
+            and mname like CONCAT('%', #{mname}, '%')
         </if>
         <if test="code != null and code != null">
             and aorcode = #{code}
@@ -994,6 +997,9 @@
         <if test="placeId != null">
             and placeId = #{placeId}
         </if>
+        <if test="mname != null and mname != ''">
+            and mname like CONCAT('%', #{mname}, '%')
+        </if>
         <if test="adminorgid != null and adminorgid != ''">
             and adminorgid = #{adminorgid}
         </if>
@@ -1830,19 +1836,15 @@
             #{id}
         </foreach>
     </delete>
-
     <delete id="deleteApplicationOutRecordMinById">
         delete
         from application_out_record_min
         where parentId = #{id}
     </delete>
-
     <delete id="deleteApplicationOutRecordMinByIds" parameterType="list">
         DELETE FROM application_out_record_min WHERE parentId IN
         <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-
-
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
index c8a90281..1b9a18b8 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
@@ -757,7 +757,6 @@ public class ExcelServiceImpl implements ExcelService {
     public void executeImportForMaterialType(UserByPort userByPort) {
 // 4.通过线程池开启一个线程去执行数据库操作，主线程继续往下执行
         // 4.1开启一个线程
-
         List<Object> success = new ArrayList<>();
         String number = userByPort.getNumber();
         int successNum = 0;
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 9ac9088a..80b9f692 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -612,6 +612,9 @@
         <if test="aorstate != null and aorstate != ''">
             and aorstate like CONCAT('%', #{state}, '%')
         </if>
+        <if test="mname != null and mname != ''">
+            and mname like CONCAT('%', #{mname}, '%')
+        </if>
         <if test="istransfer != null and istransfer != ''">
             and istransfer = #{istransfer}
         </if>
@@ -675,7 +678,7 @@
             and mcode = #{mcode}
         </if>
         <if test="mname != null and mname != ''">
-            and mname = #{mname}
+            and mname like CONCAT('%', #{mname}, '%')
         </if>
         <if test="code != null and code != null">
             and aorcode = #{code}
@@ -727,7 +730,7 @@
             and mcode = #{mcode}
         </if>
         <if test="mname != null and mname != ''">
-            and mname = #{mname}
+            and mname like CONCAT('%', #{mname}, '%')
         </if>
         <if test="code != null and code != null">
             and aorcode = #{code}
@@ -994,6 +997,9 @@
         <if test="placeId != null">
             and placeId = #{placeId}
         </if>
+        <if test="mname != null and mname != ''">
+            and mname like CONCAT('%', #{mname}, '%')
+        </if>
         <if test="adminorgid != null and adminorgid != ''">
             and adminorgid = #{adminorgid}
         </if>
@@ -1830,19 +1836,15 @@
             #{id}
         </foreach>
     </delete>
-
     <delete id="deleteApplicationOutRecordMinById">
         delete
         from application_out_record_min
         where parentId = #{id}
     </delete>
-
     <delete id="deleteApplicationOutRecordMinByIds" parameterType="list">
         DELETE FROM application_out_record_min WHERE parentId IN
         <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-
-
 </mapper>
\ No newline at end of file