diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java index f58a1bccd..840305644 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java @@ -58,10 +58,10 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam { private LocalDateRange dismissDate; //入职日期 - private List hireDate; + private List hireDate; //转正日期 - private List zzrq; + private List zzrq; //薪资核算人员列表主键id") private List ids; diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index a215ba9e2..e8b86f68b 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -495,8 +495,8 @@ LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 WHERE delete_type = 0 AND salary_acct_record_id = #{param.salaryAcctRecordId} - - AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]}) + + AND (e.companystartdate BETWEEN #{param.hireDate[0]} AND #{param.hireDate[1]}) 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} - - AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]}) + + AND (e.companystartdate BETWEEN #{param.hireDate[0]} AND #{param.hireDate[1]}) 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} - - AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]}) + + AND (e.companystartdate BETWEEN #{param.hireDate[0]} AND #{param.hireDate[1]}) AND (t.zzrq BETWEEN #{param.zzrq[0]} AND #{param.zzrq[1]}) diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index 13e031bd6..180075c8c 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -486,7 +486,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct Map 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);