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 | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 349778c..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
@@ -11,6 +11,7 @@
import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.hosp.service.ITjPackageService;
import com.ltkj.hosp.vodomain.LineChartsVo;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ltkj.hosp.mapper.TjOrderMapper;
@@ -23,6 +24,7 @@
* @date 2022-11-21
*/
@Service
+@Slf4j
public class TjOrderServiceImpl extends ServiceImpl<TjOrderMapper, TjOrder> implements ITjOrderService {
@Autowired
private TjOrderMapper tjOrderMapper;
@@ -66,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());
@@ -224,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);
@@ -235,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);
@@ -244,7 +247,8 @@
}
@Override
- public Map<String, Object> getCsCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus, String compId, String beginTime, String endTime, String tjname) {
+ public Map<String, Object> getCsCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize,
+ Integer checkStatus, String compId, String beginTime, String endTime, String tjname,String tcm) {
Map<String, Object> map = new HashMap<>();
map.put("checkStatus",checkStatus);
map.put("page",page);
@@ -252,6 +256,7 @@
map.put("tjNumber",tjNumber);
map.put("compId",compId);
map.put("tjname",tjname);
+ map.put("tcm",tcm);
map.put("beginTime",beginTime);
map.put("endTime",endTime);
List<List<?>> list = tjOrderMapper.getCsCunChuGuoChengCustomerList(map);
@@ -277,12 +282,14 @@
}
@Override
- public List<Map<String, String>> selectDjdInfo(String tjNumber) {
+ public List<Map<String, Object>> selectDjdInfo(String tjNumber) {
+ log.info("浼犻�掕繘鏉ョ殑浣撴鍙蜂负: "+tjNumber);
return tjOrderMapper.selectDjdInfo(tjNumber);
}
@Override
public Map<String, Object> selectDjdUserInfo(String tjNumber) {
+ log.info("浼犻�掕繘鏉ョ殑浣撴鍙蜂负: "+tjNumber);
return tjOrderMapper.selectDjdUserInfo(tjNumber);
}
@@ -349,6 +356,11 @@
@Override
public Boolean delHuoQuZlsqdh(String cardId, String bldh) {
return tjOrderMapper.delHuoQuZlsqdh(cardId,bldh);
+ }
+
+ @Override
+ public int getOrderCountByTjNum(String tjNum) {
+ return tjOrderMapper.getOrderCountByTjNum(tjNum);
}
@Override
@@ -427,7 +439,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);
@@ -445,4 +458,25 @@
map1.put("total",map.get("total"));
return map1;
}
+
+ @Override
+ 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);
+ map.put("compId",compId);
+ map.put("tjname",tjname);
+ 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);
+ map1.put("total",map.get("total"));
+ return map1;
+ }
}
--
Gitblit v1.8.0