Merge remote-tracking branch 'origin/master'

meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java

@@ -77,7 +77,7 @@ public class SfcController {
             sfc.setSite(site);
             QueryWrapper<SfcDto> 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());
         }

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java

@@ -30,7 +30,7 @@ public interface SfcMapper extends BaseMapper<Sfc> {
 
     SfcDto findSfcData(@Param("site") String site, @Param("sfc") String sfc);
 
-    IPage pageByResrce(Page<Sfc> pagePlus,@Param("ew") QueryWrapper<SfcDto> queryWrapper,@Param("locale")String locale);
+    IPage pageByResrce(Page<Sfc> pagePlus, @Param("ew") QueryWrapper<SfcDto> queryWrapper, @Param("locale") String locale, @Param("globalQuery") String globalQuery);
 
     Map findOperationBySfc(@Param("site")String site, @Param("sfc")String sfc);
 

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<Sfc> {
-    IPage<Sfc> pageByResrce(Page<Sfc> pagePlus, QueryWrapper<SfcDto> queryWrapper);
+    IPage<Sfc> pageByResrce(Page<Sfc> pagePlus, QueryWrapper<SfcDto> queryWrapper, String globalQuery);
 
     /**
      *  分页查询

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java

@@ -36,8 +36,8 @@ public class SfcServiceImpl extends ServiceImpl<SfcMapper, Sfc> implements SfcSe
     private SfcMapper sfcMapper;
 
     @Override
-    public IPage pageByResrce(Page<Sfc> pagePlus, QueryWrapper<SfcDto> queryWrapper) {
+    public IPage pageByResrce(Page<Sfc> pagePlus, QueryWrapper<SfcDto> queryWrapper, String globalQuery) {
-        return sfcMapper.pageByResrce(pagePlus, queryWrapper, LocaleContextHolder.getLocale().getLanguage());
+        return sfcMapper.pageByResrce(pagePlus, queryWrapper, LocaleContextHolder.getLocale().getLanguage(),globalQuery);
     }
 
     @Override

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'
+        <if test="globalQuery!=null and globalQuery!=''">
+            AND S.SFC like '%${globalQuery}%'
+        </if>
         </select>