Commit 8d9ba881 authored by fangxinjiang's avatar fangxinjiang

社保公积金查询调整

parent 50f0c9c2
......@@ -73,15 +73,6 @@ public class TEmpFamilyController {
@Operation(description = "分页查询")
@GetMapping("/page" )
public R<IPage<TEmpFamily>> getTEmpFamilyPage(Page page, FamilySearchVO tEmpFamily) {
List<String> codes = new ArrayList<>();
codes.add("A0001");
codes.add("皖M02002");
codes.add("皖B29203");
codes.add("皖AFA10M");
codes.add("皖AFA11F");
codes.add("皖M02023");
codes.add("皖M02045");
R<Map> res = archivesDaprUtil.getSetInfoByCodes(codes);
return R.ok(tEmpFamilyService.pageDiy(page,tEmpFamily));
}
/**
......
......@@ -872,4 +872,47 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("公积金停缴日期" )
private Date fundReduceDate;
/**
* 单位补缴利息
*/
@ExcelAttribute(name = "单位补缴利息")
@Schema(description = "单位补缴利息")
@ExcelProperty("单位补缴利息")
private BigDecimal unitInterestFee;
/**
* 个人补缴利息
*/
@ExcelAttribute(name = "个人补缴利息")
@Schema(description = "个人补缴利息")
@ExcelProperty("个人补缴利息")
private BigDecimal personalInterestFee;
/**
* 单位社保合计
*/
@ExcelAttribute(name = "单位社保合计" )
@Schema(description ="单位社保合计")
@ExcelProperty("单位社保合计")
private BigDecimal unitSocialSum;
/**
* 个人社保合计
*/
@ExcelAttribute(name = "个人社保合计" )
@Schema(description ="个人社保合计")
@ExcelProperty("个人社保合计")
private BigDecimal personalSocialSum;
/**
* 单位公积金金额
*/
@ExcelAttribute(name = "单位公积金金额")
@ExcelProperty("单位公积金金额")
private BigDecimal unitFundSum;
/**
* 个人公积金金额
*/
@ExcelAttribute(name = "个人公积金金额")
@ExcelProperty("个人公积金金额")
private BigDecimal personalFundSum;
}
......@@ -138,6 +138,13 @@
<result property="haveThisMonthFund" column="HAVE_THIS_MONTH_FUND"/>
<result property="latestCardinalityFund" column="LATEST_CARDINALITY_FUND"/>
<result property="fundReduceDate" column="FUND_REDUCE_DATE"/>
<result property="personalFundSum" column="PERSONAL_FUND_SUM"/>
<result property="unitFundSum" column="UNIT_FUND_SUM"/>
<result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
<result property="personalSocialSum" column="PERSONAL_SOCIAL_SUM"/>
<result property="unitInterestFee" column="UNIT_INTEREST_FEE"/>
<result property="personalInterestFee" column="PERSONAL_INTEREST_FEE"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -253,7 +260,13 @@
a.TRUST_REMARK_FUND,
a.HAVE_THIS_MONTH_FUND,
a.LATEST_CARDINALITY_FUND,
a.FUND_REDUCE_DATE
a.FUND_REDUCE_DATE,
a.PERSONAL_FUND_SUM,
a.UNIT_FUND_SUM,
a.UNIT_SOCIAL_SUM,
a.PERSONAL_SOCIAL_SUM,
a.UNIT_INTEREST_FEE,
a.PERSONAL_INTEREST_FEE
</sql>
<sql id="tSocialFundInfo_where">
<if test="tSocialFundInfo != null">
......
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