diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java index d480c35f..91b6271b 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java @@ -127,12 +127,16 @@ public class WorkCenterController { return R.ok(workCenterService.removeByIds(ids)); } + /** + * 查询工作中心和工作中心描述 + * @param frontPage + * @return + */ @ResponseBody @GetMapping("/selectWorkCenter") public R getWorkCenterWcList(FrontPage frontPage){ List result; String workCenter=frontPage.getGlobalQuery(); - result = workCenterService.workCenterlist(workCenter); - return R.ok(result); + return R.ok(workCenterService.workCenterlist(frontPage.getPagePlus(),workCenter)); } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java index 1cd24c7f..3458d210 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/WorkCenterMapper.java @@ -1,12 +1,11 @@ package com.foreverwin.mesnac.meapi.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.meapi.model.WorkCenter; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.List; - /** *

* Mapper 接口 @@ -17,5 +16,5 @@ import java.util.List; */ @Repository public interface WorkCenterMapper extends BaseMapper { - List workCenterlist(@Param("site") String site,@Param("workCenter") String workCenter); + IPage workCenterlist(IPage page, @Param("site") String site, @Param("workCenter") String workCenter); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java index 63511881..9571219a 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/WorkCenterService.java @@ -26,5 +26,5 @@ public interface WorkCenterService extends IService { List selectList(WorkCenter workCenter); - List workCenterlist(String workCenter); + IPage workCenterlist(IPage page,String workCenter); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java index 90a23c74..107ef17a 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/WorkCenterServiceImpl.java @@ -44,8 +44,8 @@ public class WorkCenterServiceImpl extends ServiceImpl workCenterlist(String workCenter) { + public IPage workCenterlist(IPage page,String workCenter) { String site = CommonMethods.getSite(); - return workCenterMapper.workCenterlist(site, workCenter); + return workCenterMapper.workCenterlist(page,site, workCenter); } } \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/WorkCenterMapper.xml b/meapi/src/main/resources/mapper/WorkCenterMapper.xml index 87b09ded..3ee6311e 100644 --- a/meapi/src/main/resources/mapper/WorkCenterMapper.xml +++ b/meapi/src/main/resources/mapper/WorkCenterMapper.xml @@ -52,8 +52,8 @@ LEFT JOIN WORK_CENTER_T B ON A.HANDLE=B.WORK_CENTER_BO WHERE - (A.WORK_CENTER like '%${workCenter}' OR - B.DESCRIPTION like '%${workCenter}') AND + (A.WORK_CENTER like '%${workCenter}%' OR + B.DESCRIPTION like '%${workCenter}%') AND A.SITE = #{site}