qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.17.1.2411.01' into feature/数据推送

This commit is contained in:
钱涛 2024-11-20 18:43:59 +08:00
parent dd77a2f11b ba3e635e1f
commit 2fe7b7dc03
4 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/WEB-INF/prop/hrmSalary.properties
View File

@ -1,5 +1,5 @@
log=false
defaultCloseNonStandard149=true
AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
version=2.16.1.2410.01
version=2.17.1.2411.01
openFormulaForcedEditing=false

4
src/com/engine/salary/entity/setting/po/PageListSettingPO.java
View File

@ -10,13 +10,11 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
* 薪资帐套表
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
//hrsa_page_list_setting
public class PageListSettingPO {
@ElogTransform(name = "id")

33
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -1507,6 +1507,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<>();
@ -1516,14 +1519,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();
@ -1534,7 +1547,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<>());
@ -1558,6 +1574,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);
}

5
src/com/engine/salary/service/impl/SettingServiceImpl.java
View File

@ -70,15 +70,16 @@ public class SettingServiceImpl extends Service implements SettingService {
Date now = new Date();
PageListSettingPO pageListSettingPO = getPageListSettingMapper().getByPage(pageListSettingSaveParam.getPage());
List<Long> checked = pageListSettingSaveParam.getSetting().stream().distinct().collect(Collectors.toList());
if (pageListSettingPO != null) {
pageListSettingPO.setSetting(pageListSettingSaveParam.getSetting());
pageListSettingPO.setSetting(checked);
pageListSettingPO.setUpdateTime(now);
getPageListSettingMapper().updateIgnoreNull(pageListSettingPO);
} else {
pageListSettingPO = PageListSettingPO.builder()
.id(IdGenerator.generate())
.page(pageListSettingSaveParam.getPage())
.setting(pageListSettingSaveParam.getSetting())
.setting(checked)
.creator((long) user.getUID())
.createTime(now)
.updateTime(now)