diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml index 4cfd0cd94..a54090f6f 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml @@ -16,6 +16,7 @@ + @@ -34,6 +35,7 @@ , t.update_time , t.delete_type , t.tenant_key + , t.salary_acct_type @@ -48,7 +50,8 @@ creator, create_time, update_time, - tenant_key + tenant_key, + salary_acct_type ) VALUES @@ -63,7 +66,8 @@ #{item.creator}, #{item.createTime}, #{item.updateTime}, - #{item.tenantKey} + #{item.tenantKey}, + #{item.salaryAcctType} ) @@ -79,7 +83,8 @@ creator, create_time, update_time, - tenant_key + tenant_key, + salary_acct_type ) @@ -94,7 +99,8 @@ #{item.creator,jdbcType=DOUBLE}, #{item.createTime,jdbcType=DATE}, #{item.updateTime,jdbcType=DATE}, - #{item.tenantKey,jdbcType=VARCHAR} + #{item.tenantKey,jdbcType=VARCHAR}, + #{item.salaryAcctType,jdbcType=INTEGER} from dual @@ -111,7 +117,8 @@ creator, create_time, update_time, - tenant_key + tenant_key, + salary_acct_type ) VALUES ( @@ -125,7 +132,8 @@ #{item.creator}, #{item.createTime}, #{item.updateTime}, - #{item.tenantKey} + #{item.tenantKey}, + #{item.salaryAcctType} ) diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index bbf7e73c8..daa8277d7 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -459,7 +459,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100513, "没有默认模板,无法查看")); } - SalaryTemplatePO salaryTemplate = buildSalaryTemplateContent(salaryTemplateContent); + SalaryTemplatePO salaryTemplate = buildSalaryTemplateContent(salaryTemplateContent); + // 判断是否是补发 + boolean isReplenish = NumberUtils.INTEGER_ONE.equals(salarySendInfo.getSalaryAcctType()); // if (StringUtils.isNotBlank(salaryTemplate.getBackground())) { // FileData fileByte = fileDownloadClient.getFileByte(Long.valueOf(salaryTemplate.getBackground()), currentTenantKey); @@ -486,7 +488,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService Map map = new LinkedHashMap<>(); map.put("tenantName", ""); map.put("sendTime", SalaryDateUtil.getFormatLocalDateTime(salarySendInfo.getSendTime())); - List listDTOS = JSONArray.parseArray(salaryTemplate.getSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class); + List listDTOS = JSONArray.parseArray(isReplenish? salaryTemplate.getReplenishSalaryItemSetting():salaryTemplate.getSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class); Optional optionalEmployeeInformation = listDTOS.stream().filter(e -> SalaryTemplateSalaryItemSetGroupConstant.EMPLOYEE_INFO_GROUP_ID.equals(e.getGroupId())).findFirst(); SalaryTemplateSalaryItemSetListDTO employeeInformation = optionalEmployeeInformation.orElse(null); List itemSetListDTOS = listDTOS.stream().filter(e -> !SalaryTemplateSalaryItemSetGroupConstant.EMPLOYEE_INFO_GROUP_ID.equals(e.getGroupId())).collect(Collectors.toList()); @@ -634,6 +636,8 @@ public class SalarySendServiceImpl extends Service implements SalarySendService .salaryItemNullStatus(Integer.valueOf(map.getOrDefault("salaryItemNullStatus", "0").toString())) .salaryItemZeroStatus(Integer.valueOf(map.getOrDefault("salaryItemZeroStatus", "0").toString())) .salaryItemSetting(map.getOrDefault("salaryItemSetting", "").toString()) + .replenishName(map.getOrDefault("replenishName","").toString()) + .replenishSalaryItemSetting(map.getOrDefault("replenishSalaryItemSetting","").toString()) .build(); }