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

合并auth

This commit is contained in:
钱涛 2022-05-30 18:59:48 +08:00
parent f8ecb548ed
commit e38841f280
7 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/biz/SIArchivesBiz.java
View File

@ -41,7 +41,7 @@ import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.SalaryFormItemUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.PageUtil;
import com.google.common.collect.Maps;
import com.engine.salary.util.page.SalaryPageUtil;
import org.apache.commons.collections.CollectionUtils;

1
src/com/engine/salary/biz/SalaryArchiveBiz.java
View File

@ -5,7 +5,6 @@ import com.engine.salary.entity.salaryarchive.param.SalaryArchiveQueryParam;
import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO;
import com.engine.salary.mapper.archive.SalaryArchiveMapper;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.PageUtil;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import com.engine.salary.util.page.SalaryPageUtil;

1
src/com/engine/salary/biz/SalaryArchiveItemBiz.java
View File

@ -6,7 +6,6 @@ import com.engine.salary.entity.salaryarchive.param.SalaryItemAdjustRecordQueryP
import com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO;
import com.engine.salary.mapper.archive.SalaryArchiveItemMapper;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.PageUtil;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import com.engine.salary.util.page.SalaryPageUtil;

4
src/com/engine/salary/biz/SalaryItemBiz.java
View File

@ -5,7 +5,7 @@ import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.enums.SalaryOnOffEnum;
import com.engine.salary.mapper.salaryitem.SalaryItemMapper;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.PageUtil;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import com.engine.salary.util.page.SalaryPageUtil;
@ -48,7 +48,7 @@ public class SalaryItemBiz {
}
public void batchSave(Collection<SalaryItemPO> salaryItems) {
if(CollectionUtils.isEmpty(salaryItems)){
if (CollectionUtils.isEmpty(salaryItems)) {
return;
}
SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();

2
src/com/engine/salary/biz/SalarySobCheckRuleBiz.java
View File

@ -4,7 +4,7 @@ import com.engine.salary.entity.salarysob.param.SalarySobCheckRuleQueryParam;
import com.engine.salary.entity.salarysob.po.SalarySobCheckRulePO;
import com.engine.salary.mapper.salarysob.SalarySobCheckRuleMapper;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.PageUtil;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import com.engine.salary.util.page.SalaryPageUtil;

11
src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
View File

@ -49,7 +49,6 @@ import weaver.hrm.User;
import weaver.systeminfo.SystemEnv;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.YearMonth;
@ -316,19 +315,19 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
//累计子女教育
BigDecimal addUpChildEducation = dto.getAddUpChildEducation();
String addUpChildEducation = dto.getAddUpChildEducation();
addUpDeduction.setAddUpChildEducation(Util.null2String(addUpChildEducation));
//累计继续教育
BigDecimal addUpContinuingEducation = dto.getAddUpContinuingEducation();
String addUpContinuingEducation = dto.getAddUpContinuingEducation();
addUpDeduction.setAddUpContinuingEducation(Util.null2String(addUpContinuingEducation));
//累计住房贷款利息
BigDecimal addUpHousingLoanInterest = dto.getAddUpHousingLoanInterest();
String addUpHousingLoanInterest = dto.getAddUpHousingLoanInterest();
addUpDeduction.setAddUpHousingLoanInterest(Util.null2String(addUpHousingLoanInterest));
//累计住房租金
BigDecimal addUpHousingRent = dto.getAddUpHousingRent();
String addUpHousingRent = dto.getAddUpHousingRent();
addUpDeduction.setAddUpHousingRent(Util.null2String(addUpHousingRent));
//累计赡养老人
BigDecimal addUpSupportElderly = dto.getAddUpSupportElderly();
String addUpSupportElderly = dto.getAddUpSupportElderly();
addUpDeduction.setAddUpSupportElderly(Util.null2String(addUpSupportElderly));
addUpDeduction.setAddUpIllnessMedical(Util.null2String(dto.getAddUpIllnessMedical()));

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

@ -1,6 +1,5 @@
package com.engine.salary.service.impl;
import com.cloudstore.eccom.pc.table.WeaTableColumn;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.biz.TaxAgentBiz;
@ -30,9 +29,8 @@ import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.page.Column;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.PageUtil;
import com.google.common.collect.Lists;
import com.engine.salary.util.page.SalaryPageUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;