Commit c167dc18 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/develop' into develop

parents a7f740a2 23618238
......@@ -893,9 +893,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
insert.setOldContractId(contractInfo.getId());
insert.setContractName(contractInfo.getContractName());
insert.setContractSubName(contractInfo.getContractSubName());
if (!EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation())) {
insert.setReason(contractInfo.getReason());
}
insert.setSubjectUnit(contractInfo.getSubjectUnit());
insert.setContractParty(contractInfo.getContractParty());
insert.setContractType(contractInfo.getContractType());
......
......@@ -183,8 +183,6 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
BigDecimal isTax;
//减除费用
BigDecimal costReduction;
//年终奖上限
BigDecimal maxAnualSalary;
//年终奖单独扣税12月税费
BigDecimal finalSalaryNoSalary;
//年终奖合并扣税12月税费
......@@ -238,7 +236,6 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
//薪资扣税合计
sumTax = BigDecimal.ZERO;
minSalary = BigDecimal.ZERO;
maxAnualSalary = BigDecimal.ZERO;
costReduction = BigDecimal.ZERO;
isTax = BigDecimal.ZERO;
twlSalaryTax = BigDecimal.ZERO;
......
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