From 1356787741a823dde5ed40bb19dece59dd979511 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 30 五月 2025 15:36:51 +0800
Subject: [PATCH] zjh20250530
---
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
index d402a70..5e95ec5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -3,9 +3,12 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.mapper.TjCustomerMapper;
+import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.web.controller.system.TjCheckController;
import com.ltkj.web.controller.system.TjReportController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,8 +18,10 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -33,6 +38,8 @@
private TjCheckController tjCheckController;
@Autowired
private TjCustomerMapper tjCustomerMapper;
+ @Autowired
+ private ITjOrderService tjOrderService;
/**
* 鎻愪緵缁欎笁鏂硅皟鐢ㄧ殑鎶ュ憡鏌ョ湅鎺ュ彛
@@ -40,9 +47,16 @@
* @param json
*/
@PostMapping("/viewReport")
- public void viewReport(HttpServletResponse response, @RequestBody String json){
+ public void viewReport(HttpServletResponse response, @RequestBody String json) throws IOException {
JSONObject entries = JSONUtil.parseObj(json);
String tjNum = entries.getStr("tjNum");
+ LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjOrder::getHeshouStatus,1);
+ wrapper.eq(TjOrder::getTjNumber,tjNum);
+ List<TjOrder> list = tjOrderService.list(wrapper);
+ if (list.isEmpty()){
+ return;
+ }
tjReportController.preview(response,true,tjNum);
}
@@ -54,6 +68,13 @@
@PostMapping("/reportData")
public AjaxResult reportData(@RequestBody String json){
String tjNum = JSONUtil.parseObj(json).getStr("tjNum");
+ LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjOrder::getHeshouStatus,1);
+ wrapper.eq(TjOrder::getTjNumber,tjNum);
+ List<TjOrder> list = tjOrderService.list(wrapper);
+ if (list.isEmpty()){
+ return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ }
JSONObject entries = JSONUtil.parseObj(tjCheckController.updateCheckType(tjNum));
removeNullFields(entries);
return JSONUtil.toBean(entries, AjaxResult.class);
@@ -69,7 +90,22 @@
JSONObject entries = JSONUtil.parseObj(json);
String card = entries.getStr("card");
// TjCustomer customer = tjCustomerMapper.getCusInfo(card);
- List<TjCustomer> customer = tjCustomerMapper.getCusInfoList(card);
+ List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoList(card);
+ return AjaxResult.success(customer);
+ }
+
+ /**
+ * 瀵逛簬灏忕▼搴忔彁渚�
+ * 鏍规嵁韬唤璇佸彿鏌ヨ杩斿洖浣撴璁板綍锛氬寘鍚鍚嶃�佽韩浠借瘉鍙枫�佹�у埆銆佸嚭鐢熸棩鏈熴�佸勾榫勩�佷綋妫�鍙枫�佽仈绯荤數璇濓紝浣撴鏃ユ湡锛屾姤鍛婄姸鎬�
+ * @param json
+ * @return
+ */
+ @PostMapping("/getCusInfo")
+ public AjaxResult getInfoCus(@RequestBody String json){
+ JSONObject entries = JSONUtil.parseObj(json);
+ String card = entries.getStr("card");
+ String name = entries.getStr("name");
+ List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoListByCardAndName(card,name);
return AjaxResult.success(customer);
}
--
Gitblit v1.8.0