Commit 41896d80 authored by hongguangwu's avatar hongguangwu

MVP1.6.6-实缴优化导出

parent aea6ffa6
...@@ -278,12 +278,12 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai ...@@ -278,12 +278,12 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.PARAM_IS_NOT_ERROR,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.PARAM_IS_NOT_ERROR,excel));
continue; continue;
} }
if (CommonConstants.ZERO_STRING.equals(paymentInfo.getRepeatReviewFlag())){ if (CommonConstants.ONE_STRING.equals(paymentInfo.getRepeatReviewFlag())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "重新复核中,禁止更新!",excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "重新复核中,禁止更新!",excel));
continue; continue;
} }
// 数据合法情况 // 数据合法情况
if (!CommonConstants.IS_TRUE.equals(excel.getRepeatHandleFlag())){ if (!CommonConstants.ZERO_STRING.equals(excel.getRepeatHandleFlag())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "'是否重新办理'填写不正确!",excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "'是否重新办理'填写不正确!",excel));
continue; continue;
} }
......
...@@ -858,6 +858,10 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -858,6 +858,10 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
// 1险种2参保险种 // 1险种2参保险种
String insuranceType; String insuranceType;
// 2参保险种单位
String insuranceTypeUnit;
// 2参保险种个人
String insuranceTypePerson;
// 单位名称(社保户) // 单位名称(社保户)
String socialSecurityAccount; String socialSecurityAccount;
// 费款所属期(社保缴纳月份) // 费款所属期(社保缴纳月份)
...@@ -1030,8 +1034,19 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1030,8 +1034,19 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
detail.setPayLimit(money); detail.setPayLimit(money);
} }
detail.setInsuranceType(insuranceType); detail.setInsuranceType(insuranceType);
insuranceTypeUnit = "单位" + insuranceType;
insuranceTypePerson = "个人" + insuranceType;
if ("养老保险".equals(insuranceType)) {
insuranceTypeUnit = "职工基本养老保险(单位缴纳)";
insuranceTypePerson = "职工基本养老保险(个人缴纳)";
} else if ("失业保险".equals(insuranceType)) {
insuranceTypeUnit = "失业保险(单位缴纳)";
insuranceTypePerson = "失业保险(个人缴纳)";
} else if ("工伤保险".equals(insuranceType)) {
insuranceTypeUnit = "工伤保险";
}
if (Common.isNotNull(unitLimit)) { if (Common.isNotNull(unitLimit)) {
detail.setInsuranceType("单位" + insuranceType); detail.setInsuranceType(insuranceTypeUnit);
} }
detail.setSocialSecurityAccount(socialSecurityAccount); detail.setSocialSecurityAccount(socialSecurityAccount);
detail.setPayMonth(payMonth); detail.setPayMonth(payMonth);
...@@ -1072,7 +1087,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1072,7 +1087,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
if (Common.isNotNull(paymentBase)) { if (Common.isNotNull(paymentBase)) {
detailPerson.setPaymentBase(this.getBigDecimal(paymentBase)); detailPerson.setPaymentBase(this.getBigDecimal(paymentBase));
} }
detailPerson.setInsuranceType("个人" + insuranceType); detailPerson.setInsuranceType(insuranceTypePerson);
detailPerson.setSocialSecurityAccount(socialSecurityAccount); detailPerson.setSocialSecurityAccount(socialSecurityAccount);
detailPerson.setPayMonth(payMonth); detailPerson.setPayMonth(payMonth);
if (Common.isNotNull(createMonth)) { if (Common.isNotNull(createMonth)) {
......
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