From 6fd4bdff55620c562e0a22eee3c95924951b04a4 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Thu, 24 Sep 2020 14:10:28 +0800 Subject: [PATCH] Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java index 35b7fbe..a5b7bfe 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java @@ -4,7 +4,10 @@ import com.kidgrow.common.model.PageResult; import com.kidgrow.common.service.ISuperService; import com.kidgrow.oprationcenter.model.SaasClientPay; +import com.kidgrow.oprationcenter.vo.SaasClientPayExcel; +import com.kidgrow.oprationcenter.vo.SaasClientPayVo; +import java.util.List; import java.util.Map; /** @@ -21,7 +24,7 @@ * @param params * @return */ - PageResult<SaasClientPay> findList(Map<String, Object> params); + PageResult<SaasClientPayVo> findList(Map<String, Object> params); /** @@ -30,5 +33,17 @@ * @return SaasClientPay对象 */ SaasClientPay findByObject(SaasClientPay saasClientPay); + SaasClientPay findModelByObject(Long hospitalId,Long departmentId,String diaId); + /** + * 批量结算 + * @param list + */ + void updateTypeList(List<String> list); + /** + * 导出 + * @param params + */ + + List<SaasClientPayExcel> export(Map<String, Object> params); } -- Gitblit v1.8.0