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:
Qiufeng
2026-06-15 19:19:15 +08:00
co-authored by Claude Opus 4.8
commit 5e51dc3f56
10584 changed files with 2501339 additions and 0 deletions
@@ -0,0 +1,109 @@
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.RdExpense;
import com.kaidi.oa.repository.RdExpenseRepository;
import org.springframework.web.bind.annotation.DeleteMapping;
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.PutMapping;
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;
/**
* R&D expense collection (研发费用归集) forming the evidence chain
* 研发立项-费用-凭证 of business chain 6. category is one of 人工费 / 直接投入 /
* 折旧费用 / 无形资产摊销 / 设计费 / 其他; status is one of 待审核 / 已归集 /
* 已驳回.
*/
@RestController
@RequestMapping("/api/oa/rd-expenses")
public class RdExpenseController {
private final RdExpenseRepository expenseRepo;
public RdExpenseController(RdExpenseRepository expenseRepo) {
this.expenseRepo = expenseRepo;
}
@GetMapping
public ApiResp<List<RdExpense>> list(@RequestParam(required = false) Long rdProjectId,
@RequestParam(required = false) String status) {
List<RdExpense> list;
if (rdProjectId != null) {
list = expenseRepo.findByRdProjectId(rdProjectId);
} else if (status != null && !status.isBlank()) {
list = expenseRepo.findByStatus(status);
} else {
list = expenseRepo.findAll();
}
return ApiResp.ok(list);
}
@GetMapping("/{id}")
public ApiResp<RdExpense> get(@PathVariable Long id) {
return ApiResp.ok(expenseRepo.findById(id)
.orElseThrow(() -> new NotFoundException("rd expense not found: " + id)));
}
public record CreateRdExpenseRequest(
Long rdProjectId, String rdProjectName, String category, String description,
Double amount, String occurDate, String voucher, String status, String recorder) {
}
@PostMapping
public ApiResp<RdExpense> create(@RequestBody CreateRdExpenseRequest req) {
if (req.rdProjectId() == null) {
throw new ApiException(400, "rdProjectId is required");
}
RdExpense e = new RdExpense();
e.setRdProjectId(req.rdProjectId());
e.setRdProjectName(req.rdProjectName());
e.setCategory(req.category());
e.setDescription(req.description());
e.setAmount(Money.of(req.amount() == null ? 0d : req.amount()));
e.setOccurDate(req.occurDate());
e.setVoucher(req.voucher());
e.setStatus(req.status() == null || req.status().isBlank() ? "待审核" : req.status());
e.setRecorder(req.recorder());
e.setCreatedAt(Instant.now());
return ApiResp.ok(expenseRepo.save(e));
}
/** PUT /{id} -> 编辑研发费用归集; 只覆盖请求体里给出的字段。 */
@PutMapping("/{id}")
public ApiResp<RdExpense> update(@PathVariable Long id, @RequestBody CreateRdExpenseRequest req) {
RdExpense e = expenseRepo.findById(id)
.orElseThrow(() -> new NotFoundException("rd expense not found: " + id));
if (req.rdProjectId() != null) e.setRdProjectId(req.rdProjectId());
if (req.rdProjectName() != null) e.setRdProjectName(req.rdProjectName());
if (req.category() != null) e.setCategory(req.category());
if (req.description() != null) e.setDescription(req.description());
if (req.amount() != null) e.setAmount(Money.of(req.amount()));
if (req.occurDate() != null) e.setOccurDate(req.occurDate());
if (req.voucher() != null) e.setVoucher(req.voucher());
if (req.status() != null && !req.status().isBlank()) e.setStatus(req.status());
if (req.recorder() != null) e.setRecorder(req.recorder());
return ApiResp.ok(expenseRepo.save(e));
}
/** DELETE /{id} -> 删除研发费用归集。 */
@DeleteMapping("/{id}")
public ApiResp<Void> delete(@PathVariable Long id) {
if (!expenseRepo.existsById(id)) {
throw new NotFoundException("rd expense not found: " + id);
}
expenseRepo.deleteById(id);
return ApiResp.ok(null);
}
}