DeXun/GEAR-OA
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

明细计算，产品详情页

Browse Source
This commit is contained in:
朱昊天
2026-04-28 16:53:35 +08:00
parent 539889a346
commit fe13e952f2
18 changed files with 633 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gear-oa/src/main/java/com/gear/oa/domain/GearWageEntryDetail.java
View File

@@ -57,6 +57,16 @@ public class GearWageEntryDetail extends BaseEntity {
private String extraReason;
/**
* 明细计算金额（多行乘法合计）
*/
private BigDecimal calcAmount;
/**
* 明细计算行JSON（两列乘法）
*/
private String calcDetail;
private BigDecimal totalAmount;
/**

4
gear-oa/src/main/java/com/gear/oa/domain/bo/GearWageEntryDetailBo.java
View File

@@ -59,6 +59,10 @@ public class GearWageEntryDetailBo extends BaseEntity {
private String extraReason;
private BigDecimal calcAmount;
private String calcDetail;
private BigDecimal totalAmount;
private String isMakeup;

5
gear-oa/src/main/java/com/gear/oa/domain/vo/GearWageEntryDetailVo.java
View File

@@ -63,6 +63,11 @@ public class GearWageEntryDetailVo {
@ExcelProperty(value = "额外原因")
private String extraReason;
@ExcelProperty(value = "明细计算金额")
private BigDecimal calcAmount;
private String calcDetail;
@ExcelProperty(value = "总金额")
private BigDecimal totalAmount;

4
gear-oa/src/main/java/com/gear/oa/service/impl/GearWageEntryDetailServiceImpl.java
View File

@@ -188,6 +188,7 @@ public class GearWageEntryDetailServiceImpl implements IGearWageEntryDetailServi
private void fillAmountFields(GearWageEntryDetail entity) {
BigDecimal workload = entity.getWorkload() == null ? BigDecimal.ZERO : entity.getWorkload();
BigDecimal extraAmount = entity.getExtraAmount() == null ? BigDecimal.ZERO : entity.getExtraAmount();
BigDecimal calcAmount = entity.getCalcAmount() == null ? BigDecimal.ZERO : entity.getCalcAmount();
// 小时工/天工默认按1个计量单位计算基础金额（1小时或1天）
if (("1".equals(entity.getBillingType()) || "3".equals(entity.getBillingType())) && workload.compareTo(BigDecimal.ZERO) <= 0) {
@@ -212,7 +213,8 @@ public class GearWageEntryDetailServiceImpl implements IGearWageEntryDetailServi
BigDecimal baseAmount = workload.multiply(unitPrice);
entity.setBaseAmount(baseAmount);
entity.setExtraAmount(extraAmount);
entity.setTotalAmount(baseAmount.add(extraAmount));
entity.setCalcAmount(calcAmount);
entity.setTotalAmount(baseAmount.add(extraAmount).add(calcAmount));
}
private void fillMakeupFields(GearWageEntryDetail entity) {