diff --git a/resource/sqlupgrade/DM/sql202402190103.sql b/resource/sqlupgrade/DM/sql202402190103.sql new file mode 100644 index 000000000..ee754d9b3 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202402190103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add feedback_status int; +/ + diff --git a/resource/sqlupgrade/GS/sql202402190103.sql b/resource/sqlupgrade/GS/sql202402190103.sql new file mode 100644 index 000000000..ee754d9b3 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202402190103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add feedback_status int; +/ + diff --git a/resource/sqlupgrade/JC/sql202402190103.sql b/resource/sqlupgrade/JC/sql202402190103.sql new file mode 100644 index 000000000..ee754d9b3 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202402190103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add feedback_status int; +/ + diff --git a/resource/sqlupgrade/Mysql/sql202402190103.sql b/resource/sqlupgrade/Mysql/sql202402190103.sql new file mode 100644 index 000000000..e4806b3ec --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202402190103.sql @@ -0,0 +1 @@ +alter table hrsa_salary_template add feedback_status int; \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202402190103.sql b/resource/sqlupgrade/Oracle/sql202402190103.sql new file mode 100644 index 000000000..a45fcae76 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202402190103.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_template add feedback_status int +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202402190103.sql b/resource/sqlupgrade/PG/sql202402190103.sql new file mode 100644 index 000000000..e4806b3ec --- /dev/null +++ b/resource/sqlupgrade/PG/sql202402190103.sql @@ -0,0 +1 @@ +alter table hrsa_salary_template add feedback_status int; \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202402190103.sql b/resource/sqlupgrade/SQLServer/sql202402190103.sql new file mode 100644 index 000000000..b00318264 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202402190103.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_template add feedback_status int +go \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202402190103.sql b/resource/sqlupgrade/ST/sql202402190103.sql new file mode 100644 index 000000000..ee754d9b3 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202402190103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add feedback_status int; +/ + diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java index 32fd9f0d6..7f09f2048 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java @@ -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()) diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java index fc9a7abf4..15b336d69 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java @@ -18,10 +18,15 @@ import lombok.NoArgsConstructor; public class SalaryBillAckFeedbackDTO { /** - * 工资单确认反馈是否开启。0：否，1：是 + * 工资单确认是否开启。0：否，1：是 */ private String ackStatus; + /** + * 工资单反馈是否开启。0：否，1：是 + */ + private String feedbackStatus; + /** * 反馈地址 */ diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java index 47f4eb854..93f0ec5e6 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java @@ -82,6 +82,11 @@ public class SalaryTemplateBaseSetDTO { */ private Boolean ackFeedbackStatus; + /** + * 工资单确认反馈状态 + */ + private Boolean feedbackStatus; + /** * 自动确认超时天数 */ diff --git a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java index df1996e6d..2f5bbb11a 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java @@ -96,10 +96,15 @@ public class SalaryTemplateSaveParam { private List replenishSalaryItemSetting; /** - * 工资单确认反馈状态 + * 工资单确认状态 */ private Boolean ackFeedbackStatus; + /** + * 工资单反馈状态 + */ + private Boolean feedbackStatus; + /** * 自动确认超时天数 */ diff --git a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java index 5ffcbaf24..6057d23f5 100644 --- a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java +++ b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java @@ -180,6 +180,11 @@ public class SalaryTemplatePO { */ private Integer ackFeedbackStatus; + /** + * 工资单确认反馈状态 + */ + private Integer feedbackStatus; + /** * 自动确认超时天数 */ diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml index 4c578f7c9..0d866f7af 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml @@ -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 @@ ack_feedback_status=#{ackFeedbackStatus}, + + feedback_status=#{feedbackStatus}, + auto_ack_days=#{autoAckDays}, @@ -638,6 +643,9 @@ ack_feedback_status, + + feedback_status, + auto_ack_days, @@ -739,6 +747,9 @@ #{ackFeedbackStatus}, + + #{feedbackStatus}, + #{autoAckDays}, @@ -850,6 +861,9 @@ ack_feedback_status, + + feedback_status, + auto_ack_days, @@ -951,6 +965,9 @@ #{ackFeedbackStatus}, + + #{feedbackStatus}, + #{autoAckDays}, diff --git a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java index 25ec7fc63..3859bdd95 100644 --- a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java @@ -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 codes = Arrays.asList(SalarySysConstant.SALARY_SEND_FEEDBACK, SalarySysConstant.SALARY_AUTO_ACK_DAYS, SalarySysConstant.SALARY_FEEDBACK_URL, SALARY_FEEDBACK_URL_MOBILE); + List 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 sysConfList = getSalarySysConfService(user).getListByCodes(codes); Map 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); diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 1d0cc1cdf..19603ddd4 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -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 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; } /** diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index 5cfb97e1b..dd9d49cd9 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -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()); diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java index 081702d22..80ce94227 100644 --- a/src/com/engine/salary/sys/constant/SalarySysConstant.java +++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java @@ -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"; + /** * 工资单反馈自动确认 */ diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index 75c83f012..e948c7b13 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -151,9 +151,15 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy Optional 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); + } } }); } diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index 1bcbda5fa..cb7c072fe 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -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()); }