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/impl/TjOrderServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 6fa622e..64f2e54 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -226,7 +226,7 @@
@Override
public Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus,
- String compId, String beginTime, String endTime, String tjname) {
+ String compId, String beginTime, String endTime, String tjname,String tjCategory) {
Map<String, Object> map = new HashMap<>();
map.put("checkStatus",checkStatus);
@@ -237,6 +237,7 @@
map.put("tjname",tjname);
map.put("beginTime",beginTime);
map.put("endTime",endTime);
+ map.put("p_tjCategory",tjCategory);
List<List<?>> list = tjOrderMapper.getCunChuGuoChengCustomerList(map);
Map<String,Object> map1=new HashMap<>();
map1.put("customers",list);
--
Gitblit v1.8.0