Commit de549c37 authored by huyuchen's avatar huyuchen

优化修改

parent b425c59d
...@@ -225,6 +225,15 @@ public class SysBaseSetInfo extends BaseEntity { ...@@ -225,6 +225,15 @@ public class SysBaseSetInfo extends BaseEntity {
@ExcelProperty("大病基数下限") @ExcelProperty("大病基数下限")
private BigDecimal lowerBig; private BigDecimal lowerBig;
/**
* 是否同一基数上下限: 0是;1否
*/
@ExcelAttribute(name = "是否同一基数上下限: 0是;1否")
@Schema(description = "是否同一基数上下限: 0是;1否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否同一基数上下限: 0收取;1不收取")
private String isSameBase;
/** /**
* 补缴政策(社保或公积金) * 补缴政策(社保或公积金)
*/ */
......
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
<result property="lowerInjury" column="LOWER_INJURY"/> <result property="lowerInjury" column="LOWER_INJURY"/>
<result property="lowerBirth" column="LOWER_BIRTH"/> <result property="lowerBirth" column="LOWER_BIRTH"/>
<result property="lowerBig" column="LOWER_BIG"/> <result property="lowerBig" column="LOWER_BIG"/>
<result property="isSameBase" column="IS_SAME_BASE"/>
<collection property="fundProList" ofType="com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion" <collection property="fundProList" ofType="com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion"
select="com.yifu.cloud.plus.v1.yifu.social.mapper.SysPayProportionMapper.selectByPrimaryId" column="id"> select="com.yifu.cloud.plus.v1.yifu.social.mapper.SysPayProportionMapper.selectByPrimaryId" column="id">
</collection> </collection>
...@@ -166,6 +167,7 @@ ...@@ -166,6 +167,7 @@
LOWER_UNEMPLOYMENT, LOWER_UNEMPLOYMENT,
LOWER_INJURY, LOWER_INJURY,
LOWER_BIRTH, LOWER_BIRTH,
IS_SAME_BASE,
LOWER_BIG LOWER_BIG
</sql> </sql>
<sql id="sysBaseSetInfo_where"> <sql id="sysBaseSetInfo_where">
......
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