Browse Source

申购问题处理

yzc 1 năm trước cách đây
mục cha
commit
18bfa69af4

+ 1 - 1
hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -117,7 +117,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
         wrapper.eq("p", Purchase::getPayStatus, dto.getPayStatus());
         wrapper.like("p", Purchase::getCode, dto.getCode());// 采购单号
         wrapper.eq("p", Purchase::getSupplyId, dto.getSupplyId());// 供应商ID
-        wrapper.eq("p", Purchase::getCode, dto.getKeyword());// 根据采购单号关键字搜索
+        wrapper.like("p", Purchase::getCode, dto.getKeyword());// 根据采购单号关键字搜索
         wrapper.ge("p", Purchase::getAmount, dto.getStartAmount());// 采购开始金额
         wrapper.le("p", Purchase::getAmount, dto.getEndAmount());// 采购结束金额
         wrapper.ge("P", Purchase::getCreateTime, dto.getBeginTime());// 采购开始时间

+ 6 - 3
hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -100,6 +100,8 @@ import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
 
@@ -119,9 +121,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     public static final int VALUE = 20;
     private static final SimpleDateFormat sdf = new SimpleDateFormat("dd/MMM/yyyy", Locale.ENGLISH);
 
-    @Qualifier(ThreadPoolConfig.threadPoolTaskExecutor)
-    @Autowired
-    private ThreadPoolExecutor threadPoolExecutor;
+    //    @Qualifier(ThreadPoolConfig.threadPoolTaskExecutor)
+//    @Autowired
+//    private ThreadPoolExecutor threadPoolExecutor;
+    private ExecutorService threadPoolExecutor = Executors.newCachedThreadPool();
 
     @Autowired
     private CustomerService customerService;