From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期一, 19 五月 2025 17:13:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java index 7f56c09..79be679 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java @@ -126,7 +126,7 @@ //瀛樺偍杩囩▼涓撶敤鎺ュ彛(鎬绘) Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize, - Integer checkStatus, String compId, String beginTime, String endTime,String tjname); + Integer checkStatus, String compId, String beginTime, String endTime,String tjname,String tjCategory); //瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆) Map<String,Object> getCsCunChuGuoChengCustomerList(String tjNumber,Integer page,Integer pageSize, @@ -193,5 +193,6 @@ //瀛樺偍杩囩▼涓撶敤鎺ュ彛(鍒濆) - Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize, String compId, String beginTime, String endTime,String tjname,String tcm); + Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize, + String compId, String beginTime, String endTime,String tjname,String tcm,String deptId); } -- Gitblit v1.8.0