From 3620453ef3ebf3ba1542c180d942443a4a934d67 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 25 六月 2025 18:05:04 +0800
Subject: [PATCH] zjh20250625
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 69cd4cd..f4aee0e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -1340,7 +1340,7 @@
list2.add(tjConsumables);
}
}
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
ArrayList<TjConsumables> collectw = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
for (TjConsumables tjConsumables : collectw) {
LambdaQueryWrapper<TjChargingStandard> wqq = new LambdaQueryWrapper<>();
@@ -1365,4 +1365,38 @@
}
return AjaxResult.error();
}
+
+
+
+ @GetMapping("/gettuantijiesuanrenyuan")
+ @ApiOperation(value = "鑾峰彇鍥綋缁撶畻浜哄憳")
+ public AjaxResult gettuantijiesuanrenyuan(@RequestParam(required = false) @ApiParam("鍗曚綅ID") String dwId,
+ @RequestParam(required = false) @ApiParam("鐧昏寮�濮嬫椂闂�") String djkssj,
+ @RequestParam(required = false) @ApiParam("鐧昏缁撴潫鏃堕棿") String djjssj,
+ @RequestParam(required = false) @ApiParam("缁撶畻寮�濮嬫椂闂�") String jskssj,
+ @RequestParam(required = false) @ApiParam("缁撶畻缁撴潫鏃堕棿") String jsjssj,
+ @RequestParam(required = false) @ApiParam("浣撴鍙�") String tjh,
+ @RequestParam(required = false) @ApiParam("缁撶畻浜篿d") String jsrid,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page) {
+
+ if (StringUtil.isNotBlank(dwId)) dwId = "";
+ if (StringUtil.isNotBlank(djkssj)) djkssj = "";
+ if (StringUtil.isNotBlank(djjssj)) djjssj = "";
+ if (StringUtil.isNotBlank(jskssj)) jskssj = "";
+ if (StringUtil.isNotBlank(jsjssj)) jsjssj = "";
+ if (StringUtil.isNotBlank(tjh)) tjh = "";
+ if (StringUtil.isNotBlank(jsrid)) jsrid = "";
+ return AjaxResult.success(tjFlowingWaterService.gettuantijiesuanrenyuan(page, pageSize,dwId,djkssj, djjssj, jskssj, jsjssj, tjh, jsrid));
+ }
+
+
+
+ @PostMapping("/tuantijiesuan")
+ @ApiOperation(value = "鍥綋缁撶畻")
+ public AjaxResult tuantijiesuan(@RequestParam(required = false) @ApiParam("鍗曚綅ID") List<String> dwId) {
+
+ return AjaxResult.success();
+ }
+
}
--
Gitblit v1.8.0