From 1b7ed7edb09aaecf68ddf3396ee007bc6eadf52a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 30 十二月 2024 17:04:09 +0800
Subject: [PATCH] zjh202412030

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 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 b3a5d2b..ecdeb4e 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
@@ -2580,16 +2580,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