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

补发工资单详情查看

This commit is contained in:
Harryxzy 2022-12-08 15:25:16 +08:00
parent aed596523f
commit 8e573f8bd7
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
View File

@ -16,6 +16,7 @@
<result column="update_time" property="updateTime"/>
<result column="delete_type" property="deleteType"/>
<result column="tenant_key" property="tenantKey"/>
<result column="salary_acct_type" property="salaryAcctType"/>
</resultMap>
<!-- 表字段 -->
@ -34,6 +35,7 @@
, t.update_time
, t.delete_type
, t.tenant_key
, t.salary_acct_type
</sql>
<insert id="batchInsert">
@ -48,7 +50,8 @@
creator,
create_time,
update_time,
tenant_key
tenant_key,
salary_acct_type
)
VALUES
<foreach collection="collection" item="item" separator=",">
@ -63,7 +66,8 @@
#{item.creator},
#{item.createTime},
#{item.updateTime},
#{item.tenantKey}
#{item.tenantKey},
#{item.salaryAcctType}
)
</foreach>
</insert>
@ -79,7 +83,8 @@
creator,
create_time,
update_time,
tenant_key
tenant_key,
salary_acct_type
)
<foreach collection="collection" item="item" separator="union all">
@ -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
</foreach>
</insert>
@ -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}
)
</foreach>
</insert>

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

@ -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<String, Object> map = new LinkedHashMap<>();
map.put("tenantName", "");
map.put("sendTime", SalaryDateUtil.getFormatLocalDateTime(salarySendInfo.getSendTime()));
List<SalaryTemplateSalaryItemSetListDTO> listDTOS = JSONArray.parseArray(salaryTemplate.getSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class);
List<SalaryTemplateSalaryItemSetListDTO> listDTOS = JSONArray.parseArray(isReplenish? salaryTemplate.getReplenishSalaryItemSetting():salaryTemplate.getSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class);
Optional<SalaryTemplateSalaryItemSetListDTO> optionalEmployeeInformation = listDTOS.stream().filter(e -> SalaryTemplateSalaryItemSetGroupConstant.EMPLOYEE_INFO_GROUP_ID.equals(e.getGroupId())).findFirst();
SalaryTemplateSalaryItemSetListDTO employeeInformation = optionalEmployeeInformation.orElse(null);
List<SalaryTemplateSalaryItemSetListDTO> 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();
}