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

工资单反馈区分pc和移动端

This commit is contained in:
Harryxzy 2024-01-23 16:45:09 +08:00
parent c9220d62e1
commit 71f90882d3
11 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,7 @@ public class SalaryTemplateBO {
.ackFeedbackStatus(saveParam.getAckFeedbackStatus()?1:0)
.autoAckDays(saveParam.getAutoAckDays())
.feedbackUrl(saveParam.getFeedbackUrl())
.mobileFeedbackUrl(saveParam.getMobileFeedbackUrl())
.createTime(new Date())
.updateTime(new Date())
.creator(employeeId)

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

@ -27,6 +27,12 @@ public class SalaryBillAckFeedbackDTO {
*/
private String feedBackUrl;
/**
* 移动端反馈地址
*/
private String mobileFeedBackUrl;
/**
* 超时自动确认天数
*/

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

@ -92,4 +92,10 @@ public class SalaryTemplateBaseSetDTO {
*
*/
private String feedbackUrl;
/**
* 移动端反馈流程地址
*
*/
private String mobileFeedbackUrl;
}

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

@ -110,6 +110,11 @@ public class SalaryTemplateSaveParam {
*/
private String feedbackUrl;
/**
* 移动端反馈流程地址
*/
private String mobileFeedbackUrl;
List<SalaryBillItemNameSaveParam> salaryBillItemNameSetting;
public static void checkParam(SalaryTemplateSaveParam saveParam) {

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

@ -192,6 +192,13 @@ public class SalaryTemplatePO {
private String feedbackUrl;
/**
* 移动端反馈流程地址
*
*/
private String mobileFeedbackUrl;
private Collection<Long> salarySobIds;
}

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

@ -92,6 +92,7 @@
ack_feedback_status,
auto_ack_days,
feedback_url,
mobile_feedback_url,
create_time,
update_time,
creator,
@ -534,6 +535,9 @@
<if test="feedbackUrl != null">
feedback_url=#{feedbackUrl},
</if>
<if test="mobileFeedbackUrl != null">
mobile_feedback_url=#{mobileFeedbackUrl},
</if>
<if test="createTime != null">
create_time=#{createTime},
</if>
@ -636,6 +640,9 @@
<if test="feedbackUrl != null">
feedback_url,
</if>
<if test="mobileFeedbackUrl != null">
mobile_feedback_url,
</if>
<if test="createTime != null">
create_time,
</if>
@ -734,6 +741,9 @@
<if test="feedbackUrl != null">
#{feedbackUrl},
</if>
<if test="mobileFeedbackUrl != null">
#{mobileFeedbackUrl},
</if>
<if test="createTime != null">
#{createTime},
</if>
@ -842,6 +852,9 @@
<if test="feedbackUrl != null">
feedback_url,
</if>
<if test="mobileFeedbackUrl != null">
mobile_feedback_url,
</if>
<if test="createTime != null">
create_time,
</if>
@ -940,6 +953,9 @@
<if test="feedbackUrl != null">
#{feedbackUrl},
</if>
<if test="mobileFeedbackUrl != null">
#{mobileFeedbackUrl},
</if>
<if test="createTime != null">
#{createTime},
</if>

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

@ -100,6 +100,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB
if (StringUtils.equals(ackFeedbackSetting.getAckStatus(), "1")) {
// 2.保存反馈地址
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");
}
@ -126,7 +127,7 @@ 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);
List<String> codes = Arrays.asList(SalarySysConstant.SALARY_SEND_FEEDBACK, 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);
@ -137,6 +138,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB
defaultAckFeedBackDTO.setAckStatus("0");
defaultAckFeedBackDTO.setAutoAckDays(0);
defaultAckFeedBackDTO.setFeedBackUrl("/");
defaultAckFeedBackDTO.setMobileFeedBackUrl("/");
return defaultAckFeedBackDTO;
}
defaultAckFeedBackDTO.setAckStatus(ackStatus);
@ -146,6 +148,9 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB
// 反馈地址
String feedbackUrl = sysConfMap.getOrDefault(SalarySysConstant.SALARY_FEEDBACK_URL, "");
defaultAckFeedBackDTO.setFeedBackUrl(feedbackUrl);
String mobileFeedbackUrl = sysConfMap.getOrDefault(SALARY_FEEDBACK_URL_MOBILE, "");
defaultAckFeedBackDTO.setMobileFeedBackUrl(mobileFeedbackUrl);
return defaultAckFeedBackDTO;
}

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

@ -524,6 +524,10 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
}
SalaryTemplatePO salaryTemplate = buildSalaryTemplateContent(salaryTemplateContent);
if (StringUtils.isNotBlank(salaryTemplate.getFeedbackUrl()) && StringUtils.isBlank(salaryTemplate.getMobileFeedbackUrl())) {
// 如果设置了pc反馈地址，没有设置移动端反馈地址，则移动端反馈地址默认等于pc反馈地址
salaryTemplate.setMobileFeedbackUrl(salaryTemplate.getFeedbackUrl());
}
// 判断是否是补发
boolean isReplenish = NumberUtils.INTEGER_ONE.equals(salarySendInfo.getSalaryAcctType());
@ -826,6 +830,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
.ackFeedbackStatus(Integer.valueOf(map.getOrDefault("ackFeedbackStatus", "0").toString()))
.autoAckDays(Integer.valueOf(map.getOrDefault("autoAckDays", "0").toString()))
.feedbackUrl(map.getOrDefault("feedbackUrl", "").toString())
.feedbackUrl(map.getOrDefault("mobileFeedbackUrl", "").toString())
.name(map.getOrDefault("name", "").toString())
.salarySobId(Long.valueOf(map.getOrDefault("salarySobId", "0").toString()))
.useType(Integer.valueOf(map.getOrDefault("useType", "0").toString()))

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

