From e1df0c5c74f02f92013036384d820e866224ea5b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 31 三月 2025 11:11:06 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java | 2 +
ruoyi-system/src/main/java/com/ruoyi/system/query/TFlowManagementQuery.java | 3 +
ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBankFlowMapper.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java | 4 ++
ruoyi-system/src/main/java/com/ruoyi/system/query/TBankFlowQuery.java | 3 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java | 2 +
ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java | 4 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java | 4 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 10 ++--
ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml | 7 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 4 +
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFlowManagementMapper.java | 3 +
ruoyi-system/src/main/java/com/ruoyi/system/model/TBankFlow.java | 4 ++
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/resources/mapper/system/TFlowManagementMapper.xml | 3 +
ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoice.java | 4 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java | 10 ++++-
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java | 8 ++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java | 4 -
ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java | 3 +
ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml | 3 +
24 files changed, 82 insertions(+), 21 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
index 07154a0..ceb85db 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
@@ -6,6 +6,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.system.importExcel.TBankFlowImportExcel;
@@ -48,6 +49,7 @@
@ApiOperation(value = "获取银行流水列表")
@PostMapping("/list")
public R<PageInfo<TBankFlow>> list(@RequestBody TBankFlowQuery query) {
+ query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
return R.ok(flowService.pageList(query));
}
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-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java
index 1da2389..32a11ec 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFlowManagementController.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.model.TFlowManagement;
import com.ruoyi.system.query.TFlowManagementQuery;
import com.ruoyi.system.service.TFlowManagementService;
@@ -36,6 +37,7 @@
@ApiOperation(value = "获取流水列表")
@PostMapping("/list")
public R<PageInfo<TFlowManagement>> list(@RequestBody TFlowManagementQuery query) {
+ query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
return R.ok(flowService.pageList(query));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
index 02fb59c..7ff668d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.TencentMailUtil;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.model.TBill;
@@ -45,6 +46,7 @@
@ApiOperation(value = "获取开票列表")
@PostMapping("/list")
public R<PageInfo<TInvoice>> list(@RequestBody TInvoiceQuery query) {
+ query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
return R.ok(invoiceService.pageList(query));
}
@@ -86,7 +88,7 @@
String fileName = voucherNames[i];
Map<String, String> attachment = new HashMap<>(2); // 初始容量为2，避免扩容
String tempDir = System.getProperty("java.io.tmpdir");
- Path filePath = Paths.get(tempDir, fileName);
+ Path filePath = Paths.get(tempDir, "invoice");
// 保存到临时目录
tencentCosUtil.download(voucherUrl,filePath.toString(),fileName);
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
index 955e8e2..22aad9d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
@@ -144,7 +144,7 @@
messageBodyPart = new MimeBodyPart();
String filePath = map.get("filePath");
String fileName = map.get("fileName");
- tempFilePath.add(Paths.get(filePath));
+ tempFilePath.add(Paths.get(filePath,fileName));
FileDataSource source = new FileDataSource(filePath+"\\"+fileName);
messageBodyPart.setDataHandler(new DataHandler(source));
// String filenameEncode = MimeUtility.encodeText(fileName, "UTF-8", "base64");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBankFlowMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBankFlowMapper.java
index 20398af..3e9a980 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBankFlowMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBankFlowMapper.java
@@ -15,6 +15,6 @@
* @since 2025-02-07
*/
public interface TBankFlowMapper extends BaseMapper<TBankFlow> {
- TBankFlowStatisticsVo getPaymentStats(@Param("req") TBankFlowQuery query);
+ TBankFlowStatisticsVo getPaymentStats(@Param("req") TBankFlowQuery query,@Param("businessDeptId") String businessDeptId);
}
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/mapper/TFlowManagementMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFlowManagementMapper.java
index deca07e..6ea732c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFlowManagementMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFlowManagementMapper.java
@@ -15,5 +15,6 @@
* @since 2025-01-17
*/
public interface TFlowManagementMapper extends BaseMapper<TFlowManagement> {
- TFlowManagementStatisticsVo getPaymentStats(@Param("req") TFlowManagementQuery query);
+ TFlowManagementStatisticsVo getPaymentStats(@Param("req") TFlowManagementQuery query,@Param("businessDeptId") String businessDeptId);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBankFlow.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBankFlow.java
index 2340d46..1064ff6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBankFlow.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBankFlow.java
@@ -32,6 +32,10 @@
@TableId("id")
private String id;
+ @ApiModelProperty(value = "营运部门ID")
+ @TableField("business_dept_id")
+ private String businessDeptId;
+
@ApiModelProperty(value = "银行流水号")
@TableField("bank_serial_number")
private String bankSerialNumber;
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/model/TFlowManagement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java
index 0f72ebf..de4b72e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java
@@ -35,6 +35,10 @@
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
+ @ApiModelProperty(value = "营运部门ID")
+ @TableField("business_dept_id")
+ private String businessDeptId;
+
@ApiModelProperty(value = "系统流水号")
@TableField("sys_serial_number")
private String sysSerialNumber;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoice.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoice.java
index cf29a4f..701b285 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoice.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoice.java
@@ -35,6 +35,10 @@
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
+ @ApiModelProperty(value = "营运部门ID")
+ @TableField("business_dept_id")
+ private String businessDeptId;
+
@ApiModelProperty(value = "申请编号")
@TableField("invoice_number")
private String invoiceNumber;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TBankFlowQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBankFlowQuery.java
index ae33250..a11bf7e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TBankFlowQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBankFlowQuery.java
@@ -57,4 +57,7 @@
@ApiModelProperty(value = "支付结束时间")
private String payEndTime;
+ @ApiModelProperty(value = "营运部门ID")
+ private String businessDeptId;
+
}
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/query/TFlowManagementQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFlowManagementQuery.java
index 19fd59f..59a4d74 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFlowManagementQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFlowManagementQuery.java
@@ -59,5 +59,8 @@
@ApiModelProperty(value = "支付结束时间")
private String payEndTime;
+ @ApiModelProperty(value = "营运部门ID")
+ private String businessDeptId;
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java
index 7a7cf34..a66cfa3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java
@@ -58,4 +58,7 @@
@ApiModelProperty(value = "开票文件名称")
private String invoiceVoucherName;
+ @ApiModelProperty(value = "营运部门ID")
+ private String businessDeptId;
+
}
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/TBankFlowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
index 147a3ea..a643025 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.importExcel.TBankFlowImportExcel;
import com.ruoyi.system.mapper.TBankFlowMapper;
@@ -46,13 +47,14 @@
.ge(StringUtils.isNotEmpty(query.getPayStartTime()),TBankFlow::getPayTime,query.getPayStartTime())
.lt(StringUtils.isNotEmpty(query.getPayEndTime()),TBankFlow::getPayTime,query.getPayEndTime())
.eq(null != query.getFlowStatus(),TBankFlow::getFlowStatus,query.getFlowStatus())
+ .eq(StringUtils.isNotEmpty(query.getBusinessDeptId())&& !"0".equals(query.getBusinessDeptId()),TBankFlow::getBusinessDeptId,query.getBusinessDeptId())
.orderByDesc(TBankFlow::getCreateTime);
return this.baseMapper.selectPage(pageInfo, queryWrapper);
}
@Override
public TBankFlowStatisticsVo getPaymentStats(TBankFlowQuery query) {
- return this.baseMapper.getPaymentStats(query);
+ return this.baseMapper.getPaymentStats(query,SecurityUtils.getBusinessDeptId());
}
/**
@@ -62,10 +64,12 @@
*/
@Override
public List<TBankFlow> searchByBankSerialNumber(String bankSerialNumber) {
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
+
LambdaQueryWrapper<TBankFlow> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(StringUtils.isNotEmpty(bankSerialNumber),TBankFlow::getBankSerialNumber,bankSerialNumber)
+ .eq(StringUtils.isNotEmpty(bankSerialNumber) && !"0".equals(bankSerialNumber),TBankFlow::getBusinessDeptId,businessDeptId)
.orderByDesc(TBankFlow::getPayTime);
-
PageInfo<TBankFlow> pageInfo = new PageInfo<>(1, 20);
pageInfo = this.baseMapper.selectPage(pageInfo, queryWrapper);
return pageInfo.getRecords();
@@ -73,6 +77,7 @@
@Override
public void saveImportBatch(List<TBankFlowImportExcel> list, List<TBankFlowImportExcel> failList) {
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
for (TBankFlowImportExcel row : list) {
try {
TBankFlow preexist = findUniq(row.getBankSerialNumber());
@@ -83,6 +88,7 @@
}
TBankFlow flow = new TBankFlow();
BeanUtils.copyProperties(row,flow);
+ flow.setBusinessDeptId(businessDeptId);
try {
LocalDateTime parse = LocalDateTime.parse(row.getPayTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
flow.setPayTime(parse);
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/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java
index 9cf988d..0a3c5ec 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TFlowManagementMapper;
import com.ruoyi.system.model.TFlowManagement;
@@ -34,6 +35,7 @@
.ge(StringUtils.isNotEmpty(query.getPayStartTime()),TFlowManagement::getPayTime,query.getPayStartTime())
.lt(StringUtils.isNotEmpty(query.getPayEndTime()),TFlowManagement::getPayTime,query.getPayEndTime())
.eq(null != query.getPayType(),TFlowManagement::getPayType,query.getPayType())
+ .eq(StringUtils.isNotEmpty(query.getBusinessDeptId()) && !"0".equals(query.getBusinessDeptId()),TFlowManagement::getBusinessDeptId,query.getBusinessDeptId())
.orderByDesc(TFlowManagement::getCreateTime)
;
return this.baseMapper.selectPage(pageInfo,queryWrapper);
@@ -41,7 +43,7 @@
@Override
public TFlowManagementStatisticsVo getPaymentStats(TFlowManagementQuery query) {
- return this.baseMapper.getPaymentStats(query);
+ return this.baseMapper.getPaymentStats(query, SecurityUtils.getBusinessDeptId());
}
@Override
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
index 20e23e5..1fbb4db 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
@@ -53,6 +53,7 @@
.eq(null != query.getStatus(),TInvoice::getStatus,query.getStatus())
.ge(StringUtils.isNotEmpty(query.getInvoiceStartTime()),TInvoice::getInvoiceTime,query.getInvoiceStartTime())
.le(StringUtils.isNotEmpty(query.getInvoiceEndTime()),TInvoice::getInvoiceTime,query.getInvoiceEndTime())
+ .eq(StringUtils.isNotEmpty(query.getBusinessDeptId())&& ! "0".equals(query.getBusinessDeptId()),TInvoice::getBusinessDeptId,query.getBusinessDeptId())
.orderByDesc(TInvoice::getCreateTime);
return this.baseMapper.selectList(queryWrapper);
}
@@ -73,8 +74,6 @@
tInvoice.setInvoiceVoucherName(query.getInvoiceVoucherName());
tInvoice.setInvoiceTime(query.getInvoiceTime());
tInvoice.setStatus(2);
-
-
// 异步发送邮件
CompletableFuture.runAsync(() -> {
try {
@@ -83,7 +82,6 @@
log.error("邮件发送失败", e);
}
});
-
// 更新数据库
return updateById(tInvoice);
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml
index 8995310..06126b6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml
@@ -58,6 +58,9 @@
<if test="req.payEndTime != null and req.payEndTime != ''">
and pay_time <= #{req.payEndTime}
</if>
+ <if test='businessDeptId != null and businessDeptId != "" and businessDeptId != "0"'>
+ and business_dept_id = #{businessDeptId}
+ </if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
</select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
index a120f32..50011ed 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
+ AND 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
+ AND business_dept_id=#{busDeptId}
</select>
<select id="batchBillCount" resultType="java.lang.Integer">
SELECT
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFlowManagementMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFlowManagementMapper.xml
index 136ec5f..6e2d276 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFlowManagementMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFlowManagementMapper.xml
@@ -64,6 +64,9 @@
<if test="req.payEndTime != null and req.payEndTime != ''">
and pay_time <= #{req.payEndTime}
</if>
+ <if test='businessDeptId != null and businessDeptId != "" and businessDeptId != "0"'>
+ and business_dept_id = #{businessDeptId}
+ </if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
</select>
--
Gitblit v1.7.1