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

薪资档案增加起始、结束发薪筛选

This commit is contained in:
Harryxzy 2024-01-15 10:51:53 +08:00
parent f5aa425f2c
commit e38fd9be99
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
View File

@ -10,6 +10,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
@ -88,4 +89,25 @@ public class SalaryArchiveQueryParam extends BaseQueryParam {
*/
private boolean extSalaryArchiveList;
private String payStartDateStartDateStr;
private String payStartDateEndDateStr;
// 起始发薪日期起
private Date payStartDateStartDate;
// 起始发薪日期止
private Date payStartDateEndDate;
// 最后发薪日期起
private String payEndDateStartDateStr;
// 最后发薪日期止
private String payEndDateEndDateStr;
// 最后发薪日期起
private Date payEndDateStartDate;
// 最后发薪日期止
private Date payEndDateEndDate;
}

36
src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
View File

@ -183,6 +183,18 @@
#{runStatus}
</foreach>
</if>
<if test="param.payStartDateStartDate != null and param.payStartDateStartDate != null">
AND pay_start_date <![CDATA[ >= ]]> #{param.payStartDateStartDate}
</if>
<if test="param.payStartDateEndDate != null and param.payStartDateEndDate != null">
AND pay_start_date <![CDATA[ <= ]]> #{param.payStartDateEndDate}
</if>
<if test="param.payEndDateStartDate != null and param.payEndDateStartDate != null">
AND pay_end_date <![CDATA[ >= ]]> #{param.payEndDateStartDate}
</if>
<if test="param.payEndDateEndDate != null and param.payEndDateEndDate != null">
AND pay_end_date <![CDATA[ <= ]]> #{param.payEndDateEndDate}
</if>
<!-- 排序 -->
<if test="param.orderRule != null">
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
@ -264,6 +276,18 @@
#{runStatus}
</foreach>
</if>
<if test="param.payStartDateStartDate != null and param.payStartDateStartDate != null">
AND pay_start_date <![CDATA[ >= ]]> #{param.payStartDateStartDate}
</if>
<if test="param.payStartDateEndDate != null and param.payStartDateEndDate != null">
AND pay_start_date <![CDATA[ >= ]]> #{param.payStartDateEndDate}
</if>
<if test="param.payEndDateStartDate != null and param.payEndDateStartDate != null">
AND pay_end_date <![CDATA[ >= ]]> #{param.payEndDateStartDate}
</if>
<if test="param.payEndDateEndDate != null and param.payEndDateEndDate != null">
AND pay_end_date <![CDATA[ >= ]]> #{param.payEndDateEndDate}
</if>
<!-- 排序 -->
<if test="param.orderRule != null">
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
@ -346,6 +370,18 @@
#{runStatus}
</foreach>
</if>
<if test="param.payStartDateStartDate != null and param.payStartDateStartDate != null">
AND pay_start_date <![CDATA[ >= ]]> #{param.payStartDateStartDate}
</if>
<if test="param.payStartDateEndDate != null and param.payStartDateEndDate != null">
AND pay_start_date <![CDATA[ >= ]]> #{param.payStartDateEndDate}
</if>
<if test="param.payEndDateStartDate != null and param.payEndDateStartDate != null">
AND pay_end_date <![CDATA[ >= ]]> #{param.payEndDateStartDate}
</if>
<if test="param.payEndDateEndDate != null and param.payEndDateEndDate != null">
AND pay_end_date <![CDATA[ >= ]]> #{param.payEndDateEndDate}
</if>
<!-- 排序 -->
<if test="param.orderRule != null">
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}

13
src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
View File

@ -163,6 +163,19 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
if (queryParam.isExtSalaryArchiveList()) {
return getSalaryArchiveMapper().listExtSalaryArchive(queryParam);
}
if (StringUtils.isNotBlank(queryParam.getPayStartDateStartDateStr())) {
queryParam.setPayStartDateStartDate(SalaryDateUtil.stringToDate(queryParam.getPayStartDateStartDateStr()));
}
if (Objects.nonNull(queryParam.getPayStartDateEndDateStr())) {
queryParam.setPayStartDateEndDate(SalaryDateUtil.stringToDate(queryParam.getPayStartDateEndDateStr()));
}
if (StringUtils.isNotBlank(queryParam.getPayEndDateStartDateStr())) {
queryParam.setPayEndDateStartDate(SalaryDateUtil.stringToDate(queryParam.getPayEndDateStartDateStr()));
}
if (Objects.nonNull(queryParam.getPayEndDateEndDateStr())) {
queryParam.setPayEndDateEndDate(SalaryDateUtil.stringToDate(queryParam.getPayEndDateEndDateStr()));
}
return getSalaryArchiveMapper().list(queryParam);
}