From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 2225356..89b2d7e 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
@@ -68,7 +68,7 @@
*/
@Override
public List<TjOrder> selectExportOrderList(TjOrder tjOrder) {
- List<TjOrder> tjOrders = tjOrderMapper.selectExportOrderList(tjOrder);
+ List<TjOrder> tjOrders = tjOrderMapper.selectTjOrderList(tjOrder);
for (TjOrder order : tjOrders) {
if (order.getUserId()!=null){
TjCustomer byId = customerService.getById(order.getUserId());
@@ -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);
@@ -358,6 +359,11 @@
}
@Override
+ public int getOrderCountByTjNum(String tjNum) {
+ return tjOrderMapper.getOrderCountByTjNum(tjNum);
+ }
+
+ @Override
public Map<String, Object> getgetBghsList(String tjNumber, Integer page, Integer pageSize,
String compId, String beginTime, String endTime, String tjname) {
Map<String, Object> map = new HashMap<>();
@@ -416,6 +422,11 @@
}
@Override
+ public List<String> getJianChaTjNumWsh() {
+ return tjOrderMapper.getJianChaTjNumWsh();
+ }
+
+ @Override
public void tjQiandaodengji(String tjNum) {
Map<String, Object> map = new HashMap<>();
map.put("tjNum",tjNum);
@@ -433,7 +444,8 @@
}
@Override
- public Map<String, Object> getTjBgdyList(Integer pageNum, Integer pageSize, Integer dyzt, String tjNum, String name, String dw, String djbeginTime, String djendTime) {
+ public Map<String, Object> getTjBgdyList(Integer pageNum, Integer pageSize, Integer dyzt,
+ String tjNum, String name, String dw, String djbeginTime, String djendTime) {
Map<String, Object> map = new HashMap<>();
map.put("page",pageNum);
@@ -453,8 +465,10 @@
}
@Override
- public Map<String, Object> getYxJcList(String tjNumber, Integer page, Integer pageSize, String compId, String beginTime, String endTime, String tjname,String tcm) {
+ public Map<String, Object> getYxJcList(Integer checkStatus ,String tjNumber, Integer page, Integer pageSize,
+ String compId, String beginTime, String endTime, String tjname,String tcm,String deptId) {
Map<String, Object> map = new HashMap<>();
+ map.put("checkStatus",checkStatus);
map.put("page",page);
map.put("pageSize",pageSize);
map.put("tjNumber",tjNumber);
@@ -463,6 +477,7 @@
map.put("tcm",tcm);
map.put("beginTime",beginTime);
map.put("endTime",endTime);
+ map.put("ks",deptId);
List<List<?>> list = tjOrderMapper.getYxJcList(map);
Map<String,Object> map1=new HashMap<>();
map1.put("customers",list);
--
Gitblit v1.8.0