From ca2ea16d40220d0fc011dc823dc2d0160afcbf85 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 23 Jun 2025 09:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E4=BF=AE=E6=94=B9=E7=9B=88?= =?UTF-8?q?=E4=BA=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/controller/SysOaProjectController.java | 3 +- .../oa/domain/vo/ProjectProfitLossVO.java | 14 +++-- .../oa/service/ISysOaProjectService.java | 2 +- .../service/impl/SysOaProjectServiceImpl.java | 48 ++++++--------- .../mapper/oa/SysOaProjectMapper.xml | 59 ++++++++----------- 5 files changed, 55 insertions(+), 71 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java index eb85a91..d44fe29 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java @@ -236,6 +236,7 @@ public class SysOaProjectController extends BaseController { @RequestParam(required = false) String projectName, @RequestParam(required = false) String projectNum, @RequestParam(required = false) String projectStatus, + @RequestParam(required = false) String isDomestic, @RequestParam(required = false) BigDecimal minContractAmount, @RequestParam(required = false) BigDecimal maxContractAmount, @RequestParam(required = false) BigDecimal minProfitLoss, @@ -251,7 +252,7 @@ public class SysOaProjectController extends BaseController { pageQuery.setIsAsc(sortOrder); System.out.println("收到"); return iSysOaProjectService.getProjectProfitLossList( - projectName, projectNum, projectStatus, + projectName, projectNum, projectStatus,isDomestic, minContractAmount, maxContractAmount, minProfitLoss, maxProfitLoss, beginTimeStart, beginTimeEnd, profitType, pageQuery); diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/ProjectProfitLossVO.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/ProjectProfitLossVO.java index 353edbc..1f112a0 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/ProjectProfitLossVO.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/ProjectProfitLossVO.java @@ -16,17 +16,19 @@ public class ProjectProfitLossVO { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal originalFunds; // 原始合同金额 private String projectRemark; // 项目备注（用于判断币种） - private BigDecimal contractAmountUsd; // 美元合同金额 private Integer isUsd; // 是否美元（1是，0否） + // 从财务明细中汇总的总收入（仅用于无合同额的项目） + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigDecimal detailIncome; private BigDecimal exchangeRate; // 实时汇率 + // 从财务明细中汇总的总支出（所有项目的成本来源） @JsonFormat(shape = JsonFormat.Shape.STRING) - private BigDecimal contractAmountCny; // 人民币合同金额 + private BigDecimal totalExpenditure; + // 最终计算出的总收入（人民币，展示用） @JsonFormat(shape = JsonFormat.Shape.STRING) - private BigDecimal warehouseCost; - @JsonFormat(shape = JsonFormat.Shape.STRING) - private BigDecimal hrCost; + private BigDecimal totalIncomeCny; @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal profitLoss; //盈亏金额 // ...其他字段 - // getter/setter + } \ No newline at end of file diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java index 3d31ba8..71b608b 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java @@ -24,7 +24,7 @@ public interface ISysOaProjectService { /** * 项目盈亏排序 */ - TableDataInfo getProjectProfitLossList(String projectName,String projectNum,String projectStatus, + TableDataInfo getProjectProfitLossList(String projectName,String projectNum,String projectStatus,String isisDomestic, BigDecimal minContractAmount,BigDecimal maxContractAmount,BigDecimal minProfitLoss, BigDecimal maxProfitLoss,String beginTimeStart,String beginTimeEnd,String profitType, PageQuery pageQuery); diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java index b3d594d..4888e79 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java @@ -70,13 +70,13 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService { */ @Override public TableDataInfo getProjectProfitLossList( - String projectName, String projectNum, String projectStatus, + String projectName, String projectNum, String projectStatus, String isDomestic, BigDecimal minContractAmount, BigDecimal maxContractAmount, BigDecimal minProfitLoss, BigDecimal maxProfitLoss, String beginTimeStart, String beginTimeEnd, String profitType, PageQuery pageQuery ) { - // 1. 获取实时汇率，用于后续计算 + // 1. 获取实时汇率 BigDecimal currentExchangeRate = exchangeRateService.getCurrentUsdExchangeRate(); // 2. 构建基础查询条件 (WHERE子句) @@ -84,63 +84,51 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService { wrapper.like(StringUtils.isNotBlank(projectName), "p.project_name", projectName); wrapper.like(StringUtils.isNotBlank(projectNum), "p.project_num", projectNum); wrapper.eq(StringUtils.isNotBlank(projectStatus), "p.project_status", projectStatus); - // wrapper.eq(StringUtils.isNotBlank(isDomestic), "p.is_domestic", isDomestic); // 如果需要，可以放开此注释 - - // 对原始合同金额进行筛选 wrapper.ge(minContractAmount != null, "p.funds", minContractAmount); wrapper.le(maxContractAmount != null, "p.funds", maxContractAmount); - - // 对项目时间进行筛选 wrapper.ge(StringUtils.isNotBlank(beginTimeStart), "p.begin_time", beginTimeStart); wrapper.le(StringUtils.isNotBlank(beginTimeEnd), "p.begin_time", beginTimeEnd); - // 3. 构建HAVING子句，用于筛选计算后的盈亏值 - // HAVING子句允许我们在GROUP BY或聚合函数计算后进行条件筛选 + // 3. 构建HAVING子句, 用于筛选计算后的盈亏值 StringBuilder havingClause = new StringBuilder(); - - // 盈亏类型筛选 if ("profit".equals(profitType)) { havingClause.append("profit_loss > 0"); } else if ("loss".equals(profitType)) { havingClause.append("profit_loss < 0"); } - - // 盈亏区间筛选 if (minProfitLoss != null) { - if (havingClause.length() > 0) { - havingClause.append(" AND "); - } + if (havingClause.length() > 0) havingClause.append(" AND "); havingClause.append("profit_loss >= ").append(minProfitLoss); } if (maxProfitLoss != null) { - if (havingClause.length() > 0) { - havingClause.append(" AND "); - } + if (havingClause.length() > 0) havingClause.append(" AND "); havingClause.append("profit_loss <= ").append(maxProfitLoss); } - - // 4. 将HAVING子句应用到QueryWrapper if (havingClause.length() > 0) { wrapper.having(havingClause.toString()); } - // 5. 构建分页对象 (排序由PageQuery自动处理) + // 4. 构建分页对象 (排序由PageQuery自动处理) Page page = pageQuery.build(); - // 6. 调用Mapper方法，传入汇率，让数据库完成计算、筛选和分页 + // 5. 调用Mapper方法, 传入汇率 Page result = baseMapper.selectProfitLossPage(page, wrapper, currentExchangeRate); - // 7. 再次填充VO中的展示字段，确保前端获取的数据是完整的 - // 虽然数据库已经计算了profit_loss，但在这里填充其他相关字段（如汇率、转换后的合同额）可以让API返回更丰富的信息 + // 6. 再次填充VO中的展示字段, 确保前端获取的数据是完整的 for (ProjectProfitLossVO vo : result.getRecords()) { vo.setExchangeRate(currentExchangeRate); // 填充实时汇率 - if (vo.getIsUsd() == 1) { - // 计算人民币合同额用于展示 - vo.setContractAmountCny(vo.getOriginalFunds().multiply(currentExchangeRate)); + + // 计算最终的总收入(人民币)用于展示 + if (vo.getOriginalFunds() != null && vo.getOriginalFunds().compareTo(BigDecimal.ZERO) > 0) { + if (vo.getIsUsd() == 1) { + vo.setTotalIncomeCny(vo.getOriginalFunds().multiply(currentExchangeRate)); + } else { + vo.setTotalIncomeCny(vo.getOriginalFunds()); + } } else { - vo.setContractAmountCny(vo.getOriginalFunds()); + vo.setTotalIncomeCny(vo.getDetailIncome()); } - // profit_loss 已经由数据库计算返回，无需再次计算 + // profit_loss 已经由数据库根据最新逻辑计算返回, 无需再次处理 } return TableDataInfo.build(result); diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml index 11cb40d..7a09e2f 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml @@ -815,6 +815,7 @@ +