Commit a295b6d9 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.11' into MVP1.7.11

parents bcef73a0 2693e062
...@@ -169,6 +169,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -169,6 +169,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
public void saveModifyAndUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo public void saveModifyAndUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo
, EmployeeRegistrationPre newInfo, YifuUser user, Map<String, TEmployeeInsurancePre> oldMap) { , EmployeeRegistrationPre newInfo, YifuUser user, Map<String, TEmployeeInsurancePre> oldMap) {
try { try {
//1.9.11 huych 附件类型不比较差异
oldInfo.setAttaIdList(null);
newInfo.setAttaIdList(null);
oldInfo.setAttaList(null);
newInfo.setAttaList(null);
//比较记录不影响业务逻辑,用try套住 //比较记录不影响业务逻辑,用try套住
//比较差异 //比较差异
String differenceKey = HrEquator.comparisonValue(oldInfo, newInfo); String differenceKey = HrEquator.comparisonValue(oldInfo, newInfo);
...@@ -298,6 +303,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -298,6 +303,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
public void saveUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo public void saveUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo
, EmployeeRegistrationPre newInfo, String userId, String nickName, Map<String, TEmployeeInsurancePre> oldMap) { , EmployeeRegistrationPre newInfo, String userId, String nickName, Map<String, TEmployeeInsurancePre> oldMap) {
try { try {
//1.9.11 huych 附件类型不比较差异
oldInfo.setAttaIdList(null);
newInfo.setAttaIdList(null);
oldInfo.setAttaList(null);
newInfo.setAttaList(null);
//比较记录不影响业务逻辑,用try套住 //比较记录不影响业务逻辑,用try套住
//比较差异 //比较差异
String differenceKey = HrEquator.comparisonValue(oldInfo, newInfo); String differenceKey = HrEquator.comparisonValue(oldInfo, newInfo);
...@@ -309,9 +319,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -309,9 +319,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
List<TEmployeePreLogDetail> detailList = new ArrayList<>(); List<TEmployeePreLogDetail> detailList = new ArrayList<>();
// 档案信息修改 // 档案信息修改
TEmployeePreLogDetail detailEmpLog = null; TEmployeePreLogDetail detailEmpLog = null;
//1.9.11 huych 附件类型不比较差异
differenceKey = differenceKey.replace("attaIdList","");
differenceKey = differenceKey.replace("attaList","");
if (Common.isNotNull(differenceKey) && !"insurancePreList".equals(differenceKey) if (Common.isNotNull(differenceKey) && !"insurancePreList".equals(differenceKey)
&& !"attaIdList".equals(differenceKey)) { && !"attaIdList".equals(differenceKey)) {
......
...@@ -282,7 +282,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper, ...@@ -282,7 +282,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
return; return;
} }
// 使用SXSSF模式,设置缓存行数为1000,减少内存占用 // 使用SXSSF模式,设置缓存行数为100,减少内存占用
ExcelWriterBuilder writerBuilder = EasyExcel.write(out, TSalaryAccount.class) ExcelWriterBuilder writerBuilder = EasyExcel.write(out, TSalaryAccount.class)
.registerWriteHandler(new SheetWriteHandler() { .registerWriteHandler(new SheetWriteHandler() {
@Override @Override
......
...@@ -1801,7 +1801,7 @@ ...@@ -1801,7 +1801,7 @@
</if> </if>
inner join ( inner join (
SELECT SELECT
a.id a.id,a.CREATE_TIME
FROM FROM
<if test="searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201'"> <if test="searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201'">
t_salary_account a t_salary_account a
...@@ -1830,6 +1830,7 @@ ...@@ -1830,6 +1830,7 @@
) tmp ON a.id = tmp.id ) tmp ON a.id = tmp.id
left join sys_area ap on ap.id=a.BANK_PROVINCE left join sys_area ap on ap.id=a.BANK_PROVINCE
left join sys_area ac on ac.id=a.BANK_CITY left join sys_area ac on ac.id=a.BANK_CITY
ORDER BY tmp.CREATE_TIME desc
</select> </select>
<!-- 员工报账导出查询 --> <!-- 员工报账导出查询 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment