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

Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01

This commit is contained in:
Harryxzy 2024-02-20 09:51:00 +08:00
parent f5d21042c8 ee82d1cb9a
commit b4f36ab101
20 changed files with 141 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resource/sqlupgrade/DM/sql202402190103.sql Normal file
View File

@ -0,0 +1,3 @@
alter table hrsa_salary_template add feedback_status int;
/

3
resource/sqlupgrade/GS/sql202402190103.sql Normal file
View File

@ -0,0 +1,3 @@
alter table hrsa_salary_template add feedback_status int;
/

3
resource/sqlupgrade/JC/sql202402190103.sql Normal file
View File

@ -0,0 +1,3 @@
alter table hrsa_salary_template add feedback_status int;
/

1
resource/sqlupgrade/Mysql/sql202402190103.sql Normal file
View File

@ -0,0 +1 @@
alter table hrsa_salary_template add feedback_status int;

2
resource/sqlupgrade/Oracle/sql202402190103.sql Normal file
View File

@ -0,0 +1,2 @@
alter table hrsa_salary_template add feedback_status int
/

1
resource/sqlupgrade/PG/sql202402190103.sql Normal file
View File

@ -0,0 +1 @@
alter table hrsa_salary_template add feedback_status int;

2
resource/sqlupgrade/SQLServer/sql202402190103.sql Normal file
View File

@ -0,0 +1,2 @@
alter table hrsa_salary_template add feedback_status int
go

3
resource/sqlupgrade/ST/sql202402190103.sql Normal file
View File

@ -0,0 +1,3 @@
alter table hrsa_salary_template add feedback_status int;
/

1
src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
View File

