diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
index 12a02998d..505ce3264 100644
--- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
+++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
@@ -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;
+
}
diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
index 03facc683..ea4f6498b 100644
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
@@ -183,6 +183,18 @@
#{runStatus}
+
+ AND pay_start_date = ]]> #{param.payStartDateStartDate}
+
+
+ AND pay_start_date #{param.payStartDateEndDate}
+
+
+ AND pay_end_date = ]]> #{param.payEndDateStartDate}
+
+
+ AND pay_end_date #{param.payEndDateEndDate}
+
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
@@ -264,6 +276,18 @@
#{runStatus}
+
+ AND pay_start_date = ]]> #{param.payStartDateStartDate}
+
+
+ AND pay_start_date = ]]> #{param.payStartDateEndDate}
+
+
+ AND pay_end_date = ]]> #{param.payEndDateStartDate}
+
+
+ AND pay_end_date = ]]> #{param.payEndDateEndDate}
+
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
@@ -346,6 +370,18 @@
#{runStatus}
+
+ AND pay_start_date = ]]> #{param.payStartDateStartDate}
+
+
+ AND pay_start_date = ]]> #{param.payStartDateEndDate}
+
+
+ AND pay_end_date = ]]> #{param.payEndDateStartDate}
+
+
+ AND pay_end_date = ]]> #{param.payEndDateEndDate}
+
ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index 5ba7bd575..1fbe1b525 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -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);
}