SNAPSHOT W7 已部署稳定态 — 凯迪ERP+OA一体化平台 (MET 73.3%)
恢复点(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>
This commit is contained in:
@@ -0,0 +1,92 @@
|
||||
package com.kaidi.oa.web;
|
||||
|
||||
import com.kaidi.oa.common.Money;
|
||||
|
||||
import com.kaidi.oa.common.ApiException;
|
||||
import com.kaidi.oa.common.ApiResp;
|
||||
import com.kaidi.oa.common.NotFoundException;
|
||||
import com.kaidi.oa.domain.Budget;
|
||||
import com.kaidi.oa.repository.BudgetRepository;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
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.time.Instant;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Unified budget / cost-center for budgeting and execution monitoring
|
||||
* (budget vs. actual cost). element (cost element) is one of
|
||||
* 人工费 / 材料费 / 机械费 / 差旅费 / 管理费 / 外协费 / 分包费; period is one of
|
||||
* 年度 / 季度 / 月度; status is one of 执行中 / 超支 / 已结. Creating a budget whose
|
||||
* actualAmount exceeds budgetAmount automatically sets status to 超支.
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/oa/budgets")
|
||||
public class BudgetController {
|
||||
|
||||
private final BudgetRepository budgetRepo;
|
||||
|
||||
public BudgetController(BudgetRepository budgetRepo) {
|
||||
this.budgetRepo = budgetRepo;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public ApiResp<List<Budget>> list(@RequestParam(required = false) Long projectId,
|
||||
@RequestParam(required = false) String element,
|
||||
@RequestParam(required = false) String status) {
|
||||
List<Budget> list;
|
||||
if (projectId != null) {
|
||||
list = budgetRepo.findByProjectId(projectId);
|
||||
} else if (element != null && !element.isBlank()) {
|
||||
list = budgetRepo.findByElement(element);
|
||||
} else if (status != null && !status.isBlank()) {
|
||||
list = budgetRepo.findByStatus(status);
|
||||
} else {
|
||||
list = budgetRepo.findAll();
|
||||
}
|
||||
return ApiResp.ok(list);
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public ApiResp<Budget> get(@PathVariable Long id) {
|
||||
return ApiResp.ok(budgetRepo.findById(id)
|
||||
.orElseThrow(() -> new NotFoundException("budget not found: " + id)));
|
||||
}
|
||||
|
||||
public record CreateBudgetRequest(
|
||||
String name, Long projectId, String companySubject, String element,
|
||||
String year, String period, Double budgetAmount, Double actualAmount,
|
||||
String owner, String status) {
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public ApiResp<Budget> create(@RequestBody CreateBudgetRequest req) {
|
||||
if (req.name() == null || req.name().isBlank()) {
|
||||
throw new ApiException(400, "name is required");
|
||||
}
|
||||
double budgetAmount = req.budgetAmount() == null ? 0 : req.budgetAmount();
|
||||
double actualAmount = req.actualAmount() == null ? 0 : req.actualAmount();
|
||||
Budget b = new Budget();
|
||||
b.setName(req.name());
|
||||
b.setProjectId(req.projectId());
|
||||
b.setCompanySubject(req.companySubject());
|
||||
b.setElement(req.element());
|
||||
b.setYear(req.year());
|
||||
b.setPeriod(req.period());
|
||||
b.setBudgetAmount(Money.of(budgetAmount));
|
||||
b.setActualAmount(Money.of(actualAmount));
|
||||
b.setOwner(req.owner());
|
||||
if (Money.gt(b.getActualAmount(), b.getBudgetAmount())) {
|
||||
b.setStatus("超支");
|
||||
} else {
|
||||
b.setStatus(req.status() == null || req.status().isBlank() ? "执行中" : req.status());
|
||||
}
|
||||
b.setCreatedAt(Instant.now());
|
||||
return ApiResp.ok(budgetRepo.save(b));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user