From fcb84abe060caea677b007ad2b6a3ec5bcbc8177 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Mon, 16 Aug 2021 15:50:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=8D=95=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=A1=86=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SfcDispatchController.java     | 39 +++----------------
 .../resources/mapper/SfcDispatchMapper.xml    |  4 +-
 2 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
index cc086aec..31524af4 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
@@ -1,19 +1,17 @@
 package com.foreverwin.mesnac.dispatch.controller;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.common.enums.DispatchStatusEnum;
 import com.foreverwin.mesnac.common.util.StringUtil;
-import com.foreverwin.mesnac.dispatch.dto.WorkCenterWorkTimeDTO;
-import com.foreverwin.mesnac.dispatch.model.ShopOrderRelease;
-import com.foreverwin.modular.core.exception.BusinessException;
-import com.foreverwin.modular.core.util.R;
-import com.foreverwin.modular.core.util.FrontPage;
-import com.foreverwin.modular.core.util.CommonMethods;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
 import com.foreverwin.mesnac.dispatch.service.SfcDispatchService;
+import com.foreverwin.modular.core.exception.BusinessException;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.R;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -161,35 +159,10 @@ public class SfcDispatchController {
         if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
             //TODO modify global query
             queryWrapper.lambda().and(wrapper -> wrapper
-                .like(SfcDispatch::getHandle, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getSite, frontPage.getGlobalQuery())
                 .or().like(SfcDispatch::getShopOrder, frontPage.getGlobalQuery())
                 .or().like(SfcDispatch::getSfc, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getBlankingSize, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getDispatchSeq, frontPage.getGlobalQuery())
                 .or().like(SfcDispatch::getDispatchNo, frontPage.getGlobalQuery())
                 .or().like(SfcDispatch::getDispatchStatus, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getDrawingsNo, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getDrawingsRevision, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getIsLock, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getRouterBo, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getStepId, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getOperation, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getResourceType, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getWorkCenter, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getResrce, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getEmployee, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getTurnOperation, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getIsDispatch, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getIsImport, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getRemark, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getCreateUser, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getModifyUser, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getOther1, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getOther2, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getOther3, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getOther4, frontPage.getGlobalQuery())
-                .or().like(SfcDispatch::getOther5, frontPage.getGlobalQuery())
     );
         }
         result = sfcDispatchService.page(frontPage.getPagePlus(), queryWrapper);
diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index b4cf9612..cace586f 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -1072,10 +1072,10 @@
 
     <update id="updateSfcDispatchStatus" >
         UPDATE Z_SFC_DISPATCH SET DISPATCH_STATUS = #{dispatchStatus}, MODIFY_USER = #{modifyUser}, MODIFIED_DATE_TIME = #{modifiedDateTime}
-        <if test="dispatchStatus= 'COMPLETE'">
+        <if test="dispatchStatus== 'COMPLETE'">
             , ACTUAL_COMPLETE_DATE = #{modifiedDateTime}
         </if>
-        <if test="dispatchStatus= 'START'">
+        <if test="dispatchStatus== 'START'">
             , ACTUAL_START_DATE = #{modifiedDateTime}
         </if>
         WHERE SITE = #{site} AND DISPATCH_NO = #{dispatchNo}