月工资计算,产品详情页补充

This commit is contained in:
朱昊天
2026-04-20 18:47:36 +08:00
parent 3ae6403bd3
commit 2e7a50bf64
15 changed files with 660 additions and 20 deletions

View File

@@ -12,6 +12,7 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Map;
/**
* 工资录入明细业务对象 gear_wage_entry_detail
@@ -71,4 +72,6 @@ public class GearWageEntryDetailBo extends BaseEntity {
private String makeupReason;
private String remark;
// 新增累计金额
private Map<String, BigDecimal> cumulativeAmounts;
}

View File

@@ -77,4 +77,6 @@ public class GearWageEntryDetailVo {
@ExcelProperty(value = "备注")
private String remark;
@ExcelProperty(value = "累计金额")
private BigDecimal cumulativeAmount;
}

View File

@@ -49,11 +49,24 @@ public class GearWageEntryDetailServiceImpl implements IGearWageEntryDetailServi
return TableDataInfo.build(result);
}
@Override
public List<GearWageEntryDetailVo> queryList(GearWageEntryDetailBo bo) {
LambdaQueryWrapper<GearWageEntryDetail> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
// @Override
// public List<GearWageEntryDetailVo> queryList(GearWageEntryDetailBo bo) {
// LambdaQueryWrapper<GearWageEntryDetail> lqw = buildQueryWrapper(bo);
// return baseMapper.selectVoList(lqw);
//
// }
@Override
public List<GearWageEntryDetailVo> queryList(GearWageEntryDetailBo bo) {
// 将 selectList 改为 selectVoList
List<GearWageEntryDetailVo> list = baseMapper.selectVoList(buildQueryWrapper(bo));
// 处理累计金额
if (bo.getCumulativeAmounts() != null) {
for (GearWageEntryDetailVo vo : list) {
vo.setCumulativeAmount(bo.getCumulativeAmounts().get(vo.getEmpName()));
}
}
return list;
}
private LambdaQueryWrapper<GearWageEntryDetail> buildQueryWrapper(GearWageEntryDetailBo bo) {
LambdaQueryWrapper<GearWageEntryDetail> lqw = Wrappers.lambdaQuery();