From e489b24c9fd9af7cc0a4065bc462eec07350373e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Fri, 4 Jun 2021 09:12:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=8F=90=E4=BA=A4=20=20=EF=BC=88=E7=89=A9=E6=96=99?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E5=BA=8F=E3=80=81=E5=B7=A5=E6=AD=A5=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=A1=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meapi/controller/OperationController.java | 2 +- .../controller/RouterSubstepController.java | 10 +++++++ .../meapi/mapper/RouterSubstepMapper.java | 6 ++-- .../mesnac/meapi/model/RouterSubstep.java | 3 +- .../meapi/service/RouterSubstepService.java | 5 +++- .../impl/RouterSubstepServiceImpl.java | 18 +++++++++--- .../main/resources/mapper/OperationMapper.xml | 17 ++++++----- .../resources/mapper/RouterSubstepMapper.xml | 28 +++++++++++++++++++ 8 files changed, 71 insertions(+), 18 deletions(-) diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java index fe81105b..07a18dd3 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/OperationController.java @@ -147,7 +147,7 @@ public class OperationController { queryWrapper .like("O.OPERATION", frontPage.getGlobalQuery()) .or().like("OT.DESCRIPTION", frontPage.getGlobalQuery()) - .or().like("RS.SUB_STEP",frontPage.getGlobalQuery()); + .or().like("RS.STEP_ID",frontPage.getGlobalQuery()); } result = operationService.selectPage(frontPage.getPagePlus(), queryWrapper); } catch (Exception e) { diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/RouterSubstepController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/RouterSubstepController.java index 1863dd8a..019d2934 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/RouterSubstepController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/RouterSubstepController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.meapi.model.RouterSubstep; import com.foreverwin.mesnac.meapi.service.RouterSubstepService; +import com.foreverwin.mesnac.meapi.util.StringUtils; import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; @@ -120,5 +121,14 @@ public class RouterSubstepController { public R removeByIds(List ids){ return R.ok(routerSubstepService.removeByIds(ids)); } + @GetMapping("getRouterStepBo") + public R getRouterStepBo(FrontPage page,String item,String operation){ + String globalQuery = page.getGlobalQuery(); + if(StringUtils.notBlank(globalQuery)){ + globalQuery = globalQuery.toUpperCase(); + } + return R.ok(routerSubstepService.getRouterStepBo(page.getPagePlus(),globalQuery,item,operation)); + } + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterSubstepMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterSubstepMapper.java index fa3224ae..2a4537be 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterSubstepMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterSubstepMapper.java @@ -1,7 +1,9 @@ package com.foreverwin.mesnac.meapi.mapper; -import com.foreverwin.mesnac.meapi.model.RouterSubstep; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.RouterSubstep; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; /** @@ -14,5 +16,5 @@ import org.springframework.stereotype.Repository; */ @Repository public interface RouterSubstepMapper extends BaseMapper { - + IPage findRoutetStepBoByOperation(IPagepage,@Param("globalQuery") String globalQuery, @Param("language")String language,@Param("item")String item, @Param("site") String site, @Param("operation")String operation); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java index 0bbf98f9..776497b0 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java @@ -41,7 +41,8 @@ public class RouterSubstep extends Model { private String description; @TableField("LONG_DESCRIPTION") private String longDescription; - + @TableField(exist = false) + private String site; public String getHandle() { return handle; diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterSubstepService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterSubstepService.java index 523c84a0..5c08d7e5 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterSubstepService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterSubstepService.java @@ -1,8 +1,9 @@ package com.foreverwin.mesnac.meapi.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.meapi.model.RouterSubstep; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.meapi.model.RouterSubstep; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -26,4 +27,6 @@ public interface RouterSubstepService extends IService { List selectList(RouterSubstep routerSubstep); + IPage getRouterStepBo(Page page,String globalQuery, String item, String operation); + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterSubstepServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterSubstepServiceImpl.java index ec389661..8d4c796b 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterSubstepServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterSubstepServiceImpl.java @@ -1,14 +1,17 @@ package com.foreverwin.mesnac.meapi.service.impl; -import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.meapi.model.RouterSubstep; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.meapi.mapper.RouterSubstepMapper; +import com.foreverwin.mesnac.meapi.model.RouterSubstep; import com.foreverwin.mesnac.meapi.service.RouterSubstepService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.FrontPage; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -42,5 +45,12 @@ public class RouterSubstepServiceImpl extends ServiceImpl getRouterStepBo(Page page,String globalQuery, String item, String operation) { + String site = CommonMethods.getSite(); + String language = LocaleContextHolder.getLocale().getLanguage(); + return routerSubstepMapper.findRoutetStepBoByOperation(page,globalQuery,language,item,site,operation); + } + } \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/OperationMapper.xml b/meapi/src/main/resources/mapper/OperationMapper.xml index b753082e..6508a0ab 100644 --- a/meapi/src/main/resources/mapper/OperationMapper.xml +++ b/meapi/src/main/resources/mapper/OperationMapper.xml @@ -283,17 +283,16 @@ + SELECT DISTINCT RS2.SUBSTEP ,RS2.DESCRIPTION + FROM OPERATION O + LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO AND OT.LOCALE=#{language} + INNER JOIN ROUTER_OPERATION RO ON RO.OPERATION_BO = (SUBSTR(O.HANDLE,1,(SELECT INSTR(O.HANDLE , ',', -1, 1) + FROM DUAL)-1) || ',#' ) + INNER JOIN ROUTER_STEP RS ON RS.HANDLE = RO.ROUTER_STEP_BO + INNER JOIN ROUTER_SUBSTEP RS2 ON RS2.ROUTER_STEP_BO = RS.HANDLE + INNER JOIN ROUTER R ON R.HANDLE = RS.ROUTER_BO + INNER JOIN SHOP_ORDER SO ON SO.PLANNED_ROUTER_BO = R.HANDLE + INNER JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO + + O.SITE = #{site} + + AND O.OPERATION = #{operation} + + + AND I.ITEM = #{item} + + + AND ( + rs2.SUBSTEP LIKE '%${globalQuery}%' + OR rs2.DESCRIPTION LIKE '%${globalQuery}%' + ) + + + ORDER BY rs2.SUBSTEP +