Commit aacbda92eb49068a48575848e815fc8bbd2e7b4c
1 parent
9070549351
Exists in
master
and in
6 other branches
处方报表
Showing 5 changed files with 6 additions and 6 deletions
- platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java
- platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java
platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java
View file @
aacbda9
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | |
| 12 | 12 | public void addCheckItem(CheckItemManage checkItemManage); |
| 13 | 13 | |
| 14 | - public List<CheckItemManage> getCheckItemManage(String id); | |
| 14 | + public List<CheckItemManage> getCheckItemManage(CheckItemManageQuery checkItemManageQuery); | |
| 15 | 15 | |
| 16 | 16 | public Integer deleteCheckItemManage(Integer id); |
| 17 | 17 |
platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java
View file @
aacbda9
| ... | ... | @@ -10,7 +10,7 @@ |
| 10 | 10 | |
| 11 | 11 | public void addCheckItem(CheckItemManage checkItemManage); |
| 12 | 12 | |
| 13 | - public List<CheckItemManage> getCheckItemManage(String id); | |
| 13 | + public List<CheckItemManage> getCheckItemManage(CheckItemManageQuery checkItemManageQuery); | |
| 14 | 14 | |
| 15 | 15 | public Integer deleteCheckItemManage(Integer id); |
| 16 | 16 |
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java
View file @
aacbda9
| ... | ... | @@ -40,9 +40,9 @@ |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | @Override |
| 43 | - public List<CheckItemManage> getCheckItemManage(String id) { | |
| 43 | + public List<CheckItemManage> getCheckItemManage(CheckItemManageQuery checkItemManageQuery) { | |
| 44 | 44 | |
| 45 | - return checkItemManageMapper.getCheckItemManage(id); | |
| 45 | + return checkItemManageMapper.getCheckItemManage(checkItemManageQuery); | |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | @Override |
platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml
View file @
aacbda9
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | </insert> |
| 24 | 24 | |
| 25 | 25 | |
| 26 | - <select id="getCheckItemManage" resultMap="CheckItemManageMap"> | |
| 26 | + <select id="getCheckItemManage" resultMap="CheckItemManageMap" parameterType="com.lyms.platform.permission.model.CheckItemManageQuery"> | |
| 27 | 27 | SELECT id,startweek,endweek,checkItemInfoId,affiliate,type from lyms_checkitem where |
| 28 | 28 | affiliate=#{affiliateId} |
| 29 | 29 | <if test="type !=null"> |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java
View file @
aacbda9
| ... | ... | @@ -127,7 +127,7 @@ |
| 127 | 127 | CheckItemManageQuery checkItemManageQuery = new CheckItemManageQuery(); |
| 128 | 128 | checkItemManageQuery.setAffiliateId(affiliateId); |
| 129 | 129 | checkItemManageQuery.setType(type); |
| 130 | - List<CheckItemManage> list = checkItemManageService.getCheckItemManage(affiliateId); | |
| 130 | + List<CheckItemManage> list = checkItemManageService.getCheckItemManage(checkItemManageQuery); | |
| 131 | 131 | if (CollectionUtils.isNotEmpty(list)) { |
| 132 | 132 | for (CheckItemManage checkItemManage : list) { |
| 133 | 133 | if (checkItemManage.getStartWeek() <= startweek && checkItemManage.getEndWeek() >= startweek) { |