Commit 8d190bc1 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 711d1fef
...@@ -9,6 +9,7 @@ import lombok.Data; ...@@ -9,6 +9,7 @@ import lombok.Data;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
/** /**
* 入职确认信息公积金已购买记录 * 入职确认信息公积金已购买记录
...@@ -32,7 +33,7 @@ public class TFundPreDetailVo implements Serializable { ...@@ -32,7 +33,7 @@ public class TFundPreDetailVo implements Serializable {
@Length(max = 32, message = "公积金缴纳地-省不能超过32个字符") @Length(max = 32, message = "公积金缴纳地-省不能超过32个字符")
@ExcelProperty("公积金缴纳地-省") @ExcelProperty("公积金缴纳地-省")
@Schema(description = "公积金缴纳地-省") @Schema(description = "公积金缴纳地-省")
private String socialProvince; private String fundProvince;
/** /**
* 公积金缴纳地-市 * 公积金缴纳地-市
*/ */
...@@ -40,7 +41,7 @@ public class TFundPreDetailVo implements Serializable { ...@@ -40,7 +41,7 @@ public class TFundPreDetailVo implements Serializable {
@Length(max = 32, message = "公积金缴纳地-市不能超过32个字符") @Length(max = 32, message = "公积金缴纳地-市不能超过32个字符")
@ExcelProperty("公积金缴纳地-市") @ExcelProperty("公积金缴纳地-市")
@Schema(description = "公积金缴纳地-市") @Schema(description = "公积金缴纳地-市")
private String socialCity; private String fundCity;
/** /**
* 公积金缴纳地-县 * 公积金缴纳地-县
*/ */
...@@ -48,7 +49,7 @@ public class TFundPreDetailVo implements Serializable { ...@@ -48,7 +49,7 @@ public class TFundPreDetailVo implements Serializable {
@Length(max = 32, message = "公积金缴纳地-县不能超过32个字符") @Length(max = 32, message = "公积金缴纳地-县不能超过32个字符")
@ExcelProperty("公积金缴纳地-县") @ExcelProperty("公积金缴纳地-县")
@Schema(description = "公积金缴纳地-县") @Schema(description = "公积金缴纳地-县")
private String socialTown; private String fundTown;
/** /**
* 项目名称 * 项目名称
*/ */
...@@ -72,7 +73,7 @@ public class TFundPreDetailVo implements Serializable { ...@@ -72,7 +73,7 @@ public class TFundPreDetailVo implements Serializable {
@Length(max = 50, message = "公积金户名称不能超过50个字符") @Length(max = 50, message = "公积金户名称不能超过50个字符")
@ExcelProperty("公积金户名称") @ExcelProperty("公积金户名称")
@Schema(description = "公积金户名称") @Schema(description = "公积金户名称")
private String socialHouseholdName; private String fundHouseholdName;
/** /**
* 入职确认信息主表id * 入职确认信息主表id
*/ */
...@@ -107,4 +108,18 @@ public class TFundPreDetailVo implements Serializable { ...@@ -107,4 +108,18 @@ public class TFundPreDetailVo implements Serializable {
@Schema(description = "派单时间") @Schema(description = "派单时间")
private String dispatchTime; private String dispatchTime;
/**
* 单位公积金缴纳比例
*/
private BigDecimal unitProvidentPer;
/**
* 个人公积金缴纳比例
*/
private BigDecimal personalProvidentPer;
/**
* 单位公积金缴纳基数
*/
private BigDecimal providentCardinal;
} }
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
1=1 1=1
<include refid="employeeRegistration_where"/> <include refid="employeeRegistration_where"/>
</where> </where>
limit 0,2000 limit 0,5
</select> </select>
<!--employeeRegistration简单分页查询--> <!--employeeRegistration简单分页查询-->
......
...@@ -11,6 +11,8 @@ import lombok.Data; ...@@ -11,6 +11,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
/** /**
* @Author fxj * @Author fxj
* @Description 入职确认信息公积金已购买记录 * @Description 入职确认信息公积金已购买记录
...@@ -112,4 +114,18 @@ public class TFundPreDetail extends BaseEntity { ...@@ -112,4 +114,18 @@ public class TFundPreDetail extends BaseEntity {
@Schema(description = "派单时间") @Schema(description = "派单时间")
private String dispatchTime; private String dispatchTime;
/**
* 单位公积金缴纳比例
*/
private BigDecimal unitProvidentPer;
/**
* 个人公积金缴纳比例
*/
private BigDecimal personalProvidentPer;
/**
* 单位公积金缴纳基数
*/
private BigDecimal providentCardinal;
} }
...@@ -490,7 +490,7 @@ ...@@ -490,7 +490,7 @@
<include refid="tDispatchInfoPre_other_where"/> <include refid="tDispatchInfoPre_other_where"/>
</where> </where>
order by a.create_time desc order by a.create_time desc
limit 0,2000 limit 0,5
</select> </select>
<!--tDispatchInfoPre社保待派单数据查询--> <!--tDispatchInfoPre社保待派单数据查询-->
......
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="dispatchName" column="DISPATCH_NAME"/> <result property="dispatchName" column="DISPATCH_NAME"/>
<result property="dispatchTime" column="DISPATCH_TIME"/> <result property="dispatchTime" column="DISPATCH_TIME"/>
<result property="unitProvidentPer" column="UNIT_PROVIDENT_PER"/>
<result property="personalProvidentPer" column="PERSONAL_PROVIDENT_PER"/>
<result property="providentCardinal" column="UNIT_PROVIDENG_CARDINAL"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -37,7 +40,10 @@ ...@@ -37,7 +40,10 @@
a.UPDATE_TIME, a.UPDATE_TIME,
a.CREATE_TIME, a.CREATE_TIME,
a.DISPATCH_NAME, a.DISPATCH_NAME,
a.DISPATCH_TIME a.DISPATCH_TIME,
a.UNIT_PROVIDENT_PER,
a.PERSONAL_PROVIDENT_PER,
a.UNIT_PROVIDENG_CARDINAL
</sql> </sql>
<sql id="tFundPreDetail_where"> <sql id="tFundPreDetail_where">
<if test="tFUNDPreDetail != null"> <if test="tFUNDPreDetail != 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