工资单导出增加查看、确认状态
This commit is contained in:
parent
00271f3a4b
commit
05c0995841
|
|
@ -1464,6 +1464,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
|
|||
|
||||
@Override
|
||||
public XSSFWorkbook exportInfoList(SalarySendInfoQueryParam queryParam) {
|
||||
// 校验
|
||||
SalarySendInfoQueryParam.checkParam(queryParam);
|
||||
|
||||
// 1.工作簿名称
|
||||
String sheetName = SalaryI18nUtil.getI18nLabel(100528, "工资单发放信息");
|
||||
List<Object> header = new ArrayList<>();
|
||||
|
|
@ -1473,14 +1476,24 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
|
|||
header.add(SalaryI18nUtil.getI18nLabel(86186, "手机号"));
|
||||
header.add(SalaryI18nUtil.getI18nLabel(86317, "工号"));
|
||||
header.add(SalaryI18nUtil.getI18nLabel(86317, "发送状态"));
|
||||
|
||||
SalarySendPO salarySendPO = getById(queryParam.getSalarySendId());
|
||||
if (salarySendPO == null) {
|
||||
throw new SalaryRunTimeException("工资单不存在");
|
||||
}
|
||||
List<SalaryTemplatePO> salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySendPO.getSalarySobId()));
|
||||
if (CollectionUtils.isEmpty(salaryTemplates)) {
|
||||
throw new SalaryRunTimeException("请先设置工资单模板");
|
||||
}
|
||||
Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus();
|
||||
Integer feedbackStatus = salaryTemplates.get(0).getFeedbackStatus();
|
||||
if ((ackFeedbackStatus != null && NumberUtils.compare(ackFeedbackStatus, 1) == 0)
|
||||
|| (feedbackStatus != null && NumberUtils.compare(feedbackStatus, 1) == 0)) {
|
||||
header.add(SalaryI18nUtil.getI18nLabel(0, "查看状态"));
|
||||
header.add(SalaryI18nUtil.getI18nLabel(0, "确认状态"));
|
||||
}
|
||||
List<List<Object>> rows = new ArrayList<>();
|
||||
// 2.表头
|
||||
rows.add(header);
|
||||
|
||||
// 校验
|
||||
SalarySendInfoQueryParam.checkParam(queryParam);
|
||||
|
||||
// 获取行数据
|
||||
//排序配置
|
||||
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
|
||||
|
|
@ -1491,7 +1504,10 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
|
|||
list.forEach(e -> {
|
||||
// 发放状态
|
||||
e.setSendStatus(SalarySendStatusEnum.getDefaultLabelByValue(Integer.valueOf(e.getSendStatus())));
|
||||
|
||||
// 查看状态
|
||||
e.setBillReadStatus(NumberUtils.isCreatable(e.getBillReadStatus()) ? BillReadStatusEnum.getDefaultLabelByValue(Integer.valueOf(e.getBillReadStatus())) : "");
|
||||
// 确认状态
|
||||
e.setBillConfirmStatus(NumberUtils.isCreatable(e.getBillConfirmStatus()) ? BillConfimStatusEnum.getDefaultLabelByValue(Integer.valueOf(e.getBillConfirmStatus())) : "");
|
||||
//外部人员
|
||||
if (Objects.equals(e.getEmployeeType(), 1)) {
|
||||
List<DataCollectionEmployee> employees = idEmpMap.getOrDefault(e.getEmployeeId(), new ArrayList<>());
|
||||
|
|
@ -1515,6 +1531,11 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
|
|||
row.add(dto.getMobile());
|
||||
row.add(dto.getJobNum());
|
||||
row.add(dto.getSendStatus());
|
||||
if ((ackFeedbackStatus != null && NumberUtils.compare(ackFeedbackStatus, 1) == 0)
|
||||
|| (feedbackStatus != null && NumberUtils.compare(feedbackStatus, 1) == 0)) {
|
||||
row.add(dto.getBillReadStatus());
|
||||
row.add(dto.getBillConfirmStatus());
|
||||
}
|
||||
rows.add(row);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue