恢复点(restore point)。别人改崩后可 git reset --hard 回到此提交。 == 此快照内容 == - 后端 oa-backend: 734 控制器 / 711 实体 (Spring Boot 3.2.5 + SQLite, 端口8091) - 前端 modern-ui/app: Vue3+Vite, 约700页 (构建产物已在 oa-backend/src/main/resources/static) - 数据库 oa-backend/data/oa.db: 含全部演示数据 (强制入库, 6.6MB) - 交接文档 go.md + go-code-reference/endpoints/entities/database.md - 多代理建设脚本 .claude/wf-*.js == 状态 == - 对 凯迪科技ERP_20260507.xlsx 合规 MET ~73.3% (PARTIAL 75: 34可建+6种子/bug+35外部硬天花板) - 安全: 5轮红队+5轮复检, default-deny分级鉴权, 连续零可利用 - W3~W7 累计补完436缺口; W8末轮(40缺口)为半成品(源码树可编译但未集成) - 运行: cd oa-backend; java -jar build/libs/oa-backend-0.1.0.jar --server.port=8091; admin/123456 == 排除(gitignore, 可再生) == node_modules / oa-backend/build / .jdks / *.log / Backup-ERP-* / 弃用的OFBiz核心(只保留modern-ui) 完整文件夹备份见同目录 Backup-ERP-20260615-191517/ (含上述全部, 仅缺 node_modules) 时间戳: 20260615-191517 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
125 lines
5.6 KiB
Java
125 lines
5.6 KiB
Java
package com.kaidi.oa.web;
|
|
|
|
import com.kaidi.oa.common.ApiException;
|
|
import com.kaidi.oa.common.ApiResp;
|
|
import com.kaidi.oa.common.Money;
|
|
import com.kaidi.oa.common.NotFoundException;
|
|
import com.kaidi.oa.domain.BankReconciliation;
|
|
import com.kaidi.oa.repository.BankReconciliationRepository;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.PatchMapping;
|
|
import org.springframework.web.bind.annotation.PathVariable;
|
|
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.RequestParam;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
import java.math.BigDecimal;
|
|
import java.time.Instant;
|
|
import java.time.LocalDate;
|
|
import java.util.List;
|
|
|
|
/**
|
|
* 结算中心·银行对账。一条对账记录把某账户某对账日的银行流水余额与账面余额做差,
|
|
* 差额由后端自动算并落库;diff 为 0 视为「已对平」,否则「未对平」。
|
|
* 银企直连(自动取银行流水)为外部对接项,本控制器先支持手工 / 导入登记与差额自动核算。
|
|
*
|
|
* 写口默认受 AuthInterceptor 的 default-deny(ADMIN/APPROVER) 保护,并需登记进
|
|
* FINANCE_PREFIXES + SENSITIVE_READ_PREFIXES(含银行账号/余额,属机密财务读)。
|
|
*/
|
|
@RestController
|
|
@RequestMapping("/api/oa/reconciliations")
|
|
public class BankReconciliationController {
|
|
|
|
private final BankReconciliationRepository repo;
|
|
|
|
public BankReconciliationController(BankReconciliationRepository repo) {
|
|
this.repo = repo;
|
|
}
|
|
|
|
@GetMapping
|
|
public ApiResp<List<BankReconciliation>> list(@RequestParam(required = false) String status,
|
|
@RequestParam(required = false) String bankAccountNo) {
|
|
if (status != null && !status.isBlank()) {
|
|
return ApiResp.ok(repo.findByStatus(status));
|
|
}
|
|
if (bankAccountNo != null && !bankAccountNo.isBlank()) {
|
|
return ApiResp.ok(repo.findByBankAccountNoOrderByReconcileDateDesc(bankAccountNo));
|
|
}
|
|
return ApiResp.ok(repo.findAll());
|
|
}
|
|
|
|
@GetMapping("/{id}")
|
|
public ApiResp<BankReconciliation> get(@PathVariable Long id) {
|
|
return ApiResp.ok(repo.findById(id)
|
|
.orElseThrow(() -> new NotFoundException("reconciliation not found: " + id)));
|
|
}
|
|
|
|
public record ReconciliationRequest(
|
|
String code, String bankAccount, String bankAccountNo, String bankName,
|
|
String reconcileDate, Double bankBalance, Double bookBalance, String remark,
|
|
String companySubject, String owner) {
|
|
}
|
|
|
|
@PostMapping
|
|
public ApiResp<BankReconciliation> create(@RequestBody ReconciliationRequest req) {
|
|
if (req.bankAccount() == null || req.bankAccount().isBlank()) {
|
|
throw new ApiException(400, "银行账户(bankAccount) 不能为空");
|
|
}
|
|
BankReconciliation r = new BankReconciliation();
|
|
r.setCode(req.code() == null || req.code().isBlank()
|
|
? "DZ-" + (repo.count() + 1) : req.code());
|
|
r.setBankAccount(req.bankAccount());
|
|
r.setBankAccountNo(req.bankAccountNo());
|
|
r.setBankName(req.bankName());
|
|
r.setReconcileDate(req.reconcileDate() == null || req.reconcileDate().isBlank()
|
|
? LocalDate.now().toString() : req.reconcileDate());
|
|
r.setBankBalance(Money.of(req.bankBalance()));
|
|
r.setBookBalance(Money.of(req.bookBalance()));
|
|
applyDiff(r);
|
|
r.setRemark(req.remark());
|
|
r.setCompanySubject(req.companySubject());
|
|
r.setOwner(req.owner());
|
|
r.setCreatedAt(Instant.now());
|
|
return ApiResp.ok(repo.save(r));
|
|
}
|
|
|
|
@PatchMapping("/{id}")
|
|
public ApiResp<BankReconciliation> update(@PathVariable Long id, @RequestBody ReconciliationRequest req) {
|
|
BankReconciliation r = repo.findById(id)
|
|
.orElseThrow(() -> new NotFoundException("reconciliation not found: " + id));
|
|
if (req.bankAccount() != null && !req.bankAccount().isBlank()) r.setBankAccount(req.bankAccount());
|
|
if (req.bankAccountNo() != null) r.setBankAccountNo(req.bankAccountNo());
|
|
if (req.bankName() != null) r.setBankName(req.bankName());
|
|
if (req.reconcileDate() != null && !req.reconcileDate().isBlank()) r.setReconcileDate(req.reconcileDate());
|
|
if (req.bankBalance() != null) r.setBankBalance(Money.of(req.bankBalance()));
|
|
if (req.bookBalance() != null) r.setBookBalance(Money.of(req.bookBalance()));
|
|
if (req.remark() != null) r.setRemark(req.remark());
|
|
if (req.companySubject() != null) r.setCompanySubject(req.companySubject());
|
|
if (req.owner() != null) r.setOwner(req.owner());
|
|
// 任一余额变动都重算差额与对平状态。
|
|
applyDiff(r);
|
|
return ApiResp.ok(repo.save(r));
|
|
}
|
|
|
|
@DeleteMapping("/{id}")
|
|
@Transactional
|
|
public ApiResp<Void> delete(@PathVariable Long id) {
|
|
if (!repo.existsById(id)) {
|
|
throw new NotFoundException("reconciliation not found: " + id);
|
|
}
|
|
repo.deleteById(id);
|
|
return ApiResp.ok(null);
|
|
}
|
|
|
|
/** 差额 = 银行余额 - 账面余额;为 0 即「已对平」,否则「未对平」。 */
|
|
private static void applyDiff(BankReconciliation r) {
|
|
BigDecimal diff = Money.sub(r.getBankBalance(), r.getBookBalance());
|
|
r.setDiff(diff);
|
|
r.setStatus(diff.signum() == 0 ? "已对平" : "未对平");
|
|
}
|
|
}
|