From f68b6f735eb1b0f3702022d3a25510fcd21d1cf8 Mon Sep 17 00:00:00 2001 From: renkang <8417338+k94314517@user.noreply.gitee.com> Date: 星期四, 09 一月 2025 18:30:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractBillService.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractBillService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractBillService.java index 4fbdf3e..b3ad156 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractBillService.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractBillService.java @@ -1,8 +1,11 @@ package com.doumee.service.business; +import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.dao.business.model.YwContractBill; +import com.doumee.dao.business.vo.YwContractBillDataVO; + import java.util.List; /** @@ -25,7 +28,7 @@ * * @param id 涓婚敭 */ - void deleteById(Integer id); + void deleteById(Integer id, LoginUserInfo user); /** * 鍒犻櫎 @@ -39,7 +42,7 @@ * * @param ids 涓婚敭闆� */ - void deleteByIdInBatch(List<Integer> ids); + void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user); /** * 涓婚敭鏇存柊 @@ -94,4 +97,16 @@ * @return long */ long count(YwContractBill ywContractBill); + + YwContractBill getDetail(Integer id); + + /** + * 澶勭悊璐﹀崟缂栧彿 + */ + void dealDayBillCode(); + + List<YwContractBill> getCanBackBill(YwContractBill model); + + + YwContractBillDataVO getWaitDealList(Integer contractId); } -- Gitblit v1.9.3