From b8bf9a10ca1c65e94d75a2db5550e6263b582512 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 十二月 2024 15:01:41 +0800
Subject: [PATCH] 调整结果项目状态判断结论增加非空判断
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 d8033d2..23495c5 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
@@ -9,6 +9,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
@@ -92,7 +93,7 @@
LambdaQueryWrapper<TjChargingStandard> wq3 = new LambdaQueryWrapper<>();
wq3.eq(TjChargingStandard::getTjNum, TjNumber);
List<TjChargingStandard> list = chargingStandardService.list(wq3);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
for (TjChargingStandard standard : list) {
TjProject project = projectService.getById(standard.getProId());
if (null != project && null != project.getProCheckType()) {
@@ -198,6 +199,7 @@
@PutMapping
@ApiOperation(value = "浣撴鐐瑰嚮鏀惰垂鎸夐挳鎺ュ彛")
@Transactional
+ @RepeatSubmit
public AjaxResult edit(@RequestBody TjFlowingWater tjFlowingWater) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -206,13 +208,22 @@
// tjFlowingWater.setTollCollectorId(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
// tjFlowingWater.setPayStasus(1L);
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
+
+ if(order.getFinishTime() !=null){
+ return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲琛ュ綍椤圭洰!");
+ }
+
TjCustomer customer = customerService.getById(order.getUserId());
if (null != tjFlowingWater.getTjProIds() && tjFlowingWater.getTjProIds().length > 0) {
tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(customer.getCusName(), "").toUpperCase() +SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
tjFlowingWater.setIsAddition("Y");
if (tjFlowingWaterService.save(tjFlowingWater)) {
//寮傛鍗曢」鏀惰垂鏄庣粏
- asyncService.iundividualCharges(tjFlowingWater, order, customer, sysUser);
+ Boolean b = asyncService.iundividualCharges(tjFlowingWater, order, customer, sysUser);
+ if (!b){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error();
+ }
// if(!b){
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
// }
--
Gitblit v1.8.0