@ -217,6 +217,7 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate
salaryTemplateNew.setAckFeedbackStatus(saveParam.getAckFeedbackStatus() ? 1 : 0);
salaryTemplateNew.setAutoAckDays(saveParam.getAutoAckDays());
salaryTemplateNew.setFeedbackUrl(saveParam.getFeedbackUrl());
salaryTemplateNew.setMobileFeedbackUrl(saveParam.getMobileFeedbackUrl());
// todo 薪资项目设置检查校验
salaryTemplateNew.setSalaryItemSetting(saveParam.getSalaryItemSetting() != null ? JSONUtil.toJsonStr(saveParam.getSalaryItemSetting()) : "");
salaryTemplateNew.setReplenishSalaryItemSetting(saveParam.getReplenishSalaryItemSetting() != null ? JSONUtil.toJsonStr(saveParam.getReplenishSalaryItemSetting()) : "");

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

@ -96,6 +96,11 @@ public class SalarySysConstant {
*/
public static final String SALARY_FEEDBACK_URL = "SALARY_FEEDBACK_URL";
/**
* 工资单反馈地址-移动端
*/
public static final String SALARY_FEEDBACK_URL_MOBILE = "SALARY_FEEDBACK_URL_MOBILE";
/**
* 工资单查询限制
*/

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

@ -199,6 +199,7 @@ public class SalaryTemplateWrapper extends Service {
salaryTemplateBaseSetDTO.setAckFeedbackStatus(StringUtils.equals(defaultAckFeedback.getAckStatus(), "1"));
salaryTemplateBaseSetDTO.setAutoAckDays(defaultAckFeedback.getAutoAckDays());
salaryTemplateBaseSetDTO.setFeedbackUrl(defaultAckFeedback.getFeedBackUrl());
salaryTemplateBaseSetDTO.setMobileFeedbackUrl(defaultAckFeedback.getMobileFeedBackUrl());
}
Map<String, Object> salaryTemplateBase = new HashMap<>();
salaryTemplateBase.put("data", salaryTemplateBaseSetDTO);