diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java index cd7af96ba..32fd9f0d6 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java @@ -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) diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java index 340e97387..767d6ccac 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java @@ -27,6 +27,12 @@ public class SalaryBillAckFeedbackDTO { */ private String feedBackUrl; + + /** + * 移动端反馈地址 + */ + private String mobileFeedBackUrl; + /** * 超时自动确认天数 */ diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java index 3f76a30a8..47f4eb854 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java @@ -92,4 +92,10 @@ public class SalaryTemplateBaseSetDTO { * */ private String feedbackUrl; + + /** + * 移动端反馈流程地址 + * + */ + private String mobileFeedbackUrl; } diff --git a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java index 7f13c13c6..df1996e6d 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java @@ -110,6 +110,11 @@ public class SalaryTemplateSaveParam { */ private String feedbackUrl; + /** + * 移动端反馈流程地址 + */ + private String mobileFeedbackUrl; + List salaryBillItemNameSetting; public static void checkParam(SalaryTemplateSaveParam saveParam) { diff --git a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java index a428a68ed..5ffcbaf24 100644 --- a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java +++ b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java @@ -192,6 +192,13 @@ public class SalaryTemplatePO { private String feedbackUrl; + /** + * 移动端反馈流程地址 + * + */ + private String mobileFeedbackUrl; + + private Collection salarySobIds; } diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml index 17e371c33..07898826c 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml @@ -92,6 +92,7 @@ ack_feedback_status, auto_ack_days, feedback_url, + mobile_feedback_url, create_time, update_time, creator, @@ -534,6 +535,9 @@ feedback_url=#{feedbackUrl}, + + mobile_feedback_url=#{mobileFeedbackUrl}, + create_time=#{createTime}, @@ -636,6 +640,9 @@ feedback_url, + + mobile_feedback_url, + create_time, @@ -734,6 +741,9 @@ #{feedbackUrl}, + + #{mobileFeedbackUrl}, + #{createTime}, @@ -842,6 +852,9 @@ feedback_url, + + mobile_feedback_url, + create_time, @@ -940,6 +953,9 @@ #{feedbackUrl}, + + #{mobileFeedbackUrl}, + #{createTime}, diff --git a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java index e5f6d51d3..5cafea060 100644 --- a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java @@ -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 codes = Arrays.asList(SalarySysConstant.SALARY_SEND_FEEDBACK, SalarySysConstant.SALARY_AUTO_ACK_DAYS, SalarySysConstant.SALARY_FEEDBACK_URL); + List codes = Arrays.asList(SalarySysConstant.SALARY_SEND_FEEDBACK, SalarySysConstant.SALARY_AUTO_ACK_DAYS, SalarySysConstant.SALARY_FEEDBACK_URL, SALARY_FEEDBACK_URL_MOBILE); List sysConfList = getSalarySysConfService(user).getListByCodes(codes); Map 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; } diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 20cb9f176..2a5f9b688 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -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())) diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index 591261abb..df24535aa 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -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()) : ""); diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java index afe54d3c0..081702d22 100644 --- a/src/com/engine/salary/sys/constant/SalarySysConstant.java +++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java @@ -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"; + /** * 工资单查询限制 */ diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index 6149b500e..22aac4134 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -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 salaryTemplateBase = new HashMap<>(); salaryTemplateBase.put("data", salaryTemplateBaseSetDTO);