Commit 3122b5cc authored by fangxinjiang's avatar fangxinjiang

社保公积金基数批量导入导出-fxj

parent a4b1dc3b
......@@ -46,15 +46,6 @@ public class SysBaseSetFundInsertVo extends RowIndex implements Serializable {
@ExcelProperty("公积金缴纳地")
private String provinceStr;
/**
* 公积金类型 0.市直 1. 省直
*/
@ExcelAttribute(name = "公积金类型",isNotEmpty = true,readConverterExp = "0=市直,1=省直")
@Schema(description = "公积金类型 0.市直 1. 省直")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金类型")
private String fundPayType;
/**
* 适用起始月份
*/
......
......@@ -172,7 +172,7 @@ public class SysBaseSetSocialExportVo implements Serializable {
@Schema(description = "大病基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数下限")
private BigDecimal lowerBig;
private String lowerBig;
/**
* 大病基数上限
......@@ -181,13 +181,13 @@ public class SysBaseSetSocialExportVo implements Serializable {
@Schema(description = "大病基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数上限")
private BigDecimal upBig;
private String upBig;
/**
* 是否大病: 0收取;1不收取
* 是否大病: 0收取;1不收取: 批量导入是调整为 是否
*/
@ExcelAttribute(name = "大病是否收费",readConverterExp = "0=收取,1=不收取")
@Schema(description = "大病是否收费: 0收取;1不收取")
@ExcelAttribute(name = "大病是否收费",readConverterExp = "0=是,1=否")
@Schema(description = "大病是否收费: 0是;1否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病是否收费")
private String isIllness;
......@@ -234,7 +234,7 @@ public class SysBaseSetSocialExportVo implements Serializable {
@Schema(description = "单位大病金额")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位大病金额")
private BigDecimal chargeCompany;
private String chargeCompany;
/**
* 个人大病金额(元/人)--按定值
......@@ -243,7 +243,7 @@ public class SysBaseSetSocialExportVo implements Serializable {
@Schema(description = "个人大病金额")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人大病金额")
private BigDecimal chargePersonal;
private String chargePersonal;
/**
......@@ -325,7 +325,7 @@ public class SysBaseSetSocialExportVo implements Serializable {
@Schema(description = "单位大病比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位大病比例")
private BigDecimal payCompanyPro;
private String payCompanyPro;
/**
* 个人大病比例
......@@ -334,7 +334,7 @@ public class SysBaseSetSocialExportVo implements Serializable {
@Schema(description = "个人大病比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人大病比例")
private BigDecimal payPersonalPro;
private String payPersonalPro;
/**
* 是否可以补缴: 0:是,1:否
......
......@@ -875,17 +875,23 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
infoVo.setValueType(excel.getValueType());
//大病是否收取为是 大病缴纳周期为按月缴纳方式
if (CommonConstants.ONE_STRING.equals(excel.getValueType())){
//大病缴纳周期为按月缴纳方式为按比例需要填写金额 无值提示
if (null == excel.getUpBig()
|| null == excel.getLowerBig()
|| excel.getLowerBig().compareTo(BigDecimal.ZERO) < 0
|| excel.getUpBig().compareTo(BigDecimal.ZERO) < 0){
errorMsg = new ErrorMessage(excel.getRowIndex(),"大病是否收取为是时,大病缴纳周期为“按月”的,单位或个人大病基数上下限字段必填,仅填写正确基数即可,请修改后重新提交",excel);
errorMessageList.add(errorMsg);
continue;
//如果基数一致取值一致,否则用它自己的
if (CommonConstants.ZERO_STRING.equals(excel.getIsSameBase())){
infoVo.setUpBig(excel.getUpPersion());
infoVo.setLowerBig(excel.getLowerPersion());
}else {
//大病缴纳周期为按月缴纳方式为按比例需要填写金额 无值提示
if (null == excel.getUpBig()
|| null == excel.getLowerBig()
|| excel.getLowerBig().compareTo(BigDecimal.ZERO) < 0
|| excel.getUpBig().compareTo(BigDecimal.ZERO) < 0){
errorMsg = new ErrorMessage(excel.getRowIndex(),"大病是否收取为是时,大病缴纳周期为“按月且按比例”的,单位或个人大病基数上下限字段必填,仅填写正确基数即可,请修改后重新提交",excel);
errorMessageList.add(errorMsg);
continue;
}
infoVo.setUpBig(excel.getUpBig());
infoVo.setLowerBig(excel.getLowerBig());
}
infoVo.setUpBig(excel.getUpPersion());
infoVo.setLowerBig(excel.getLowerPersion());
//大病缴纳周期为按月缴纳方式为按比例需要填写比例无值提示
if (null == excel.getPayCompanyPro()
|| null == excel.getPayPersonalPro()
......@@ -1014,12 +1020,10 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
infoVo.setUnitMedicalPro(excel.getUnitMedicalPro());
infoVo.setUnitBirthPro(excel.getUnitBirthPro());
infoVo.setUnitUnemploymentPro(excel.getUnitUnemploymentPro());
infoVo.setPayCompanyPro(excel.getPayCompanyPro());
infoVo.setPersonalUnemploymentPro(excel.getPersonalUnemploymentPro());
infoVo.setPersonalMedicalPro(excel.getPersonalMedicalPro());
infoVo.setPersonalPersionPro(excel.getPersonalPersionPro());
infoVo.setPayPersonalPro(excel.getPayPersonalPro());
//各种比例需在0~100内
if (infoVo.getUnitPersionPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getUnitInjuryPro().compareTo(BigDecimal.ZERO) < 0
......@@ -1142,12 +1146,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
continue;
}
infoVo.setDepartName(excel.getDepartName());
//公积金类型
if (!Common.getSet(CommonConstants.ZERO_STRING, CommonConstants.ONE_STRING).contains(excel.getFundPayType())){
errorMsg = new ErrorMessage(excel.getRowIndex(),"公积金类型必填,只可填写“省直”或“市直”,请修改后重新提交",excel);
errorMessageList.add(errorMsg);
continue;
}
//缴纳地解析
areaArray = excel.getProvinceStr().split(CommonConstants.CENTER_SPLIT_LINE_STRING);
infoVo = initAddress(areaArray, areaMap2, infoVo);
......@@ -1200,6 +1199,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
}
temp.setApplyEndDate(DateUtil.addDayByDate(dateFormat,-1));
}
infoVo.setFundPayType(temp.getFundPayType());
//执行月份校验
dateUse = DateUtil.stringToDate2(doMonthTemp+"01", DateUtil.ISO_DATE_FORMAT);
if (null != dateUse){
......
......@@ -488,15 +488,15 @@
a.UP_BIRTH upBirth,
a.LOWER_UNEMPLOYMENT lowerUnemployment,
a.UP_UNEMPLOYMENT upUnemployment,
a.LOWER_BIG lowerBig,
a.UP_BIG upBig,
IF(a.IS_ILLNESS='0',IF(a.VALUE_TYPE='1',a.LOWER_BIG,""),"") lowerBig,
IF(a.IS_ILLNESS='0',IF(a.VALUE_TYPE='1',a.UP_BIG,""),"") upBig,
a.IS_ILLNESS isIllness,
a.COLLECT_TYPE collectType,
a.IS_CHARGE_PERSONAL isChargePersonal,
a.COLLECT_MOTH collectMoth,
a.VALUE_TYPE valueType,
a.CHARGE_COMPANY chargeCompany,
a.CHARGE_PERSONAL chargePersonal,
IF(a.IS_ILLNESS='0',IF(a.VALUE_TYPE='0',a.PAY_COMPANY,""),"") chargeCompany,
IF(a.IS_ILLNESS='0',IF(a.VALUE_TYPE='0',a.PAY_PERSONAL,""),"") chargePersonal,
a.UNIT_MEDICAL_PRO unitMedicalPro,
a.PERSONAL_MEDICAL_PRO personalMedicalPro,
a.UNIT_BIRTH_PRO unitBirthPro,
......@@ -505,8 +505,8 @@
a.UNIT_INJURY_PRO unitInjuryPro,
a.UNIT_UNEMPLOYMENT_PRO unitUnemploymentPro,
a.PERSONAL_UNEMPLOYMENT_PRO personalUnemploymentPro,
a.PAY_COMPANY_PRO payCompanyPro,
a.PAY_PERSONAL_PRO payPersonalPro,
IF(a.IS_ILLNESS='0',IF(a.VALUE_TYPE='1',a.PAY_COMPANY_PRO,""),"") payCompanyPro,
IF(a.IS_ILLNESS='0',IF(a.VALUE_TYPE='1',a.PAY_PERSONAL_PRO,""),"") payPersonalPro,
a.CAN_OVERPAY canOverpay,
a.UNIT_PRO_SUM unitProSum,
a.PERSONAL_PRO_SUM personalProSum,
......
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