关键字查询修改

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));

src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java

@@ -154,7 +154,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         .build();
 
                 if (StrUtil.isNotEmpty(addTagCodeReqeust.getInvCode())) {
-                    InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addTagCodeReqeust.getCode());
+                    InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addTagCodeReqeust.getInvCode());
                     collectOrder.setShipperName(invWarehouseEntity.getName());
                 }
                 if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1) {

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -115,14 +115,14 @@
             <if test="uploadStatus != null">
                 and ico.uploadStatus = #{uploadStatus}
             </if>
-            <if test="keywords != null and 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}, '%'))
+            <if test="keyWords != null and 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}, '%'))
             </if>
             <if test="shipperName != '' and shipperName != null">
                 AND ico.shipperName LIKE concat('%', #{shipperName}, '%')