From 800fe7bbdcd513c06d23dd568850d8eb05dd4d63 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 14 十月 2026 15:17:19 +0800
Subject: [PATCH] feat:新增单位年度合同 开票 收款计划 新增统计页
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java
index 7ea0713..967ae28 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BankStatementController.java
@@ -7,10 +7,14 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.business.dto.BankStatementUpdateDTO;
+import com.by4cloud.platformx.business.dto.BipQueryDTO;
import com.by4cloud.platformx.business.entity.BankStatement;
+import com.by4cloud.platformx.business.entity.BusinessCustomer;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.service.BankStatementService;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -21,6 +25,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -39,6 +44,12 @@
private final BankStatementService bankStatementService;
+ @Value("${dept.smj}")
+ private String smj;
+
+ @Value("${dept.smjhw}")
+ private String smjhw;
+
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
@@ -49,6 +60,17 @@
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('business_bankStatement_view')" )
public R getBankStatementPage(@ParameterObject Page page, @ParameterObject BankStatement bankStatement) {
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+ LambdaQueryWrapper<BankStatement> wrapper = Wrappers.lambdaQuery();
+ wrapper.like(StrUtil.isNotBlank(bankStatement.getPayBankAccName()),BankStatement::getPayBankAccName,bankStatement.getPayBankAccName());
+ wrapper.like(StrUtil.isNotBlank(bankStatement.getReceiveBankAccName()),BankStatement::getReceiveBankAccName,bankStatement.getReceiveBankAccName());
+ wrapper.orderByDesc(BankStatement::getCreateTime);
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjhw);
+ wrapper.in(BankStatement::getCompId, smjList);
+ return R.ok(bankStatementService.page(page, wrapper));
+ }
LambdaQueryWrapper<BankStatement> wrapper = Wrappers.lambdaQuery();
wrapper.like(StrUtil.isNotBlank(bankStatement.getPayBankAccName()),BankStatement::getPayBankAccName,bankStatement.getPayBankAccName());
wrapper.like(StrUtil.isNotBlank(bankStatement.getReceiveBankAccName()),BankStatement::getReceiveBankAccName,bankStatement.getReceiveBankAccName());
@@ -176,15 +198,26 @@
return bankStatementService.backAll(id);
}
-
/**
- * 閫氳繃id鎺ㄩ�乥ip
- * @param itemId id
+ * 鐢熸垚鏀舵鍗曢淇℃伅骞舵帹閫�
+ * @param updateDTO
* @return R
*/
- @Operation(summary = "閫氳繃id鍒犻櫎閾惰娴佹按鍘嗗彶纭" , description = "閫氳繃id鍒犻櫎閾惰娴佹按鍘嗗彶纭" )
- @GetMapping("/pushBip/{itemId}" )
- public R pushBip(@PathVariable("itemId" ) Long itemId) {
- return bankStatementService.pushBip(itemId);
+ @Operation(summary = "鐢熸垚鏀舵鍗曢淇℃伅骞舵帹閫�" , description = "鐢熸垚鏀舵鍗曢淇℃伅骞舵帹閫�" )
+ @PostMapping("/saveAndPush" )
+ public R saveAndPush(@RequestBody BankStatementUpdateDTO updateDTO) {
+ return bankStatementService.saveAndPush(updateDTO);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page 鍒嗛〉瀵硅薄
+ * @param queryDTO 閾惰娴佹按
+ * @return
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ @GetMapping("/pageBip" )
+ public R pageBip(@ParameterObject Page page, @ParameterObject BipQueryDTO queryDTO) {
+ return R.ok(bankStatementService.pageBip(page, queryDTO));
}
}
\ No newline at end of file
--
Gitblit v1.9.1