diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 0b50222f7..4f168fccc 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -161,7 +161,7 @@ public class IoCollectOrderController extends BaseController { return ResultVOUtils.success(orderResponses.get(0)); else { IoCollectSet collectSet = collectSetService.getSet(); - if (IntUtil.value(collectSet.getAutoDealOrder())) { + if (IntUtil.value(collectSet.getAutoAllotOrder())) { request.setTagStatus(1); orderResponses = collectOrderService.filterList(request); return ResultVOUtils.success(orderResponses.get(0)); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index 7e766459e..4024de102 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -154,7 +154,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl and ico.uploadStatus = #{uploadStatus} - - and (ico.billNo like concat('%', #{keywords}, '%') - or ico.fromCorp like concat('%', #{keywords}, '%') - or ico.fromCorpName like concat('%', #{keywords}, '%') - or ico.workPlaceCode like concat('%', #{keywords}, '%') - or ico.busType like concat('%', #{keywords}, '%') - or ico.fromCorpName like concat('%', #{keywords}, '%') - or ico.fromType like concat('%', #{keywords}, '%')) + + and (ico.billNo like concat('%', #{keyWords}, '%') + or ico.fromCorp like concat('%', #{keyWords}, '%') + or ico.fromCorpName like concat('%', #{keyWords}, '%') + or ico.workPlaceCode like concat('%', #{keyWords}, '%') + or ico.busType like concat('%', #{keyWords}, '%') + or ico.fromCorpName like concat('%', #{keyWords}, '%') + or ico.fromType like concat('%', #{keyWords}, '%')) AND ico.shipperName LIKE concat('%', #{shipperName}, '%')