@ -78,6 +78,7 @@ public class SalaryTemplateBO {
.autoSendDayOfMonth(saveParam.getAutoSendDayOfMonth())
.autoSendTimeOfDay(saveParam.getAutoSendTimeOfDay())
.ackFeedbackStatus(saveParam.getAckFeedbackStatus()?1:0)
.feedbackStatus(saveParam.getFeedbackStatus()?1:0)
.autoAckDays(saveParam.getAutoAckDays())
.feedbackUrl(saveParam.getFeedbackUrl())
.mobileFeedbackUrl(saveParam.getMobileFeedbackUrl())

7
src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java
View File

@ -18,10 +18,15 @@ import lombok.NoArgsConstructor;
public class SalaryBillAckFeedbackDTO {
/**
* 工资单确认反馈是否开启。0：否，1：是
* 工资单确认是否开启。0：否，1：是
*/
private String ackStatus;
/**
* 工资单反馈是否开启。0：否，1：是
*/
private String feedbackStatus;
/**
* 反馈地址
*/

5
src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java
View File

@ -82,6 +82,11 @@ public class SalaryTemplateBaseSetDTO {
*/
private Boolean ackFeedbackStatus;
/**
* 工资单确认反馈状态
*/
private Boolean feedbackStatus;
/**
* 自动确认超时天数
*/

7
src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java
View File

@ -96,10 +96,15 @@ public class SalaryTemplateSaveParam {
private List<SalaryTemplateSalaryItemSetListDTO> replenishSalaryItemSetting;
/**
* 工资单确认反馈状态
* 工资单确认状态
*/
private Boolean ackFeedbackStatus;
/**
* 工资单反馈状态
*/
private Boolean feedbackStatus;
/**
* 自动确认超时天数
*/

5
src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java
View File

@ -180,6 +180,11 @@ public class SalaryTemplatePO {
*/
private Integer ackFeedbackStatus;
/**
* 工资单确认反馈状态
*/
private Integer feedbackStatus;
/**
* 自动确认超时天数
*/

17
src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml
View File

@ -57,6 +57,7 @@
, t.auto_send_day_of_month
, t.auto_send_time_of_day
, t.ack_feedback_status
, t.feedback_status
, t.auto_ack_days
, t.feedback_url
, t.mobile_feedback_url
@ -91,6 +92,7 @@
auto_send_day_of_month,
auto_send_time_of_day,
ack_feedback_status,
feedback_status,
auto_ack_days,
feedback_url,
mobile_feedback_url,
@ -533,6 +535,9 @@
<if test="ackFeedbackStatus!= null">
ack_feedback_status=#{ackFeedbackStatus},
</if>
<if test="feedbackStatus!= null">
feedback_status=#{feedbackStatus},
</if>
<if test="autoAckDays != null">
auto_ack_days=#{autoAckDays},
</if>
@ -638,6 +643,9 @@
<if test="ackFeedbackStatus != null">
ack_feedback_status,
</if>
<if test="feedbackStatus != null">
feedback_status,
</if>
<if test="autoAckDays != null">
auto_ack_days,
</if>
@ -739,6 +747,9 @@
<if test="ackFeedbackStatus != null">
#{ackFeedbackStatus},
</if>
<if test="feedbackStatus != null">
#{feedbackStatus},
</if>
<if test="autoAckDays != null">
#{autoAckDays},
</if>
@ -850,6 +861,9 @@
<if test="ackFeedbackStatus != null">
ack_feedback_status,
</if>
<if test="feedbackStatus != null">
feedback_status,
</if>
<if test="autoAckDays != null">
auto_ack_days,
</if>
@ -951,6 +965,9 @@
<if test="ackFeedbackStatus != null">
#{ackFeedbackStatus},
</if>
<if test="feedbackStatus != null">
#{feedbackStatus},
</if>
<if test="autoAckDays != null">
#{autoAckDays},
</if>

39
src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java
View File

@ -96,13 +96,17 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB
// 工资单确认和反馈 ===========================================================
SalaryBillAckFeedbackDTO ackFeedbackSetting = saveParam.getAckFeedbackSetting();
// 1.保存确认反馈开关状态
getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAckStatus(), SALARY_SEND_FEEDBACK, "工资单确认反馈状态", "billSend");
getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAckStatus(), SALARY_SEND_FEEDBACK, "工资单确认状态", "billSend");
getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getFeedbackStatus(), SALARY_SEND_FEEDBACK_FK, "工资单反馈状态", "billSend");
if (StringUtils.equals(ackFeedbackSetting.getAckStatus(), "1")) {
// 2.保存反馈地址
// 保存自动确认时间
getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAutoAckDays().toString(), SALARY_AUTO_ACK_DAYS, "工资单反馈自动确认", "billSend");
}
if (StringUtils.equals(ackFeedbackSetting.getFeedbackStatus(), "1")) {
// 保存反馈地址
getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getFeedBackUrl(), SALARY_FEEDBACK_URL, "工资单反馈地址", "billSend");
getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getMobileFeedbackUrl(), SALARY_FEEDBACK_URL_MOBILE, "移动端工资单反馈地址", "billSend");
// 3.保存自动确认时间
getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAutoAckDays().toString(), SALARY_AUTO_ACK_DAYS, "工资单反馈自动确认", "billSend");
}
// 工资单时效性设置
@ -127,21 +131,30 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB
@Override
public SalaryBillAckFeedbackDTO getDefaultAckFeedbackSetting() {
// 获取反馈开启状态、自动确认时长、反馈地址
List<String> codes = Arrays.asList(SalarySysConstant.SALARY_SEND_FEEDBACK, SalarySysConstant.SALARY_AUTO_ACK_DAYS, SalarySysConstant.SALARY_FEEDBACK_URL, SALARY_FEEDBACK_URL_MOBILE);
List<String> codes = Arrays.asList(SalarySysConstant.SALARY_SEND_FEEDBACK, SalarySysConstant.SALARY_SEND_FEEDBACK_FK ,SalarySysConstant.SALARY_AUTO_ACK_DAYS, SalarySysConstant.SALARY_FEEDBACK_URL, SALARY_FEEDBACK_URL_MOBILE);
List<SalarySysConfPO> sysConfList = getSalarySysConfService(user).getListByCodes(codes);
Map<String, String> sysConfMap = SalaryEntityUtil.convert2Map(sysConfList, SalarySysConfPO::getConfKey, SalarySysConfPO::getConfValue);
SalaryBillAckFeedbackDTO defaultAckFeedBackDTO = SalaryBillAckFeedbackDTO.builder().build();
String ackStatus = sysConfMap.getOrDefault(SalarySysConstant.SALARY_SEND_FEEDBACK, "0");
if (StringUtils.equals(ackStatus, "0")) {
// 未开启工资单确认
defaultAckFeedBackDTO.setAckStatus("0");
defaultAckFeedBackDTO.setAutoAckDays(0);
defaultAckFeedBackDTO.setFeedBackUrl("/");
defaultAckFeedBackDTO.setMobileFeedbackUrl("/");
return defaultAckFeedBackDTO;
}
// if (StringUtils.equals(ackStatus, "0")) {
// // 未开启工资单确认
// defaultAckFeedBackDTO.setAckStatus("0");
// defaultAckFeedBackDTO.setAutoAckDays(0);
// defaultAckFeedBackDTO.setFeedBackUrl("/");
// defaultAckFeedBackDTO.setMobileFeedbackUrl("/");
// return defaultAckFeedBackDTO;
// }
defaultAckFeedBackDTO.setAckStatus(ackStatus);
String feedbackStatus = sysConfMap.get(SALARY_SEND_FEEDBACK_FK);
if (feedbackStatus == null) {
// 处理历史数据
feedbackStatus = ackStatus;
}
defaultAckFeedBackDTO.setFeedbackStatus(feedbackStatus);
// 获取超时自动确认时间
Integer autoAckDays = Integer.valueOf(sysConfMap.getOrDefault(SalarySysConstant.SALARY_AUTO_ACK_DAYS, "7"));
defaultAckFeedBackDTO.setAutoAckDays(autoAckDays);

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

@ -630,18 +630,34 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
handleSalaryWatermark(salaryTemplate, salarySendInfo, currentEmployeeId);
map.put("salaryTemplate", salaryTemplate);
map.put("salaryAcctResult", salaryAcctResultS);
// 工资单发送人、是否已确认
// 工资单确认按钮
if (NumberUtils.compare(salaryTemplate.getAckFeedbackStatus(), 1) == 0) {
// 反馈后还可以确认或反馈按钮，确认后2个按钮消失
Integer confirmStatus = salarySendInfo.getBillConfirmStatus();
if (confirmStatus == null || confirmStatus != BillConfimStatusEnum.CONFIRMED.getValue()) {
map.put("confirmStatus", "0");
// 开启了工资单确认
Integer ackStatus = salarySendInfo.getBillConfirmStatus();
if (ackStatus == null || ackStatus != BillConfimStatusEnum.CONFIRMED.getValue()) {
map.put("showAck", "1");
} else {
map.put("confirmStatus", "1");
map.put("showAck", "0");
}
map.put("sendEmployeeId", salarySendInfo.getSendEmployeeId());
} else {
map.put("confirmStatus", "1");
map.put("showAck", "0");
}
// 工资单反馈
if (NumberUtils.compare(salaryTemplate.getFeedbackStatus(), 1) == 0) {
// 开启了工资单反馈按钮
Integer confirmStatus = salarySendInfo.getBillConfirmStatus();
map.put("showFeedback", "1");
// 除非确认状态为已确认否则可以一直反馈
if (NumberUtils.compare(salaryTemplate.getAckFeedbackStatus(), 1) == 0 && confirmStatus != null && confirmStatus == BillConfimStatusEnum.CONFIRMED.getValue()) {
map.put("showFeedback", "0");
}
map.put("sendEmployeeId", salarySendInfo.getSendEmployeeId());
} else {
map.put("showFeedback", "0");
}
return map;
@ -709,7 +725,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
throw new SalaryRunTimeException("请先设置工资单模板");
}
Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus();
if (ackFeedbackStatus != null && NumberUtils.compare(ackFeedbackStatus, 1) == 0) {
Integer feedbackStatus = salaryTemplates.get(0).getFeedbackStatus();
if ( (ackFeedbackStatus != null && NumberUtils.compare(ackFeedbackStatus, 1) == 0)
|| (feedbackStatus != null && NumberUtils.compare(feedbackStatus, 1) == 0)) {
// 默认为空时，未读未确认
pageInfo.getList().stream().forEach(obj -> {
SalarySendInfoListDTO dto = (SalarySendInfoListDTO) obj;
@ -825,7 +843,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
*/
private SalaryTemplatePO buildSalaryTemplateContent(String salaryTemplateContent) {
Map<String, Object> map = JsonUtil.parseMap(salaryTemplateContent, Object.class);
return SalaryTemplatePO.builder()
SalaryTemplatePO build = SalaryTemplatePO.builder()
.id(Long.valueOf(map.getOrDefault("id", "0").toString()))
.ackFeedbackStatus(Integer.valueOf(map.getOrDefault("ackFeedbackStatus", "0").toString()))
.autoAckDays(Integer.valueOf(map.getOrDefault("autoAckDays", "0").toString()))
@ -849,6 +867,13 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
.replenishName(map.getOrDefault("replenishName", "").toString())
.replenishSalaryItemSetting(map.getOrDefault("replenishSalaryItemSetting", "").toString())
.build();
Object feedbackStatus = map.get("feedbackStatus");
if (feedbackStatus == null || StringUtils.isBlank(feedbackStatus.toString())) {
build.setFeedbackStatus(build.getAckFeedbackStatus());
} else {
build.setFeedbackStatus(Integer.valueOf(feedbackStatus.toString()));
}
return build;
}
/**

1
src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
View File

@ -228,6 +228,7 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate
salaryTemplateNew.setAutoSendStatus(saveParam.getAutoSendStatus() ? 1 : 0);
salaryTemplateNew.setAutoSendCycleType(saveParam.getAutoSendCycleType());
salaryTemplateNew.setAckFeedbackStatus(saveParam.getAckFeedbackStatus() ? 1 : 0);
salaryTemplateNew.setFeedbackStatus(saveParam.getFeedbackStatus() ? 1 : 0);
salaryTemplateNew.setAutoAckDays(saveParam.getAutoAckDays());
salaryTemplateNew.setFeedbackUrl(saveParam.getFeedbackUrl());
salaryTemplateNew.setMobileFeedbackUrl(saveParam.getMobileFeedbackUrl());

7
src/com/engine/salary/sys/constant/SalarySysConstant.java
View File

@ -82,10 +82,15 @@ public class SalarySysConstant {
public static final String SALARY_ARCHIVE_DELETE = "salaryArchiveDelete";
/**
* 工资单确认反馈状态
* 工资单确认状态
*/
public static final String SALARY_SEND_FEEDBACK = "SALARY_SEND_FEEDBACK";
/**
* 工资单反馈状态
*/
public static final String SALARY_SEND_FEEDBACK_FK = "SALARY_SEND_FEEDBACK_FK";
/**
* 工资单反馈自动确认
*/

12
src/com/engine/salary/wrapper/SalarySendWrapper.java
View File

@ -151,9 +151,15 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy
Optional<SalaryTemplatePO> optional = salaryTemplates.stream().filter(s -> s.getSalarySobId().equals(e.getSalarySobId())).findFirst();
if (optional.isPresent()) {
// todo 目前就一个回算，那么没有冻结且是回算，就展示补发名称
e.setTemplate(NumberUtils.INTEGER_ONE.equals(e.getSalaryAcctType()) ? optional.get().getReplenishName() : optional.get().getName());
e.setTemplateId(optional.get().getId());
e.setAckFeedbackStatus(optional.get().getAckFeedbackStatus() == null ? 0 : optional.get().getAckFeedbackStatus());
SalaryTemplatePO salaryTemplatePO = optional.get();
e.setTemplate(NumberUtils.INTEGER_ONE.equals(e.getSalaryAcctType()) ? salaryTemplatePO.getReplenishName() : salaryTemplatePO.getName());
e.setTemplateId(salaryTemplatePO.getId());
if ((salaryTemplatePO.getAckFeedbackStatus() != null && salaryTemplatePO.getAckFeedbackStatus() == 1) ||
(salaryTemplatePO.getFeedbackStatus() != null && salaryTemplatePO.getFeedbackStatus() == 1) ) {
e.setAckFeedbackStatus(1);
} else {
e.setAckFeedbackStatus(0);
}
}
});
}

7
src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
View File

@ -173,6 +173,12 @@ public class SalaryTemplateWrapper extends Service {
salaryTemplateBaseSetDTO.setSendEmail(po.getSendEmailId());
salaryTemplateBaseSetDTO.setAutoSendStatus(po.getAutoSendStatus() != null && po.getAutoSendStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue()));
salaryTemplateBaseSetDTO.setAckFeedbackStatus(po.getAckFeedbackStatus() != null && NumberUtils.compare(po.getAckFeedbackStatus(), 1) == 0);
if (po.getFeedbackStatus() == null) {
salaryTemplateBaseSetDTO.setFeedbackStatus(salaryTemplateBaseSetDTO.getAckFeedbackStatus());
} else {
salaryTemplateBaseSetDTO.setFeedbackStatus(NumberUtils.compare(po.getFeedbackStatus(), 1) == 0);
}
salaryTemplateBaseSetDTO.setAutoAckDays(ObjectUtils.isEmpty(po.getAutoAckDays()) ? 7 : po.getAutoAckDays());
// 规则赋值 如果为ALL传“” 如果为byRule传薪资项目ID
salaryTemplateBaseSetDTO.setReplenishRule(SalaryTemplateReplenishRuleEnum.ALL.getValue().equals(po.getReplenishRule()) ? "" : po.getReplenishRule());
@ -206,6 +212,7 @@ public class SalaryTemplateWrapper extends Service {
SalaryBillAckFeedbackDTO defaultAckFeedback = getSalaryBillBaseSetService(user).getDefaultAckFeedbackSetting();
salaryTemplateBaseSetDTO.setAckFeedbackStatus(StringUtils.equals(defaultAckFeedback.getAckStatus(), "1"));
salaryTemplateBaseSetDTO.setAutoAckDays(defaultAckFeedback.getAutoAckDays());
salaryTemplateBaseSetDTO.setFeedbackStatus(StringUtils.equals(defaultAckFeedback.getFeedbackStatus(), "1"));
salaryTemplateBaseSetDTO.setFeedbackUrl(defaultAckFeedback.getFeedBackUrl());
salaryTemplateBaseSetDTO.setMobileFeedbackUrl(defaultAckFeedback.getMobileFeedbackUrl());
}