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

五院二开，入职和转正日期筛选

This commit is contained in:
钱涛 2025-10-24 15:25:12 +08:00
parent 807b089830
commit c16e7d3526
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
View File

@ -58,10 +58,10 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam {
private LocalDateRange dismissDate;
//入职日期
private List<String> hireDate;
private List<Date> hireDate;
//转正日期
private List<String> zzrq;
private List<Date> zzrq;
//薪资核算人员列表主键id")
private List<Long> ids;

12
src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
View File

@ -495,8 +495,8 @@
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
WHERE delete_type = 0
AND salary_acct_record_id = #{param.salaryAcctRecordId}
<if test="param.hiredate != null and param.hiredate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
<if test="param.hireDate != null and param.hireDate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hireDate[0]} AND #{param.hireDate[1]})
</if>
<if test="param.zzrq != null and param.zzrq.size() == 2">
AND (t.zzrq BETWEEN #{param.zzrq[0]} AND #{param.zzrq[1]})
@ -516,8 +516,8 @@
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
WHERE delete_type = 0
AND salary_acct_record_id = #{param.salaryAcctRecordId}
<if test="param.hiredate != null and param.hiredate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
<if test="param.hireDate != null and param.hireDate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hireDate[0]} AND #{param.hireDate[1]})
</if>
<if test="param.zzrq != null and param.zzrq.size() == 2">
AND (t.zzrq BETWEEN #{param.zzrq[0]} AND #{param.zzrq[1]})
@ -537,8 +537,8 @@
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
WHERE delete_type = 0
AND salary_acct_record_id = #{param.salaryAcctRecordId}
<if test="param.hiredate != null and param.hiredate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
<if test="param.hireDate != null and param.hireDate.size() == 2">
AND (e.companystartdate BETWEEN #{param.hireDate[0]} AND #{param.hireDate[1]})
</if>
<if test="param.zzrq != null and param.zzrq.size() == 2">
AND (t.zzrq BETWEEN #{param.zzrq[0]} AND #{param.zzrq[1]})

4
src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
View File

@ -486,7 +486,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
Map<Long, String> zzrqMap = new HashMap<>();
partition.forEach(part -> {
String empIds = StringUtils.join(part, ",");
rs.execute("select id,"+field+" from cus_fielddata where scopeid=3 and id in ("+ empIds +")");
rs.execute("select id," + field + " from cus_fielddata where scopeid=3 and id in (" + empIds + ")");
while (rs.next()) {
zzrqMap.put(Long.valueOf(rs.getInt("id")), rs.getString(field));
}
@ -723,7 +723,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
if (CollectionUtils.isNotEmpty(param.getSalarySob())) {
lambdaQueryChainWrapper.setSalarySobIds(param.getSalarySob());
} else {
} else {
// 分权
SalarySobQueryParam salarySobQueryParam = new SalarySobQueryParam();
salarySobQueryParam.setFilterType(AuthFilterTypeEnum.QUERY_DATA);