From b87b01b5267a7715eba68253674f6843f76e0a5b Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 08 四月 2025 18:05:56 +0800
Subject: [PATCH] 2025-04-08
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 7 ++++---
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 3 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 4 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 12 ++++++++++++
4 files changed, 20 insertions(+), 6 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 fc88d4c..cfe4fd7 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
@@ -15,6 +15,7 @@
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;
@@ -41,7 +42,7 @@
* @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");
tjReportController.preview(response,true,tjNum);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
index 6418c0b..897422a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
@@ -16,8 +16,11 @@
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.DictHosp;
import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.domain.TjOrder;
+import com.ltkj.hosp.mapper.TjCustomerMapper;
import com.ltkj.hosp.service.IDictHospService;
import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.system.domain.SysPost;
import com.ltkj.system.domain.SysRoleMenu;
import com.ltkj.system.domain.SysUserPost;
@@ -75,6 +78,10 @@
private boolean secretKeyLogin;
@Autowired
private RedisCache redisCache;
+ @Autowired
+ private ITjOrderService tjOrderService;
+ @Autowired
+ private TjCustomerMapper tjCustomerMapper;
/**
* 鐧诲綍鏂规硶
@@ -94,6 +101,11 @@
token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid(),hospId);
} else {
token = loginService.Cuslogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
+ LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjCustomer::getCusPhone, loginBody.getUsername());
+ TjCustomer tjCustomer = customerService.getOne(wq);
+ List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoListByCardAndName(tjCustomer.getCusIdcard(),tjCustomer.getCusName());
+ ajax.put("orderList",customer);
}
if (null == token) {
return success("璇ヨ处鍙锋鍦ㄤ娇鐢ㄤ腑");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index efc09dc..e96ff9c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -3121,8 +3121,8 @@
tjReport.setTjNumber(String.valueOf(tjNumber));
tjReport.setPath(urlValue + outputFileName1);
String outputPath1 = value + File.separator;
- String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
- tjReport.setReport(pdfBinary);
+// String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+// tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
tjReport.setPrint("pdf");
tjReportService.save(tjReport);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index a40d34a..d683c46 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -451,8 +451,8 @@
tjReport.setTjNumber(String.valueOf(tjNumber));
tjReport.setPath(urlValue + outputFileName1);
String outputPath1 = value + File.separator;
- String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
- tjReport.setReport(pdfBinary);
+// String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+// tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
tjReport.setPrint("pdf");
tjReportService.save(tjReport);
@@ -976,7 +976,7 @@
@GetMapping("/preview/{flag}/{TjNumber}")
@ApiOperation(value = "涓嬭浇浣撴鎶ュ憡")
- public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) {
+ public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) throws IOException {
TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
// LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
@@ -1027,6 +1027,7 @@
} catch (IOException e) {
e.printStackTrace();
//System.out.println("pdf澶勭悊鏂囦欢寮傚父" + e);
+// response.sendError(HttpServletResponse.SC_NOT_FOUND);
} finally {
if (out != null) {
try {
--
Gitblit v1.8.0