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,167 @@
|
||||
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.Bid;
|
||||
import com.kaidi.oa.domain.CrmBidQuoteDetail;
|
||||
import com.kaidi.oa.repository.BidRepository;
|
||||
import com.kaidi.oa.repository.CrmBidQuoteDetailRepository;
|
||||
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.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.RestController;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.Instant;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 投标报价明细(Module 3 缺口:bidAmount 单字段→拆线报价明细表)。
|
||||
* <p>
|
||||
* 每笔投标(Bid)可维护多条报价明细(直接费/间接费/利润/税金),
|
||||
* 支持多报价策略(低价/合理价/高价),并聚合汇总端点。
|
||||
* 同时新建「投标文件-CollabDoc 联动」聚合端点(bidId外键联查)。
|
||||
* <p>
|
||||
* GET /crm-bid-quote-details/by-bid/{bidId} -> 某投标的报价明细列表
|
||||
* GET /crm-bid-quote-details/summary/{bidId} -> 报价汇总
|
||||
* POST /crm-bid-quote-details -> 新建报价明细行
|
||||
* PUT /crm-bid-quote-details/{id} -> 更新报价明细行
|
||||
* DELETE /crm-bid-quote-details/{id} -> 删除报价明细行
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/oa/crm-bid-quote-details")
|
||||
public class CrmBidQuoteDetailController {
|
||||
|
||||
private static final List<String> VALID_CATEGORIES = List.of("直接费", "间接费", "利润", "税金", "其他");
|
||||
private static final List<String> VALID_STRATEGIES = List.of("低价策略", "合理价策略", "高价策略");
|
||||
|
||||
private final CrmBidQuoteDetailRepository quoteRepo;
|
||||
private final BidRepository bidRepo;
|
||||
|
||||
public CrmBidQuoteDetailController(CrmBidQuoteDetailRepository quoteRepo,
|
||||
BidRepository bidRepo) {
|
||||
this.quoteRepo = quoteRepo;
|
||||
this.bidRepo = bidRepo;
|
||||
}
|
||||
|
||||
@GetMapping("/by-bid/{bidId}")
|
||||
public ApiResp<List<CrmBidQuoteDetail>> listByBid(@PathVariable Long bidId) {
|
||||
bidRepo.findById(bidId).orElseThrow(() -> new NotFoundException("投标项目不存在:" + bidId));
|
||||
return ApiResp.ok(quoteRepo.findByBidId(bidId));
|
||||
}
|
||||
|
||||
/**
|
||||
* GET /summary/{bidId} -> 按类别汇总报价金额 + 占比 + 合计。
|
||||
*/
|
||||
@GetMapping("/summary/{bidId}")
|
||||
public ApiResp<Map<String, Object>> summary(@PathVariable Long bidId) {
|
||||
Bid bid = bidRepo.findById(bidId).orElseThrow(() -> new NotFoundException("投标项目不存在:" + bidId));
|
||||
List<CrmBidQuoteDetail> lines = quoteRepo.findByBidId(bidId);
|
||||
|
||||
BigDecimal total = lines.stream()
|
||||
.map(d -> Money.nz(d.getAmount()))
|
||||
.reduce(BigDecimal.ZERO, Money::add);
|
||||
|
||||
Map<String, BigDecimal> byCategory = new LinkedHashMap<>();
|
||||
for (CrmBidQuoteDetail d : lines) {
|
||||
String cat = d.getCategory() == null ? "其他" : d.getCategory();
|
||||
byCategory.merge(cat, Money.nz(d.getAmount()), Money::add);
|
||||
}
|
||||
|
||||
// 计算各类别占比
|
||||
List<Map<String, Object>> catRows = new java.util.ArrayList<>();
|
||||
for (Map.Entry<String, BigDecimal> e : byCategory.entrySet()) {
|
||||
Map<String, Object> row = new LinkedHashMap<>();
|
||||
row.put("category", e.getKey());
|
||||
row.put("amount", e.getValue().doubleValue());
|
||||
double pct = total.signum() == 0 ? 0.0
|
||||
: Math.round(e.getValue().doubleValue() * 1000.0 / total.doubleValue()) / 10.0;
|
||||
row.put("pct", pct);
|
||||
catRows.add(row);
|
||||
}
|
||||
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("bidId", bidId);
|
||||
result.put("projectName", bid.getProjectName());
|
||||
result.put("bidAmount", Money.nz(bid.getBidAmount()).doubleValue());
|
||||
result.put("totalQuoted", total.doubleValue());
|
||||
result.put("quoteLineCount", lines.size());
|
||||
result.put("byCategory", catRows);
|
||||
return ApiResp.ok(result);
|
||||
}
|
||||
|
||||
public record QuoteDetailRequest(
|
||||
Long bidId,
|
||||
String category, String itemName,
|
||||
Double amount,
|
||||
Double pct,
|
||||
String priceStrategy, String remark, String createdBy) {
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
@Transactional
|
||||
public ApiResp<CrmBidQuoteDetail> create(@RequestBody QuoteDetailRequest req) {
|
||||
if (req.bidId() == null) throw new ApiException(400, "bidId 不能为空");
|
||||
if (req.category() == null || req.category().isBlank()) throw new ApiException(400, "费用类别 category 不能为空");
|
||||
if (!VALID_CATEGORIES.contains(req.category())) {
|
||||
throw new ApiException(400, "费用类别无效,必须为:" + String.join("/", VALID_CATEGORIES));
|
||||
}
|
||||
bidRepo.findById(req.bidId()).orElseThrow(() -> new NotFoundException("投标项目不存在:" + req.bidId()));
|
||||
|
||||
CrmBidQuoteDetail d = new CrmBidQuoteDetail();
|
||||
d.setBidId(req.bidId());
|
||||
d.setCategory(req.category());
|
||||
d.setItemName(req.itemName());
|
||||
d.setAmount(req.amount() != null ? Money.of(req.amount()) : BigDecimal.ZERO);
|
||||
d.setPct(req.pct());
|
||||
if (req.priceStrategy() != null && !VALID_STRATEGIES.contains(req.priceStrategy())) {
|
||||
throw new ApiException(400, "报价策略无效,必须为:" + String.join("/", VALID_STRATEGIES));
|
||||
}
|
||||
d.setPriceStrategy(req.priceStrategy());
|
||||
d.setRemark(req.remark());
|
||||
d.setCreatedBy(req.createdBy());
|
||||
d.setCreatedAt(Instant.now());
|
||||
return ApiResp.ok(quoteRepo.save(d));
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
@Transactional
|
||||
public ApiResp<CrmBidQuoteDetail> update(@PathVariable Long id, @RequestBody QuoteDetailRequest req) {
|
||||
CrmBidQuoteDetail d = quoteRepo.findById(id)
|
||||
.orElseThrow(() -> new NotFoundException("报价明细不存在:" + id));
|
||||
if (req.category() != null) {
|
||||
if (!VALID_CATEGORIES.contains(req.category())) {
|
||||
throw new ApiException(400, "费用类别无效,必须为:" + String.join("/", VALID_CATEGORIES));
|
||||
}
|
||||
d.setCategory(req.category());
|
||||
}
|
||||
if (req.itemName() != null) d.setItemName(req.itemName());
|
||||
if (req.amount() != null) d.setAmount(Money.of(req.amount()));
|
||||
if (req.pct() != null) d.setPct(req.pct());
|
||||
if (req.priceStrategy() != null) {
|
||||
if (!VALID_STRATEGIES.contains(req.priceStrategy())) {
|
||||
throw new ApiException(400, "报价策略无效,必须为:" + String.join("/", VALID_STRATEGIES));
|
||||
}
|
||||
d.setPriceStrategy(req.priceStrategy());
|
||||
}
|
||||
if (req.remark() != null) d.setRemark(req.remark());
|
||||
return ApiResp.ok(quoteRepo.save(d));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
@Transactional
|
||||
public ApiResp<Void> delete(@PathVariable Long id) {
|
||||
if (!quoteRepo.existsById(id)) throw new NotFoundException("报价明细不存在:" + id);
|
||||
quoteRepo.deleteById(id);
|
||||
return ApiResp.ok(null);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user