From 8d0009c7b03ea915955bf6b84a548699a32f23e5 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 三月 2025 17:59:56 +0800
Subject: [PATCH] feat: 账单及查询、新增、添加营运部门ID
---
ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java | 6 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 6 +++++-
ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java | 4 ++++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java | 8 ++++----
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 10 +++++-----
ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml | 7 +++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java | 2 +-
7 files changed, 32 insertions(+), 11 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 a0340a0..81ad5e9 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
@@ -4,12 +4,14 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.*;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TBillConfirm;
import com.ruoyi.system.model.TBillDetail;
import com.ruoyi.system.query.TBillQuery;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TBillConfirmService;
import com.ruoyi.system.service.TBillDetailService;
import com.ruoyi.system.service.TBillService;
@@ -49,6 +51,7 @@
@PostMapping("list")
@ApiOperation("分页查询账单列表")
public R<PageInfo<TBillDto>> list(@RequestBody TBillQuery query){
+ query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
PageInfo<TBillDto> pageInfo = tBillService.queryPage(query);
return R.ok(pageInfo);
}
@@ -57,6 +60,7 @@
@PostMapping("add")
@ApiOperation("新增账单")
public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
+ bill.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
tBillService.saveBill(bill);
return R.ok();
}
@@ -123,7 +127,7 @@
@ApiOperation("统计")
@GetMapping("statistics")
public R<BillStatisticsDto> statistics(){
- BillStatisticsDto dto = tBillService.statistics();
+ BillStatisticsDto dto = tBillService.statistics(SecurityUtils.getBusinessDeptId());
return R.ok(dto);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java
index d2e012a..5041a90 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java
@@ -37,13 +37,13 @@
TBillDto selectDetailByBillId(@Param("billId") String billId);
- BigDecimal statisticsAllRent();
+ BigDecimal statisticsAllRent(@Param("busDeptId") String busDeptId);
- BigDecimal statisticsNoPay();
+ BigDecimal statisticsNoPay(@Param("busDeptId") String busDeptId);
- BigDecimal statisticsPayed();
+ BigDecimal statisticsPayed(@Param("busDeptId") String busDeptId);
- BigDecimal statisticsOverdue();
+ BigDecimal statisticsOverdue(@Param("busDeptId") String busDeptId);
Integer batchBillCount(@Param("userId")String userId, @Param("billIds")List<String> billIds);
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
index cee2df3..9e5c994 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
@@ -76,6 +76,10 @@
@TableField("contract_id")
private String contractId;
+ @ApiModelProperty(value = "营运部门ID")
+ @TableField("business_dept_id")
+ private String businessDeptId;
+
@ApiModelProperty(value = "合同编号")
@TableField("contract_number")
private String contractNumber;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java
index 1d66290..497dd30 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java
@@ -1,11 +1,15 @@
package com.ruoyi.system.query;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class TBillQuery extends BasePage {
+
+ @ApiModelProperty(value = "营运部门ID")
+ private String businessDeptId;
/**
* 缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期
*/
@@ -31,4 +35,6 @@
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
index abf30a2..7e6f3ae 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
@@ -87,7 +87,7 @@
Boolean cashPay(CachPayDto offlinePayDto);
- BillStatisticsDto statistics();
+ BillStatisticsDto statistics(String busdeptId);
Integer batchBillCount(String userId, List<String> billIds);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index 57597b2..a596a85 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -563,12 +563,12 @@
}
@Override
- public BillStatisticsDto statistics() {
+ public BillStatisticsDto statistics(String busDeptId) {
BillStatisticsDto dto = new BillStatisticsDto();
- dto.setRent(getBaseMapper().statisticsAllRent());
- dto.setNopay(getBaseMapper().statisticsNoPay());
- dto.setPayed(getBaseMapper().statisticsPayed());
- dto.setOverdue(getBaseMapper().statisticsOverdue());
+ dto.setRent(getBaseMapper().statisticsAllRent(busDeptId));
+ dto.setNopay(getBaseMapper().statisticsNoPay(busDeptId));
+ dto.setPayed(getBaseMapper().statisticsPayed(busDeptId));
+ dto.setOverdue(getBaseMapper().statisticsOverdue(busDeptId));
return dto;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
index a120f32..2f9530f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
@@ -62,6 +62,9 @@
<if test="query.userId != null and query.userId !=''">
and t.id = #{query.userId}
</if>
+ <if test="query.businessDeptId != null and query.businessDeptId !=''">
+ and b.business_dept_id = #{businessDeptId}
+ </if>
<if test="query.billType != null">
and b.bill_type = #{query.billType}
</if>
@@ -155,18 +158,22 @@
<select id="statisticsAllRent" resultType="java.math.BigDecimal">
SELECT ifnull(sum(payable_fees_money),0) as amount FROM t_bill
+ where business_dept_id=#{busDeptId}
</select>
<select id="statisticsNoPay" resultType="java.math.BigDecimal">
SELECT ifnull(sum(outstanding_money),0) as amount FROM t_bill where pay_fees_status!=3
+ where business_dept_id=#{busDeptId}
</select>
<select id="statisticsPayed" resultType="java.math.BigDecimal">
SELECT ifnull(sum(pay_fees_money),0) as amount FROM t_bill
+ where business_dept_id=#{busDeptId}
</select>
<select id="statisticsOverdue" resultType="java.math.BigDecimal">
SELECT ifnull(sum(outstanding_money),0) as amount FROM t_bill where pay_fees_status=4
+ where business_dept_id=#{busDeptId}
</select>
<select id="batchBillCount" resultType="java.lang.Integer">
SELECT
--
Gitblit v1.7.1