Commit 8e2e30de authored by huyuchen's avatar huyuchen

huych-入职确认信息编辑提交

parent e9ae216c
...@@ -9,6 +9,7 @@ import lombok.Data; ...@@ -9,6 +9,7 @@ import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/** /**
* 参保人员信息VO * 参保人员信息VO
...@@ -85,4 +86,9 @@ public class UnFundInfoVo implements Serializable { ...@@ -85,4 +86,9 @@ public class UnFundInfoVo implements Serializable {
*/ */
private BigDecimal providentCardinal; private BigDecimal providentCardinal;
/**
* 公积金起缴日期
*/
private Date providentStart;
} }
...@@ -307,6 +307,7 @@ ...@@ -307,6 +307,7 @@
<result property="unitProvidentPer" column="UNIT_PROVIDENT_PER"/> <result property="unitProvidentPer" column="UNIT_PROVIDENT_PER"/>
<result property="personalProvidentPer" column="PERSONAL_PROVIDENT_PER"/> <result property="personalProvidentPer" column="PERSONAL_PROVIDENT_PER"/>
<result property="providentCardinal" column="UNIT_PROVIDENG_CARDINAL"/> <result property="providentCardinal" column="UNIT_PROVIDENG_CARDINAL"/>
<result property="providentStart" column="PROVIDENT_START"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -1286,6 +1287,7 @@ ...@@ -1286,6 +1287,7 @@
DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as dispatchTime, DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as dispatchTime,
a.UNIT_PROVIDENT_PER, a.UNIT_PROVIDENT_PER,
a.PERSONAL_PROVIDENT_PER, a.PERSONAL_PROVIDENT_PER,
a.PROVIDENT_START,
a.UNIT_PROVIDENG_CARDINAL a.UNIT_PROVIDENG_CARDINAL
FROM t_social_fund_info a FROM t_social_fund_info a
inner join t_dispatch_info d on a.DISPATCH_ID = d.ID inner join t_dispatch_info d on a.DISPATCH_ID = d.ID
......
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