Commit 035e968e authored by fangxinjiang's avatar fangxinjiang

公积金自动化-fxj

parent b67e23ee
...@@ -816,14 +816,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -816,14 +816,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//是否已购买为是需要判断公积金是否在用或者流程中 //是否已购买为是需要判断公积金是否在用或者流程中
if (CommonConstants.ZERO_STRING.equals(employeeRegistrationPre.getFundIsBuy()) && if (CommonConstants.ZERO_STRING.equals(employeeRegistrationPre.getFundIsBuy()) &&
(Common.isEmpty(fundFlag) || Boolean.TRUE.equals(!fundFlag.getData()))) { (Common.isEmpty(fundFlag) || Boolean.TRUE.equals(!fundFlag.getData()))) {
return R.other(CommonConstants.TWO_INT, null, "未找到流程中或者在用的公积金信息!"); return R.other(CommonConstants.THREE_INT, null, "未找到流程中或者在用的公积金信息!");
} }
//是否已购买为否需要判断是否在用或者流程中的公积金 //是否已购买为否需要判断是否在用或者流程中的公积金
if (CommonConstants.ONE_STRING.equals(employeeRegistrationPre.getFundIsBuy()) && if (CommonConstants.ONE_STRING.equals(employeeRegistrationPre.getFundIsBuy()) &&
Common.isNotNull(fundFlag) && Boolean.TRUE.equals(fundFlag.getData()) && Common.isNotNull(fundFlag) && Boolean.TRUE.equals(fundFlag.getData()) &&
null != employeeRegistrationPre.getDispatchInfoPreVo() && null != employeeRegistrationPre.getDispatchInfoFundPreVo()) {
Common.isEmpty(employeeRegistrationPre.getDispatchInfoPreVo().getId())) { return R.other(CommonConstants.THREE_INT, null, "该人员存在在途/有效的公积金数据,请将“是否已参保”调整为“是”");
return R.other(CommonConstants.TWO_INT, null, "该人员存在在途/有效的公积金数据,请将“是否已参保”调整为“是”");
} }
//判断公积金基数 是否小于 公积金户配置的最低基数 //判断公积金基数 是否小于 公积金户配置的最低基数
if (Common.isNotNull(employeeRegistrationPre.getDispatchInfoFundPreVo().getConfigHouseId()) if (Common.isNotNull(employeeRegistrationPre.getDispatchInfoFundPreVo().getConfigHouseId())
......
...@@ -685,6 +685,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -685,6 +685,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
} }
} }
Date date = this.addYearsMonths(vo); Date date = this.addYearsMonths(vo);
if (CommonConstants.ONE_STRING.equals(preVo.getFundDateType())){
date = DateUtil.getFirstDay(date);
}
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo(); TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.TWO_STRING); dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(date); dayVo.setRegistDate(date);
...@@ -1111,8 +1114,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -1111,8 +1114,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
preVo.setProcessStatus(CommonConstants.ZERO_STRING); preVo.setProcessStatus(CommonConstants.ZERO_STRING);
preVo.setDispatchItem("公积金"); preVo.setDispatchItem("公积金");
if (null != fundPreVo){ if (null != fundPreVo){
preVo.setExpectedCollectionTime(fundPreVo.getExpectedCollectionTime()); preVo.setExpectedCollectionTime(null);
preVo.setExpectedConfirmTime(fundPreVo.getExpectedConfirmTime()); preVo.setExpectedConfirmTime(null);
preVo.setExpectedCollectionType(fundPreVo.getExpectedCollectionType()); preVo.setExpectedCollectionType(fundPreVo.getExpectedCollectionType());
preVo.setReceiveType(fundPreVo.getReceiveType()); preVo.setReceiveType(fundPreVo.getReceiveType());
preVo.setConfigId(fundPreVo.getConfigId()); preVo.setConfigId(fundPreVo.getConfigId());
......
...@@ -254,4 +254,38 @@ public class BigDecimalUtils { ...@@ -254,4 +254,38 @@ public class BigDecimalUtils {
} }
return new BigDecimal(c); return new BigDecimal(c);
} }
/**
* 判断BigDecimal值是否在指定范围内(包含边界)
* @param value 要检查的值
* @param min 最小值(包含)
* @param max 最大值(包含)
* @return 如果值在范围内返回true,否则返回false
*/
public static boolean isBetween(BigDecimal value, BigDecimal min, BigDecimal max) {
if (value == null || min == null || max == null) {
return false;
}
return value.compareTo(min) >= 0 && value.compareTo(max) <= 0;
}
/**
* 判断BigDecimal值是否在指定范围内
* @param value 要检查的值
* @param min 最小值
* @param minInclusive 最小值是否包含在内
* @param max 最大值
* @param maxInclusive 最大值是否包含在内
* @return 如果值在范围内返回true,否则返回false
*/
public static boolean isBetween(BigDecimal value, BigDecimal min, boolean minInclusive, BigDecimal max, boolean maxInclusive) {
if (value == null || min == null || max == null) {
return false;
}
boolean minCheck = minInclusive ? value.compareTo(min) >= 0 : value.compareTo(min) > 0;
boolean maxCheck = maxInclusive ? value.compareTo(max) <= 0 : value.compareTo(max) < 0;
return minCheck && maxCheck;
}
} }
...@@ -1277,6 +1277,23 @@ public class DateUtil { ...@@ -1277,6 +1277,23 @@ public class DateUtil {
return c1.getTime(); return c1.getTime();
} }
/**
* 获取第一天
* @Author fxj
* @Date 2019-10-16
* @param date
* @return
**/
public static Date getFirstDay(Date date){
if (!Common.isNotNull(date)){
return null;
}
Calendar c1 = Calendar.getInstance();
c1.setTime(date);
c1.set(Calendar.DATE, 1);
return c1.getTime();
}
/** /**
* 获取第一天 * 获取第一天
* @Author fxj * @Author fxj
......
...@@ -666,12 +666,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -666,12 +666,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//是否已签署为是需要判断是否在用或者流程中的公积金 //是否已签署为是需要判断是否在用或者流程中的公积金
if (CommonConstants.ZERO_STRING.equals(preVo.getFundIsBuy()) && if (CommonConstants.ZERO_STRING.equals(preVo.getFundIsBuy()) &&
(Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData()))) { (Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData()))) {
return R.other(CommonConstants.TWO_INT,null,"未找到流程中或者在用的公积金信息!"); return R.other(CommonConstants.THREE_INT,null,"未找到流程中或者在用的公积金信息!");
} }
// 是否已签署为否需要判断是否在用或者流程中的公积金 // 是否已签署为否需要判断是否在用或者流程中的公积金
if (CommonConstants.ONE_STRING.equals(preVo.getFundIsBuy()) && if (CommonConstants.ONE_STRING.equals(preVo.getFundIsBuy()) &&
Common.isNotNull(flag) && Boolean.TRUE.equals(flag.getData())) { Common.isNotNull(flag) && Boolean.TRUE.equals(flag.getData())) {
return R.other(CommonConstants.TWO_INT,null,"该人员存在在途/有效的公积金数据,请将'是否已参保'调整为'是'"); return R.other(CommonConstants.THREE_INT,null,"该人员存在在途/有效的公积金数据,请将'是否已参保'调整为'是'");
} }
//判断公积金基数 是否小于 公积金户配置的最低基数 //判断公积金基数 是否小于 公积金户配置的最低基数
if (Common.isNotNull(preVo.getDispatchInfoFundPreVo().getConfigHouseId()) if (Common.isNotNull(preVo.getDispatchInfoFundPreVo().getConfigHouseId())
...@@ -786,14 +786,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -786,14 +786,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo.setTypeSub(CommonConstants.ONE_STRING); preVo.setTypeSub(CommonConstants.ONE_STRING);
preVo.setProcessStatus(CommonConstants.ZERO_STRING); preVo.setProcessStatus(CommonConstants.ZERO_STRING);
preVo.setDispatchItem("公积金"); preVo.setDispatchItem("公积金");
//如果公积金起缴日期为空需要初始化--只有批量确认时才会走到这里
initFundStartDate(registration, preVo);
//如果自动触发派增为是,计算派单发起时间和派单确认时间 //如果自动触发派增为是,计算派单发起时间和派单确认时间
if (Common.isNotNull(preVo.getIsAutoDis()) && CommonConstants.ZERO_STRING.equals(preVo.getIsAutoDis()) if (Common.isNotNull(preVo.getIsAutoDis()) && CommonConstants.ZERO_STRING.equals(preVo.getIsAutoDis())
&& Common.isNotNull(preVo.getExpectedCollectionType())) { && Common.isNotNull(preVo.getExpectedCollectionType())) {
TEmployeeContractDateVo vo = new TEmployeeContractDateVo(); TEmployeeContractDateVo vo = new TEmployeeContractDateVo();
//如果公积金起缴日期为空需要初始化--只有批量确认时才会走到这里
initFundStartDate(registration, preVo);
//接收方式 0项目配置 1自定义 //接收方式 0项目配置 1自定义
if (CommonConstants.ONE_STRING.equals(preVo.getReceiveType())){ if (CommonConstants.ONE_STRING.equals(preVo.getReceiveType())){
vo.setMonthAfter(CommonConstants.ZERO_INT); vo.setMonthAfter(CommonConstants.ZERO_INT);
...@@ -826,6 +825,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -826,6 +825,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
} }
Date date = this.addYearsMonths(vo); Date date = this.addYearsMonths(vo);
if (CommonConstants.ONE_STRING.equals(preVo.getFundDateType())){
date = DateUtil.getFirstDay(date);
}
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo(); TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.TWO_STRING); dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(date); dayVo.setRegistDate(date);
...@@ -873,6 +875,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -873,6 +875,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
initDate.setRegistDate(preVo.getFundStartDate()); initDate.setRegistDate(preVo.getFundStartDate());
} }
Date date = this.addYearsMonths(initDate); Date date = this.addYearsMonths(initDate);
if (CommonConstants.ONE_STRING.equals(preVo.getFundDateType())){
date = DateUtil.getFirstDay(date);
}
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo(); TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.TWO_STRING); dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(date); dayVo.setRegistDate(date);
......
...@@ -69,7 +69,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -69,7 +69,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 养老基数上限 * 养老基数上限
*/ */
@ExcelAttribute(name = "养老基数上限", isNotEmpty = true,isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "养老基数上限", isNotEmpty = true,isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "养老基数上限") @Schema(description = "养老基数上限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数上限") @ExcelProperty("养老基数上限")
...@@ -78,7 +78,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -78,7 +78,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 养老基数下限 * 养老基数下限
*/ */
@ExcelAttribute(name = "养老基数下限", isNotEmpty = true,isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "养老基数下限", isNotEmpty = true,isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "养老基数下限") @Schema(description = "养老基数下限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数下限") @ExcelProperty("养老基数下限")
...@@ -87,7 +87,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -87,7 +87,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 工伤基数上限 * 工伤基数上限
*/ */
@ExcelAttribute(name = "工伤基数上限",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "工伤基数上限",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "工伤基数上限") @Schema(description = "工伤基数上限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数上限") @ExcelProperty("工伤基数上限")
...@@ -96,7 +96,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -96,7 +96,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 工伤基数下限 * 工伤基数下限
*/ */
@ExcelAttribute(name = "工伤基数下限",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "工伤基数下限",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "工伤基数下限") @Schema(description = "工伤基数下限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数下限") @ExcelProperty("工伤基数下限")
...@@ -105,7 +105,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -105,7 +105,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 医疗基数上限 * 医疗基数上限
*/ */
@ExcelAttribute(name = "医疗基数上限",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "医疗基数上限",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "医疗基数上限") @Schema(description = "医疗基数上限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数上限") @ExcelProperty("医疗基数上限")
...@@ -114,7 +114,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -114,7 +114,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 医疗基数下限 * 医疗基数下限
*/ */
@ExcelAttribute(name = "医疗基数下限",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "医疗基数下限",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "医疗基数下限") @Schema(description = "医疗基数下限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数下限") @ExcelProperty("医疗基数下限")
...@@ -123,7 +123,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -123,7 +123,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 生育基数上限 * 生育基数上限
*/ */
@ExcelAttribute(name = "生育基数上限",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "生育基数上限",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "生育基数上限") @Schema(description = "生育基数上限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数上限") @ExcelProperty("生育基数上限")
...@@ -132,7 +132,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -132,7 +132,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 生育基数下限 * 生育基数下限
*/ */
@ExcelAttribute(name = "生育基数下限",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "生育基数下限",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "生育基数下限") @Schema(description = "生育基数下限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数下限") @ExcelProperty("生育基数下限")
...@@ -141,7 +141,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -141,7 +141,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 失业基数上限 * 失业基数上限
*/ */
@ExcelAttribute(name = "失业基数上限",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "失业基数上限",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "失业基数上限") @Schema(description = "失业基数上限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数上限") @ExcelProperty("失业基数上限")
...@@ -150,7 +150,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -150,7 +150,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 失业基数下限 * 失业基数下限
*/ */
@ExcelAttribute(name = "失业基数下限",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "失业基数下限",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "失业基数下限") @Schema(description = "失业基数下限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数下限") @ExcelProperty("失业基数下限")
...@@ -159,7 +159,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -159,7 +159,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 大病基数上限 * 大病基数上限
*/ */
@ExcelAttribute(name = "大病基数上限",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "大病基数上限",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "大病基数上限") @Schema(description = "大病基数上限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数上限") @ExcelProperty("大病基数上限")
...@@ -168,7 +168,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -168,7 +168,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 大病基数下限 * 大病基数下限
*/ */
@ExcelAttribute(name = "大病基数下限",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "大病基数下限",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "大病基数下限") @Schema(description = "大病基数下限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数下限") @ExcelProperty("大病基数下限")
...@@ -222,7 +222,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -222,7 +222,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 单位大病金额 * 单位大病金额
*/ */
@ExcelAttribute(name = "单位大病金额",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "单位大病金额",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "单位大病金额") @Schema(description = "单位大病金额")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位大病金额") @ExcelProperty("单位大病金额")
...@@ -231,7 +231,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -231,7 +231,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 个人大病金额 * 个人大病金额
*/ */
@ExcelAttribute(name = "个人大病金额",isFloat = true,max = "999999999.99",min = 0) @ExcelAttribute(name = "个人大病金额",isFloat = true,max = "9999999100.01",min = 0)
@Schema(description = "个人大病金额") @Schema(description = "个人大病金额")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人大病金额") @ExcelProperty("个人大病金额")
...@@ -240,7 +240,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -240,7 +240,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 单位医疗缴纳比例 * 单位医疗缴纳比例
*/ */
@ExcelAttribute(name = "单位医疗比例", isNotEmpty = true,isFloat = true,max = "99.99",min = 0) @ExcelAttribute(name = "单位医疗比例", isNotEmpty = true,isFloat = true,max = "100.01",min = 0)
@Schema(description = "单位医疗比例") @Schema(description = "单位医疗比例")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位医疗比例") @ExcelProperty("单位医疗比例")
...@@ -249,7 +249,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -249,7 +249,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 个人医疗比例 * 个人医疗比例
*/ */
@ExcelAttribute(name = "个人医疗比例", isNotEmpty = true,isFloat = true,max = "99.99",min = 0) @ExcelAttribute(name = "个人医疗比例", isNotEmpty = true,isFloat = true,max = "100.01",min = 0)
@Schema(description = "个人医疗比例") @Schema(description = "个人医疗比例")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人医疗比例") @ExcelProperty("个人医疗比例")
...@@ -258,7 +258,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -258,7 +258,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 单位生育缴纳比例 * 单位生育缴纳比例
*/ */
@ExcelAttribute(name = "单位生育比例", isNotEmpty = true,isFloat = true,max = "99.99",min = 0) @ExcelAttribute(name = "单位生育比例", isNotEmpty = true,isFloat = true,max = "100.01",min = 0)
@Schema(description = "单位生育比例") @Schema(description = "单位生育比例")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位生育比例") @ExcelProperty("单位生育比例")
...@@ -267,7 +267,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -267,7 +267,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 单位养老缴纳比例 * 单位养老缴纳比例
*/ */
@ExcelAttribute(name = "单位养老比例", isNotEmpty = true,isFloat = true,max = "99.99",min = 0) @ExcelAttribute(name = "单位养老比例", isNotEmpty = true,isFloat = true,max = "100.01",min = 0)
@Schema(description = "单位养老比例") @Schema(description = "单位养老比例")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位养老比例") @ExcelProperty("单位养老比例")
...@@ -276,7 +276,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -276,7 +276,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 个人养老比例 * 个人养老比例
*/ */
@ExcelAttribute(name = "个人养老比例", isNotEmpty = true,isFloat = true,max = "99.99",min = 0) @ExcelAttribute(name = "个人养老比例", isNotEmpty = true,isFloat = true,max = "100.01",min = 0)
@Schema(description = "个人养老比例") @Schema(description = "个人养老比例")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人养老比例") @ExcelProperty("个人养老比例")
...@@ -286,7 +286,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -286,7 +286,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 单位工伤缴纳比例 * 单位工伤缴纳比例
*/ */
@ExcelAttribute(name = "单位工伤比例", isNotEmpty = true,isFloat = true,max = "99.99",min = 0) @ExcelAttribute(name = "单位工伤比例", isNotEmpty = true,isFloat = true,max = "100.01",min = 0)
@Schema(description = "单位工伤比例") @Schema(description = "单位工伤比例")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位工伤比例") @ExcelProperty("单位工伤比例")
...@@ -295,7 +295,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -295,7 +295,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 单位失业缴纳比例 * 单位失业缴纳比例
*/ */
@ExcelAttribute(name = "单位失业比例", isNotEmpty = true,isFloat = true,max = "99.99",min = 0) @ExcelAttribute(name = "单位失业比例", isNotEmpty = true,isFloat = true,max = "100.01",min = 0)
@Schema(description = "单位失业比例") @Schema(description = "单位失业比例")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位失业比例") @ExcelProperty("单位失业比例")
...@@ -304,7 +304,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -304,7 +304,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 个人失业比例 * 个人失业比例
*/ */
@ExcelAttribute(name = "个人失业比例", isNotEmpty = true,isFloat = true,max = "99.99",min = 0) @ExcelAttribute(name = "个人失业比例", isNotEmpty = true,isFloat = true,max = "100.01",min = 0)
@Schema(description = "个人失业比例") @Schema(description = "个人失业比例")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人失业比例") @ExcelProperty("个人失业比例")
...@@ -313,7 +313,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -313,7 +313,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 单位大病比例 * 单位大病比例
*/ */
@ExcelAttribute(name = "单位大病比例",isFloat = true,max = "99.99",min = 0) @ExcelAttribute(name = "单位大病比例",isFloat = true,max = "100.01",min = 0)
@Schema(description = "单位大病比例") @Schema(description = "单位大病比例")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位大病比例") @ExcelProperty("单位大病比例")
...@@ -322,7 +322,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -322,7 +322,7 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/** /**
* 个人大病比例 * 个人大病比例
*/ */
@ExcelAttribute(name = "个人大病比例",isFloat = true,max = "99.99",min = 0) @ExcelAttribute(name = "个人大病比例",isFloat = true,max = "100.01",min = 0)
@Schema(description = "个人大病比例") @Schema(description = "个人大病比例")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人大病比例") @ExcelProperty("个人大病比例")
......
...@@ -651,6 +651,8 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -651,6 +651,8 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
SysHouseHoldInfo hold = null; SysHouseHoldInfo hold = null;
//补缴险种 //补缴险种
String insurancePension = null; String insurancePension = null;
String startDateTemp = null;
String doMonthTemp = null;
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
infoVo = new SysBaseSetInfo(); infoVo = new SysBaseSetInfo();
excel = excelVOList.get(i); excel = excelVOList.get(i);
...@@ -679,14 +681,14 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -679,14 +681,14 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
errorMessageList.add(errorMsg); errorMessageList.add(errorMsg);
continue; continue;
} }
excel.setApplyStartDate(excel.getApplyStartDate() startDateTemp = excel.getApplyStartDate()
.replace("-", CommonConstants.EMPTY_STRING) .replace("-", CommonConstants.EMPTY_STRING)
.replace("/", CommonConstants.EMPTY_STRING)); .replace("/", CommonConstants.EMPTY_STRING);
excel.setDoMonth(excel.getDoMonth() doMonthTemp = excel.getDoMonth()
.replace("-", CommonConstants.EMPTY_STRING) .replace("-", CommonConstants.EMPTY_STRING)
.replace("/", CommonConstants.EMPTY_STRING)); .replace("/", CommonConstants.EMPTY_STRING);
//适用起始月份 //适用起始月份
dateFormat = DateUtil.stringToDate2(excel.getApplyStartDate()+"01", DateUtil.ISO_DATE_FORMAT); dateFormat = DateUtil.stringToDate2(startDateTemp+"01", DateUtil.ISO_DATE_FORMAT);
if (null != dateFormat){ if (null != dateFormat){
infoVo.setApplyStartDate(dateFormat); infoVo.setApplyStartDate(dateFormat);
}else { }else {
...@@ -714,7 +716,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -714,7 +716,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
temp.setApplyEndDate(DateUtil.addDayByDate(dateFormat,-1)); temp.setApplyEndDate(DateUtil.addDayByDate(dateFormat,-1));
} }
//执行月份校验 //执行月份校验
dateUse = DateUtil.stringToDate2(excel.getDoMonth()+"01", DateUtil.ISO_DATE_FORMAT); dateUse = DateUtil.stringToDate2(doMonthTemp+"01", DateUtil.ISO_DATE_FORMAT);
if (null != dateUse){ if (null != dateUse){
infoVo.setDoMonth(DateUtil.getYearAndMonth(dateFormat,0)); infoVo.setDoMonth(DateUtil.getYearAndMonth(dateFormat,0));
}else { }else {
...@@ -1018,6 +1020,19 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -1018,6 +1020,19 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
infoVo.setPersonalMedicalPro(excel.getPersonalMedicalPro()); infoVo.setPersonalMedicalPro(excel.getPersonalMedicalPro());
infoVo.setPersonalPersionPro(excel.getPersonalPersionPro()); infoVo.setPersonalPersionPro(excel.getPersonalPersionPro());
infoVo.setPayPersonalPro(excel.getPayPersonalPro()); infoVo.setPayPersonalPro(excel.getPayPersonalPro());
//各种比例需在0~100内
if (infoVo.getUnitPersionPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getUnitInjuryPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getUnitMedicalPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getUnitBirthPro().compareTo( BigDecimal.ZERO) < 0
|| infoVo.getUnitUnemploymentPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getPersonalUnemploymentPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getPersonalMedicalPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getPersonalPersionPro().compareTo(BigDecimal.ZERO) < 0 ){
errorMsg = new ErrorMessage(excel.getRowIndex(),"比例需在0~100内,请修改后重新提交",excel);
errorMessageList.add(errorMsg);
continue;
}
//单位及个人比例合计 //单位及个人比例合计
infoVo.setUnitProSum(BigDecimalUtils.safeAdd(infoVo.getUnitInjuryPro(), infoVo.setUnitProSum(BigDecimalUtils.safeAdd(infoVo.getUnitInjuryPro(),
infoVo.getUnitMedicalPro(), infoVo.getUnitMedicalPro(),
...@@ -1031,6 +1046,13 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -1031,6 +1046,13 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
if (CommonConstants.ZERO_STRING.equals(excel.getIsIllness()) && CommonConstants.ONE_STRING.equals(excel.getValueType())){ if (CommonConstants.ZERO_STRING.equals(excel.getIsIllness()) && CommonConstants.ONE_STRING.equals(excel.getValueType())){
infoVo.setUnitProSum(BigDecimalUtils.safeAdd(infoVo.getUnitProSum(), infoVo.getPayCompanyPro())); infoVo.setUnitProSum(BigDecimalUtils.safeAdd(infoVo.getUnitProSum(), infoVo.getPayCompanyPro()));
infoVo.setPersonalProSum(BigDecimalUtils.safeAdd(infoVo.getPersonalProSum(),infoVo.getPayPersonalPro())); infoVo.setPersonalProSum(BigDecimalUtils.safeAdd(infoVo.getPersonalProSum(),infoVo.getPayPersonalPro()));
//各种比例需在0~100内
if (infoVo.getPayCompanyPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getPayPersonalPro().compareTo(BigDecimal.ZERO) < 0){
errorMsg = new ErrorMessage(excel.getRowIndex(),"比例需在0~100内,请修改后重新提交",excel);
errorMessageList.add(errorMsg);
continue;
}
} }
infoVo.setStatus(CommonConstants.ZERO_INT); infoVo.setStatus(CommonConstants.ZERO_INT);
infoVo.setBaseType(CommonConstants.ZERO_STRING); infoVo.setBaseType(CommonConstants.ZERO_STRING);
...@@ -1243,7 +1265,6 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -1243,7 +1265,6 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
continue; continue;
} }
infoVo.setOverpayNumber(Integer.parseInt(excel.getOverpayNumber())); infoVo.setOverpayNumber(Integer.parseInt(excel.getOverpayNumber()));
}
//是否含起缴当月 //是否含起缴当月
//是否含起缴当月 必填 //是否含起缴当月 必填
if (!Common.getSet(CommonConstants.ZERO_STRING, CommonConstants.ONE_STRING).contains(excel.getHaveThisMonth())) { if (!Common.getSet(CommonConstants.ZERO_STRING, CommonConstants.ONE_STRING).contains(excel.getHaveThisMonth())) {
...@@ -1272,6 +1293,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -1272,6 +1293,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
} }
infoVo.setPayPolicy(excel.getPayPolicy()); infoVo.setPayPolicy(excel.getPayPolicy());
infoVo.setInsuranceIsLatestCardinality(excel.getInsuranceIsLatestCardinality()); infoVo.setInsuranceIsLatestCardinality(excel.getInsuranceIsLatestCardinality());
}
infoVo.setCanOverpay(excel.getCanOverpay()); infoVo.setCanOverpay(excel.getCanOverpay());
infoVo.setStatus(CommonConstants.ZERO_INT); infoVo.setStatus(CommonConstants.ZERO_INT);
infoVo.setBaseType(CommonConstants.ONE_STRING); infoVo.setBaseType(CommonConstants.ONE_STRING);
......
...@@ -389,6 +389,9 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -389,6 +389,9 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
} }
Date date = this.addYearsMonths(vo); Date date = this.addYearsMonths(vo);
if (CommonConstants.ONE_STRING.equals(preVo.getFundDateType())){
date = DateUtil.getFirstDay(date);
}
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo(); TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.TWO_STRING); dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(date); dayVo.setRegistDate(date);
......
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