From cc25bc0eec2d50da39d62f9896ed4d5e66805366 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 11 七月 2025 18:04:05 +0800
Subject: [PATCH] zjh20250711
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 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 faa6972..974b056 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
@@ -30,6 +30,7 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
+import com.ltkj.web.controller.his.HisApiMethod;
import com.ltkj.web.wxUtils.HttpClientUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -37,6 +38,7 @@
import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.NoTransactionException;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
@@ -99,7 +101,8 @@
private TjOrderController tjOrderController;
@Autowired
private ITbTransitionService tbTransitionService;
-
+ @Autowired
+ private HisApiMethod hisApiMethod;
/**
* 鏌ヨ璇ヤ綋妫�鍙峰搴旂殑璁㈠崟娴佹按鍒楄〃
*/
@@ -245,17 +248,21 @@
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();
String jxbz = DateUtil.format(dates, "yyyyMMddHHmmss") + order.getOrderId();
//寮傛鍗曢」鏀惰垂鏄庣粏
- Boolean b = asyncService.iundividualCharges(tjFlowingWater, order, customer, sysUser, jxbz);
- if (!b) {
+ try {
+ Boolean b = asyncService.iundividualCharges(tjFlowingWater, order, customer, sysUser, jxbz);
+ } catch (NoTransactionException e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ hisApiMethod.ZfBlHisApiMethod(order.getTjNumber(), jxbz);
return AjaxResult.error();
}
@@ -1338,7 +1345,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<>();
@@ -1363,4 +1370,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