diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java index 0bb5ea72..f37c1e84 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java @@ -77,7 +77,7 @@ public class SfcController { sfc.setSite(site); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(sfc); - result = sfcService.pageByResrce(frontPage.getPagePlus(), queryWrapper); + result = sfcService.pageByResrce(frontPage.getPagePlus(), queryWrapper,frontPage.getGlobalQuery()); } catch (Exception e) { return R.failed(e.getMessage()); } diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java index e686cd90..b3ca5138 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java @@ -30,7 +30,7 @@ public interface SfcMapper extends BaseMapper { SfcDto findSfcData(@Param("site") String site, @Param("sfc") String sfc); - IPage pageByResrce(Page pagePlus,@Param("ew") QueryWrapper queryWrapper,@Param("locale")String locale); + IPage pageByResrce(Page pagePlus, @Param("ew") QueryWrapper queryWrapper, @Param("locale") String locale, @Param("globalQuery") String globalQuery); Map findOperationBySfc(@Param("site")String site, @Param("sfc")String sfc); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java index 90152b7c..e85c3a75 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java @@ -21,7 +21,7 @@ import java.util.Map; * @since 2021-06-02 */ public interface SfcService extends IService { - IPage pageByResrce(Page pagePlus, QueryWrapper queryWrapper); + IPage pageByResrce(Page pagePlus, QueryWrapper queryWrapper, String globalQuery); /** * 分页查询 diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java index b4a63915..ab5069c6 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java @@ -36,8 +36,8 @@ public class SfcServiceImpl extends ServiceImpl implements SfcSe private SfcMapper sfcMapper; @Override - public IPage pageByResrce(Page pagePlus, QueryWrapper queryWrapper) { - return sfcMapper.pageByResrce(pagePlus, queryWrapper, LocaleContextHolder.getLocale().getLanguage()); + public IPage pageByResrce(Page pagePlus, QueryWrapper queryWrapper, String globalQuery) { + return sfcMapper.pageByResrce(pagePlus, queryWrapper, LocaleContextHolder.getLocale().getLanguage(),globalQuery); } @Override diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml index 91c0c4e8..1dda6858 100644 --- a/meapi/src/main/resources/mapper/SfcMapper.xml +++ b/meapi/src/main/resources/mapper/SfcMapper.xml @@ -682,6 +682,9 @@ WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND (ZSD.DISPATCH_STATUS='RELEASE' OR ZSD.DISPATCH_STATUS='START') AND S.STATUS_BO IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404') AND zprt.STATUS='FINISH' AND ZPRT."RESULT"='OK' + + AND S.SFC like '%${globalQuery}%' +