Commit 12d9832a authored by fangxinjiang's avatar fangxinjiang

社保自动化配置-fxj

parent 60b26040
......@@ -41,6 +41,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
import com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoVo;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -1320,18 +1321,18 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
return R.failed("备案基数不可空");
}
if ((CommonConstants.ZERO_STRING.equals(rel.getPaymentType())
|| CommonConstants.ONE_STRING.equals(rel.getPaymentType()))){
R<SysBaseSetInfo> resR = socialDaprUtils.getSocialHouseBaseSet(rel.getConfigHouseId());
|| CommonConstants.TWO_STRING.equals(rel.getPaymentType()))){
R<SysBaseSetInfoVo> resR = socialDaprUtils.getSocialHouseBaseSet(rel.getConfigHouseId());
if (Common.isNotNull(resR) && resR.getData() != null) {
SysBaseSetInfo setInfo = resR.getData();
SysBaseSetInfoVo setInfo = resR.getData();
if (Common.isNotNull(setInfo)) {
try {
// 添加了异常处理,避免 recordBase 不是合法数字格式时程序崩溃
if (CommonConstants.ZERO_STRING.equals(rel.getPaymentType())) {
if (CommonConstants.TWO_STRING.equals(rel.getPaymentType())) {
if (BigDecimal.valueOf(Double.valueOf(rel.getRecordBase())).compareTo(setInfo.getUpperLimit()) != 0) {
return R.failed("备案基数不等于社保户最高基数");
}
} else {
} else if (CommonConstants.ZERO_STRING.equals(rel.getPaymentType())){
if (BigDecimal.valueOf(Double.valueOf(rel.getRecordBase())).compareTo(setInfo.getLowerLimit()) != 0) {
return R.failed("备案基数不等于社保户最低基数");
}
......
......@@ -13,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.vo.*;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
import com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo;
import lombok.extern.log4j.Log4j2;
......@@ -245,8 +246,8 @@ public class SocialDaprUtils {
* @Param
* @return
**/
public R<SysBaseSetInfo> getSocialHouseBaseSet(String houseId) {
R<SysBaseSetInfo> res = HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/sysbasesetinfo/inner/getSocialHouseBaseSet", houseId, SysBaseSetInfo.class, SecurityConstants.FROM_IN);
public R<SysBaseSetInfoVo> getSocialHouseBaseSet(String houseId) {
R<SysBaseSetInfoVo> res = HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/sysbasesetinfo/inner/getSocialHouseBaseSet", houseId, SysBaseSetInfoVo.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("获取社保配置信息失败!");
}
......
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* @Author fxj
* @Date 2025/10/11
* @Description
* @Version 1.0
*/
@Data
public class SysBaseSetInfoVo implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelAttribute(name = "主键")
@Schema(description = "主键")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("主键")
private String id;
/**
* 缴纳地-省(社保或公积金)
*/
@ExcelAttribute(name = "缴纳地-省(社保或公积金)")
@Schema(description = "缴纳地-省(社保或公积金)")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("缴纳地-省(社保或公积金)")
private Integer province;
/**
* 缴纳地-市(社保或公积金)
*/
@ExcelAttribute(name = "缴纳地-市(社保或公积金)")
@Schema(description = "缴纳地-市(社保或公积金)")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("缴纳地-市(社保或公积金)")
private Integer city;
/**
* 缴纳地-县(社保或公积金)
*/
@ExcelAttribute(name = "缴纳地-县(社保或公积金)")
@Schema(description = "缴纳地-县(社保或公积金)")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("缴纳地-县(社保或公积金)")
private Integer town;
/**
* 适用周期-开始时间(社保或公积金)
*/
@ExcelAttribute(name = "适用周期-开始时间(社保或公积金)")
@Schema(description = "适用周期-开始时间(社保或公积金)")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("适用周期-开始时间(社保或公积金)")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
private Date applyStartDate;
/**
* 适用周期-结束时间(社保或公积金)
*/
@ExcelAttribute(name = "适用周期-结束时间(社保或公积金)")
@Schema(description = "适用周期-结束时间(社保或公积金)")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("适用周期-结束时间(社保或公积金)")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
private Date applyEndDate;
/**
* 基数上限(社保或公积金)
*/
@ExcelAttribute(name = "基数上限(社保或公积金)")
@Schema(description = "基数上限(社保或公积金)")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数上限(社保或公积金)")
private BigDecimal upperLimit;
/**
* 基数下限(社保或公积金)
*/
@ExcelAttribute(name = "基数下限(社保或公积金)")
@Schema(description = "基数下限(社保或公积金)")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数下限(社保或公积金)")
private BigDecimal lowerLimit;
/**
* 养老基数上限
*/
@ExcelAttribute(name = "养老基数上限")
@Schema(description = "养老基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数上限")
private BigDecimal upPersion;
/**
* 医疗基数上限
*/
@ExcelAttribute(name = "医疗基数上限")
@Schema(description = "医疗基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数上限")
private BigDecimal upMedical;
/**
* 失业基数上限
*/
@ExcelAttribute(name = "失业基数上限")
@Schema(description = "失业基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数上限")
private BigDecimal upUnemployment;
/**
* 工伤基数上限
*/
@ExcelAttribute(name = "工伤基数上限")
@Schema(description = "工伤基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数上限")
private BigDecimal upInjury;
/**
* 生育基数上限
*/
@ExcelAttribute(name = "生育基数上限")
@Schema(description = "生育基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数上限")
private BigDecimal upBirth;
/**
* 大病基数上限
*/
@ExcelAttribute(name = "大病基数上限")
@Schema(description = "大病基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数上限")
private BigDecimal upBig;
/**
* 养老基数下限
*/
@ExcelAttribute(name = "养老基数下限")
@Schema(description = "养老基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数下限")
private BigDecimal lowerPersion;
/**
* 医疗基数下限
*/
@ExcelAttribute(name = "医疗基数下限")
@Schema(description = "医疗基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数下限")
private BigDecimal lowerMedical;
/**
* 失业基数下限
*/
@ExcelAttribute(name = "失业基数下限")
@Schema(description = "失业基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数下限")
private BigDecimal lowerUnemployment;
/**
* 工伤基数下限
*/
@ExcelAttribute(name = "工伤基数下限")
@Schema(description = "工伤基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数下限")
private BigDecimal lowerInjury;
/**
* 生育基数下限
*/
@ExcelAttribute(name = "生育基数下限")
@Schema(description = "生育基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数下限")
private BigDecimal lowerBirth;
/**
* 大病基数下限
*/
@ExcelAttribute(name = "大病基数下限")
@Schema(description = "大病基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数下限")
private BigDecimal lowerBig;
/**
* 是否同一基数上下限: 0是;1否
*/
@ExcelAttribute(name = "是否同一基数上下限: 0是;1否")
@Schema(description = "是否同一基数上下限: 0是;1否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否同一基数上下限: 0是;1否")
private String isSameBase;
/**
* 补缴政策(社保或公积金)
*/
@ExcelAttribute(name = "补缴政策(社保或公积金)")
@Schema(description = "补缴政策(社保或公积金)")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴政策(社保或公积金)")
private String payPolicy;
/**
* 0.社保 1.公积金
*/
@ExcelAttribute(name = "0.社保 1.公积金")
@Schema(description = "0.社保 1.公积金")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("0.社保 1.公积金")
private String baseType;
/**
* 单位养老缴纳比例
*/
@ExcelAttribute(name = "单位养老缴纳比例")
@Schema(description = "单位养老缴纳比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位养老缴纳比例")
private BigDecimal unitPersionPro;
/**
* 单位医疗缴纳比例
*/
@ExcelAttribute(name = "单位医疗缴纳比例")
@Schema(description = "单位医疗缴纳比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位医疗缴纳比例")
private BigDecimal unitMedicalPro;
/**
* 单位失业缴纳比例
*/
@ExcelAttribute(name = "单位失业缴纳比例")
@Schema(description = "单位失业缴纳比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位失业缴纳比例")
private BigDecimal unitUnemploymentPro;
/**
* 单位工伤缴纳比例
*/
@ExcelAttribute(name = "单位工伤缴纳比例")
@Schema(description = "单位工伤缴纳比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位工伤缴纳比例")
private BigDecimal unitInjuryPro;
/**
* 单位生育缴纳比例-已删除
*/
@ExcelAttribute(name = "单位生育缴纳比例-已删除")
@Schema(description = "单位生育缴纳比例-已删除")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位生育缴纳比例-已删除")
private BigDecimal unitBirthPro;
/**
* 单位比例合计
*/
@ExcelAttribute(name = "单位比例合计")
@Schema(description = "单位比例合计")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位比例合计")
private BigDecimal unitProSum;
/**
* 个人养老比例
*/
@ExcelAttribute(name = "个人养老比例")
@Schema(description = "个人养老比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人养老比例")
private BigDecimal personalPersionPro;
/**
* 个人医疗比例
*/
@ExcelAttribute(name = "个人医疗比例")
@Schema(description = "个人医疗比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人医疗比例")
private BigDecimal personalMedicalPro;
/**
* 个人失业比例
*/
@ExcelAttribute(name = "个人失业比例")
@Schema(description = "个人失业比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人失业比例")
private BigDecimal personalUnemploymentPro;
/**
* 个人比例合计
*/
@ExcelAttribute(name = "个人比例合计")
@Schema(description = "个人比例合计")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人比例合计")
private BigDecimal personalProSum;
/**
* 是否大病: 0收取;1不收取
*/
@ExcelAttribute(name = "是否大病: 0收取;1不收取")
@Schema(description = "是否大病: 0收取;1不收取")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否大病: 0收取;1不收取")
private String isIllness;
/**
* 新员工入职是否收费 0.是 1.否
*/
@ExcelAttribute(name = "新员工入职是否收费 0.是 1.否")
@Schema(description = "新员工入职是否收费 0.是 1.否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("新员工入职是否收费 0.是 1.否")
private String isChargePersonal;
/**
* 单位大病金额(元/人)--按定值
*/
@ExcelAttribute(name = "单位大病金额(元/人)--按定值")
@Schema(description = "单位大病金额(元/人)--按定值")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位大病金额(元/人)--按定值")
private BigDecimal chargeCompany;
/**
* 个人大病金额(元/人)--按定值
*/
@ExcelAttribute(name = "个人大病金额(元/人)--按定值")
@Schema(description = "个人大病金额(元/人)--按定值")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人大病金额(元/人)--按定值")
private BigDecimal chargePersonal;
/**
* 大病缴纳周期:收取方式 0.按年 1.按月
*/
@ExcelAttribute(name = "大病缴纳周期:收取方式 0.按年 1.按月")
@Schema(description = "大病缴纳周期:收取方式 0.按年 1.按月")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病缴纳周期:收取方式 0.按年 1.按月")
private String collectType;
/**
* 大病单位缴纳金额--按比例
*/
@ExcelAttribute(name = "大病单位缴纳金额--按比例")
@Schema(description = "大病单位缴纳金额--按比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病单位缴纳金额--按比例")
private BigDecimal payCompany;
/**
* 单位大病比例
*/
@ExcelAttribute(name = "单位大病比例")
@Schema(description = "单位大病比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位大病比例")
private BigDecimal payCompanyPro;
/**
* 大病个人缴纳金额--按比例
*/
@ExcelAttribute(name = "大病个人缴纳金额--按比例")
@Schema(description = "大病个人缴纳金额--按比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病个人缴纳金额--按比例")
private BigDecimal payPersonal;
/**
* 个人大病比例
*/
@ExcelAttribute(name = "个人大病比例")
@Schema(description = "个人大病比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人大病比例")
private BigDecimal payPersonalPro;
/**
* 缴纳月份:周期为年--收取月份 1到12月份
*/
@ExcelAttribute(name = "缴纳月份:周期为年--收取月份 1到12月份")
@Schema(description = "缴纳月份:周期为年--收取月份 1到12月份")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("缴纳月份:周期为年--收取月份 1到12月份")
private Integer collectMoth;
/**
* 单边缴费额度下--公积金
*/
@ExcelAttribute(name = "单边缴费额度下--公积金")
@Schema(description = "单边缴费额度下--公积金")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单边缴费额度下--公积金")
private BigDecimal fundPayLowerLimit;
/**
* 单边缴费额度上限--公积金
*/
@ExcelAttribute(name = "单边缴费额度上限--公积金")
@Schema(description = "单边缴费额度上限--公积金")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单边缴费额度上限--公积金")
private BigDecimal fundPayUpperLimit;
/**
* 单边小数点:公积金
*/
@ExcelAttribute(name = "单边小数点:公积金")
@Schema(description = "单边小数点:公积金")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单边小数点:公积金")
private Integer fundPayPoint;
/**
* 公积金类型 0.市直 1. 省直
*/
@ExcelAttribute(name = "公积金类型 0.市直 1. 省直")
@Schema(description = "公积金类型 0.市直 1. 省直")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公积金类型 0.市直 1. 省直")
private Integer fundPayType;
/**
* 单位公积金比例
*/
@ExcelAttribute(name = "单位公积金比例")
@Schema(description = "单位公积金比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位公积金比例")
private BigDecimal housingFundCompamyPro;
/**
* 个人公积金比例
*/
@ExcelAttribute(name = "个人公积金比例")
@Schema(description = "个人公积金比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人公积金比例")
private BigDecimal housingFundPersonalPro;
/**
* 部门关联ID
*/
@ExcelAttribute(name = "部门关联ID")
@Schema(description = "部门关联ID")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("部门关联ID")
private String departId;
/**
* 0.在用1.终止2过期
*/
@ExcelAttribute(name = "0.在用1.终止2过期")
@Schema(description = "0.在用1.终止2过期")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("0.在用1.终止2过期")
private Integer status;
/**
* 缴纳方式:周期为月--取值方式 0.按定值1比例
*/
@ExcelAttribute(name = "缴纳方式:周期为月--取值方式 0.按定值1比例")
@Schema(description = "缴纳方式:周期为月--取值方式 0.按定值1比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("缴纳方式:周期为月--取值方式 0.按定值1比例")
private String valueType;
/**
* 是否可以补缴: 0:是,1:否
*/
@ExcelAttribute(name = "是否可以补缴: 0:是,1:否")
@Schema(description = "是否可以补缴: 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否可以补缴: 0:是,1:否")
private String canOverpay;
/**
* 最大补缴期限
*/
@ExcelAttribute(name = "最大补缴期限")
@Schema(description = "最大补缴期限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("最大补缴期限")
private Integer overpayNumber;
/**
* 是否含起缴当月: 0:是,1:否
*/
@ExcelAttribute(name = "是否含起缴当月: 0:是,1:否")
@Schema(description = "是否含起缴当月: 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否含起缴当月: 0:是,1:否")
private String haveThisMonth;
/**
* 补缴险种-是否能补缴养老0是1否
*/
@ExcelAttribute(name = "补缴险种-是否能补缴养老0是1否")
@Schema(description = "补缴险种-是否能补缴养老0是1否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴险种-是否能补缴养老0是1否")
private String insurancePension;
/**
* 补缴险种-是否能补缴医疗0是1否
*/
@ExcelAttribute(name = "补缴险种-是否能补缴医疗0是1否")
@Schema(description = "补缴险种-是否能补缴医疗0是1否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴险种-是否能补缴医疗0是1否")
private String insuranceMedical;
/**
* 补缴险种-是否能补缴失业0是1否
*/
@ExcelAttribute(name = "补缴险种-是否能补缴失业0是1否")
@Schema(description = "补缴险种-是否能补缴失业0是1否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴险种-是否能补缴失业0是1否")
private String insuranceUnemployment;
/**
* 补缴险种-是否能补缴工伤0是1否
*/
@ExcelAttribute(name = "补缴险种-是否能补缴工伤0是1否")
@Schema(description = "补缴险种-是否能补缴工伤0是1否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴险种-是否能补缴工伤0是1否")
private String insuranceInjury;
/**
* 补缴险种-是否能补缴生育0是1否
*/
@ExcelAttribute(name = "补缴险种-是否能补缴生育0是1否")
@Schema(description = "补缴险种-是否能补缴生育0是1否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴险种-是否能补缴生育0是1否")
private String insuranceBirth;
/**
* 补缴险种-是否能补缴大病0是1否
*/
@ExcelAttribute(name = "补缴险种-是否能补缴大病0是1否")
@Schema(description = "补缴险种-是否能补缴大病0是1否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴险种-是否能补缴大病0是1否")
private String insuranceBigailment;
/**
* 补缴险种-补缴是否采用最新基数0是1否
*/
@ExcelAttribute(name = "补缴险种-补缴是否采用最新基数0是1否")
@Schema(description = "补缴险种-补缴是否采用最新基数0是1否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴险种-补缴是否采用最新基数0是1否")
private String insuranceIsLatestCardinality;
/**
* 删除标志0正常1删除
*/
@ExcelAttribute(name = "删除标志0正常1删除")
@Schema(description = "删除标志0正常1删除")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("删除标志0正常1删除")
private String deleteFlag;
/**
* 社保户名称
*/
@ExcelAttribute(name = "社保户名称")
@Schema(description = "社保户名称")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保户名称")
private String departName;
@ExcelAttribute(name = "执行月份")
@Schema(description = "执行月份")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("执行月份")
private String doMonth;
@ExcelAttribute(name = "是否新数据:0否1是。为1,将同步社保公积金查询、预估库。其余值,不同步")
@Schema(description = "是否新数据:0否1是。为1,将同步社保公积金查询、预估库。其余值,不同步")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否新数据:0否1是。为1,将同步社保公积金查询、预估库。其余值,不同步")
private String isNew;
@Schema(description = "适用月")
@TableField(exist = false)
private String applyDate;
@Schema(description = "公积金比例List(保存时前端传参用)")
@TableField(exist = false)
private List<SysPayProportion> fundProList;
}
......@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.util.bean.BeanCopyUtils;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
......@@ -29,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
import com.yifu.cloud.plus.v1.yifu.social.service.SysBaseSetInfoService;
import com.yifu.cloud.plus.v1.yifu.social.service.SysPayProportionService;
import com.yifu.cloud.plus.v1.yifu.social.vo.SysBaseSetInfoVo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
......@@ -182,12 +184,14 @@ public class SysBaseSetInfoController {
*/
@Operation(summary = "通过id查询", description = "通过id查询")
@Inner
@GetMapping("/inner/getSocialHouseBaseSet")
public SysBaseSetInfo getSocialHouseBaseSet(@RequestBody String houseId) {
@PostMapping("/inner/getSocialHouseBaseSet")
public SysBaseSetInfoVo getSocialHouseBaseSet(@RequestBody String houseId) {
SysBaseSetInfo baseSetInfo = sysBaseSetInfoService.getById(houseId);
if (null != baseSetInfo && CommonConstants.ONE_STRING.equals(baseSetInfo.getBaseType())){
baseSetInfo.setFundProList(sysPayProportionService.list(Wrappers.<SysPayProportion>query().lambda().eq(SysPayProportion::getSysBaseSetId,houseId)));
}
return baseSetInfo;
SysBaseSetInfoVo sysBaseSetInfoVo = new SysBaseSetInfoVo();
BeanCopyUtils.copyProperties(baseSetInfo,sysBaseSetInfoVo);
return sysBaseSetInfoVo;
}
}
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