From 5e15f28db8bf83cc19697e1ce2bd0078cd9cdfb8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 23 一月 2025 17:07:51 +0800
Subject: [PATCH] zjh20250123
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
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 1295071..a360ec8 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
@@ -106,6 +106,8 @@
private IDictHospService dictHospService;
@Autowired
private ITjReportPrintService printService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
@GetMapping("/savePdf")
@ApiOperation(value = "浠庢湰鍦板瓨鍌ㄦā鏉垮埌鏁版嵁搴�")
@@ -383,19 +385,19 @@
tjOrderService.update(updateWrapper);
return AjaxResult.success("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
}
- String hisRegistrationId = tjOrder.getCardId();
- Date createTime = tjOrder.getCreateTime();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String ksrq = dateFormat.format(createTime);
- String jsrq = dateFormat.format(new Date());
- HashMap<String, Object> params = new HashMap<>();
- params.put("his_registration_id", hisRegistrationId);
- params.put("ksbm", "");
- params.put("pationid", "");
- params.put("ksrq", ksrq);
- params.put("jsrq", jsrq);
- params.put("pagecount", 100);
- params.put("page", 1);
+// String hisRegistrationId = tjOrder.getCardId();
+// Date createTime = tjOrder.getCreateTime();
+// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// String ksrq = dateFormat.format(createTime);
+// String jsrq = dateFormat.format(new Date());
+// HashMap<String, Object> params = new HashMap<>();
+// params.put("his_registration_id", hisRegistrationId);
+// params.put("ksbm", "");
+// params.put("pationid", "");
+// params.put("ksrq", ksrq);
+// params.put("jsrq", jsrq);
+// params.put("pagecount", 100);
+// params.put("page", 1);
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
@@ -2167,6 +2169,7 @@
one.setPrintLastTime(null);
one.setDownloadLastTime(null);
if (tjOrderService.updateById(one)) {
+// ycxmService.delOrderYcXmJyByTjh(tjNumber);
return AjaxResult.success("鎾ゅ洖鎴愬姛锛�");
}
}
@@ -2220,8 +2223,8 @@
LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>();
wq2.eq(TjOrder::getFirmId, firmId);
wq2.eq(TjOrder::getFirmDeptId, firmDeptId);
- wq2.eq(TjOrder::getTjType, "1");
- wq2.in(TjOrder::getStatus, 401, 402);
+ wq2.ne(TjOrder::getTjType, "2");
+// wq2.in(TjOrder::getStatus, 401, 402);
final List<TjOrder> list = tjOrderService.list(wq2);
for (TjOrder tjOrder : list) {
@@ -2580,16 +2583,14 @@
@GetMapping("/tuanDuiYiChangBySex")
@ApiOperation(value = "鐢熸垚鍥㈤槦浣撴鎶ュ憡鈥斺�旂敺濂冲紓甯哥粨鏋滅粺璁�")
- public Map<String, List<Map<String, Object>>> tuanDuiYiChangBySex(@ApiParam(value = "鍗曚綅") @RequestParam String firmId,
- @ApiParam(value = "閮ㄩ棬") @RequestParam String firmDeptId) {
+ public Map<String, List<Map<String, Object>>> tuanDuiYiChangBySex(@ApiParam(value = "鍗曚綅") @RequestParam String dwname) {
Map<String, List<Map<String, Object>>> all = new HashMap<>();
LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjOrder::getFirmId, firmId);
- wq2.eq(TjOrder::getFirmDeptId, firmDeptId);
- wq2.eq(TjOrder::getTjType, "1");
- wq2.in(TjOrder::getStatus, 401, 402);
+ wq2.eq(TjOrder::getFirmName,dwname);
+ wq2.ne(TjOrder::getTjType, "2");
+// wq2.in(TjOrder::getStatus, 401, 402);
final List<TjOrder> list = tjOrderService.list(wq2);
List<String> tjNumberList = list.stream().map(TjOrder::getTjNumber).collect(Collectors.toList());
--
Gitblit v1.8.0