diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java index 54672f6..085a401 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java @@ -11,7 +11,7 @@ public interface MasterCheckItemManageMapper { public void addCheckItem(CheckItemManage checkItemManage); - public List getCheckItemManage(String id); + public List getCheckItemManage(CheckItemManageQuery checkItemManageQuery); public Integer deleteCheckItemManage(Integer id); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java index 348fc65..9af2f16 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java @@ -10,7 +10,7 @@ public interface CheckItemManageService { public void addCheckItem(CheckItemManage checkItemManage); - public List getCheckItemManage(String id); + public List getCheckItemManage(CheckItemManageQuery checkItemManageQuery); public Integer deleteCheckItemManage(Integer id); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java index ec928c2..ba87419 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java @@ -40,9 +40,9 @@ public class CheckItemManageServiceImpl implements CheckItemManageService { } @Override - public List getCheckItemManage(String id) { + public List getCheckItemManage(CheckItemManageQuery checkItemManageQuery) { - return checkItemManageMapper.getCheckItemManage(id); + return checkItemManageMapper.getCheckItemManage(checkItemManageQuery); } @Override diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml index b5b76f5..c4cc366 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml @@ -23,7 +23,7 @@ - SELECT id,startweek,endweek,checkItemInfoId,affiliate,type from lyms_checkitem where affiliate=#{affiliateId} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java index 2b755fa..fd6d172 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java @@ -127,7 +127,7 @@ public class CheckItemManageController extends BaseController { CheckItemManageQuery checkItemManageQuery = new CheckItemManageQuery(); checkItemManageQuery.setAffiliateId(affiliateId); checkItemManageQuery.setType(type); - List list = checkItemManageService.getCheckItemManage(affiliateId); + List list = checkItemManageService.getCheckItemManage(checkItemManageQuery); if (CollectionUtils.isNotEmpty(list)) { for (CheckItemManage checkItemManage : list) { if (checkItemManage.getStartWeek() <= startweek && checkItemManage.getEndWeek() >= startweek) {