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-30 17:06:47 +08:00
parent fe13e952f2
commit 3d386ff650
17 changed files with 791 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@ import java.util.Date;
@ExcelIgnoreUnannotated
public class GearWageEntryDetailVo {
@ExcelProperty(value = "明细ID")
private Long detailId;
@ExcelProperty(value = "业务日期")
@@ -24,63 +23,49 @@ public class GearWageEntryDetailVo {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date entryDate;
@ExcelProperty(value = "员工ID")
private Long empId;
@ExcelProperty(value = "员工姓名")
private String empName;
@ExcelProperty(value = "计费类型")
private String billingType;
@ExcelProperty(value = "费率配置ID")
private Long rateId;
@ExcelProperty(value = "工种")
private String workTypeName;
@ExcelProperty(value = "加工物品")
private String itemName;
@ExcelProperty(value = "工序")
private String processName;
@ExcelProperty(value = "订单号")
private String orderNo;
@ExcelProperty(value = "工作量")
private BigDecimal workload;
@ExcelProperty(value = "单价")
private BigDecimal unitPrice;
@ExcelProperty(value = "基础金额")
private BigDecimal baseAmount;
@ExcelProperty(value = "额外金额")
private BigDecimal extraAmount;
@ExcelProperty(value = "额外原因")
private String extraReason;
@ExcelProperty(value = "明细计算金额")
private BigDecimal calcAmount;
private String calcDetail;
@ExcelProperty(value = "总金额")
@ExcelProperty(value = "每天工资")
private BigDecimal dailyWage;
@ExcelProperty(value = "当天金额")
private BigDecimal totalAmount;
@ExcelProperty(value = "是否补录")
private String isMakeup;
@ExcelProperty(value = "补录责任人")
private String makeupResponsible;
@ExcelProperty(value = "补录原因")
private String makeupReason;
@ExcelProperty(value = "备注")
private String remark;
@ExcelProperty(value = "累计金额")
private BigDecimal cumulativeAmount;

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

@@ -51,6 +51,13 @@ public class GearWageEntryDetailServiceImpl implements IGearWageEntryDetailServi
syncTodayWorkers(bo.getEntryDate());
LambdaQueryWrapper<GearWageEntryDetail> lqw = buildQueryWrapper(bo);
Page<GearWageEntryDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
if (result != null && result.getRecords() != null) {
for (GearWageEntryDetailVo vo : result.getRecords()) {
if (vo != null) {
vo.setDailyWage(vo.getTotalAmount());
}
}
}
return TableDataInfo.build(result);
}
@@ -65,6 +72,13 @@ public class GearWageEntryDetailServiceImpl implements IGearWageEntryDetailServi
syncTodayWorkers(bo.getEntryDate());
// 将 selectList 改为 selectVoList
List<GearWageEntryDetailVo> list = baseMapper.selectVoList(buildQueryWrapper(bo));
if (list != null) {
for (GearWageEntryDetailVo vo : list) {
if (vo != null) {
vo.setDailyWage(vo.getTotalAmount());
}
}
}
// 处理累计金额
if (bo.getCumulativeAmounts() != null) {
for (GearWageEntryDetailVo vo : list) {