From 7685af4ed67c693d197393f56f392d7b12434853 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 27 二月 2025 16:43:42 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
index 7ecc704..ba57274 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -6,17 +6,19 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.dto.*;
import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.model.TBillDetail;
import com.ruoyi.system.query.TBillQuery;
+import com.ruoyi.system.service.TBillDetailService;
import com.ruoyi.system.service.TBillService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
/**
* <p>
@@ -34,7 +36,8 @@
@Autowired
TBillService tBillService;
-
+ @Autowired
+ TBillDetailService tBillDetailService;
@PreAuthorize("@ss.hasPermi('system:bill:list')")
@@ -52,6 +55,22 @@
tBillService.saveBill(bill);
return R.ok();
}
+
+ @ApiOperation("通过ID查找详情")
+ @GetMapping("getDetailById")
+ public R<TBillDto> getDetailById(@Validated @NotEmpty String id){
+ TBillDto dto = tBillService.getDetailByBillId(id);
+ if (dto.getBillType().equals("3")){
+ List<TBillDetail> details = tBillDetailService.getByBillId(id);
+ for (TBillDetail detail : details) {
+ if (detail.getLiveType()==1)dto.setWater(detail); //水费
+ else dto.setElect(detail); //电费
+ }
+ }
+ return R.ok(dto);
+ }
+
+
@PreAuthorize("@ss.hasPermi('system:bill:checkOfflinePay')")
@ApiOperation("确认线下缴费")
@PostMapping("checkOfflinePay")
@@ -70,7 +89,7 @@
@PreAuthorize("@ss.hasPermi('system:bill:sendMailBatchByBillIds')")
- @ApiOperation("账单批量发送短信通知")
+ @ApiOperation("账单批量发送邮箱通知")
@PostMapping("sendMailBatchByBillIds")
public R sendMailBatchByBillIds(@Validated @RequestBody SmsByBillDto dto){
Integer failNum = tBillService.sendMailBatchByBillIds(dto);
@@ -85,5 +104,8 @@
}
+
+
+
}
--
Gitblit v1.7.1