From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 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 0d5da1a..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
@@ -235,8 +235,8 @@
// tjFlowingWater.setPayStasus(1L);
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
- if (order.getFinishTime() != null) {
- return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲琛ュ綍椤圭洰!");
+ if (order.getPrintLastTime() != null) {
+ return AjaxResult.error("璇ヤ汉鍛樻姤鍛婂凡鎵撳嵃,涓嶅彲琛ュ綍椤圭洰!");
}
TjCustomer customer = customerService.getById(order.getUserId());
@@ -245,9 +245,11 @@
tjFlowingWater.setIsAddition("Y");
if (tjFlowingWater.getPayStasus().toString().equals("0")) {
tjFlowingWater.setPayStasus(0L);
+ tjFlowingWater.setZfgf(tjFlowingWater.getPayStasus().toString());
} else {
tjFlowingWater.setPayStasus(1L);
}
+ tjFlowingWater.setZfgf(tjFlowingWater.getPayStasus().toString());
if (tjFlowingWaterService.save(tjFlowingWater)) {
Date dates = new Date();
@@ -333,6 +335,7 @@
Map<String, Object> map = new HashMap<>();
map.put("waterId", tjFlowingWater.getWaterId());
map.put("mobanId", reportService.getMoBanIds());
+ tjFlowingWaterService.getTjBlCall(order.getTjNumber());
return AjaxResult.success("鏀惰垂鎴愬姛", map);
}
}
@@ -388,8 +391,8 @@
// tjFlowingWater.setPayStasus(1L);
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
- if (order.getFinishTime() != null) {
- return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲琛ュ綍椤圭洰!");
+ if (order.getPrintLastTime() != null) {
+ return AjaxResult.error("璇ヤ汉鍛樻姤鍛婂凡鎵撳嵃,涓嶅彲琛ュ綍椤圭洰!");
}
TjCustomer customer = customerService.getById(order.getUserId());
@@ -1337,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<>();
@@ -1362,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