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 @@ and aorstate like CONCAT('%', #{state}, '%') + + and mname like CONCAT('%', #{mname}, '%') + and istransfer = #{istransfer} @@ -675,7 +678,7 @@ and mcode = #{mcode} - and mname = #{mname} + and mname like CONCAT('%', #{mname}, '%') and aorcode = #{code} @@ -727,7 +730,7 @@ and mcode = #{mcode} - and mname = #{mname} + and mname like CONCAT('%', #{mname}, '%') and aorcode = #{code} @@ -994,6 +997,9 @@ and placeId = #{placeId} + + and mname like CONCAT('%', #{mname}, '%') + and adminorgid = #{adminorgid} @@ -1830,19 +1836,15 @@ #{id} - delete from application_out_record_min where parentId = #{id} - DELETE FROM application_out_record_min WHERE parentId IN #{id} - - \ 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 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 @@ and aorstate like CONCAT('%', #{state}, '%') + + and mname like CONCAT('%', #{mname}, '%') + and istransfer = #{istransfer} @@ -675,7 +678,7 @@ and mcode = #{mcode} - and mname = #{mname} + and mname like CONCAT('%', #{mname}, '%') and aorcode = #{code} @@ -727,7 +730,7 @@ and mcode = #{mcode} - and mname = #{mname} + and mname like CONCAT('%', #{mname}, '%') and aorcode = #{code} @@ -994,6 +997,9 @@ and placeId = #{placeId} + + and mname like CONCAT('%', #{mname}, '%') + and adminorgid = #{adminorgid} @@ -1830,19 +1836,15 @@ #{id} - delete from application_out_record_min where parentId = #{id} - DELETE FROM application_out_record_min WHERE parentId IN #{id} - - \ No newline at end of file