Commit d1970f78 authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent a1b4c755
...@@ -7,7 +7,6 @@ import io.swagger.v3.oas.annotations.media.Schema; ...@@ -7,7 +7,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -152,17 +151,14 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -152,17 +151,14 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "试用期(单位月)") @Schema(description = "试用期(单位月)")
private String tryPeriod; private String tryPeriod;
@Schema(description = "试用期工资 元/月")
private BigDecimal periodSalaryPerMonth;
@Schema(description = "工资形式 1.计时工资 2.计件工资 3.其他") @Schema(description = "工资形式 1.计时工资 2.计件工资 3.其他")
private String salaryType; private String salaryType;
@Schema(description = "计时工资 工资标准 元/月 ") @Schema(description = "计时工资 工资标准 元/月 ")
private BigDecimal salaryStandardPerHour; private String salaryStandardPerHour;
@Schema(description = "计件工资 工资标准单价/元 ") @Schema(description = "计件工资 工资标准单价/元 ")
private BigDecimal salaryStandardPerPiece; private String salaryStandardPerPiece;
@Schema(description = "配置id") @Schema(description = "配置id")
private String configId; private String configId;
......
...@@ -8,7 +8,6 @@ import lombok.Data; ...@@ -8,7 +8,6 @@ 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;
import java.util.Date; import java.util.Date;
/** /**
...@@ -298,13 +297,6 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -298,13 +297,6 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@Schema(description = "试用期月份数字 1、2、3、4...") @Schema(description = "试用期月份数字 1、2、3、4...")
@ExcelProperty("试用期月份数字") @ExcelProperty("试用期月份数字")
private String tryPeriodNum; private String tryPeriodNum;
/**
* 试用期工资 元/月
*/
@ExcelAttribute(name = "试用期工资 元/月")
@Schema(description = "试用期工资 元/月")
@ExcelProperty("试用期工资 元/月")
private BigDecimal periodSalaryPerMonth;
/** /**
* 工资形式 1.计时工资 2.计件工资 3.其他 * 工资形式 1.计时工资 2.计件工资 3.其他
*/ */
...@@ -319,7 +311,7 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -319,7 +311,7 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "计时工资 工资标准 元/月 ") @ExcelAttribute(name = "计时工资 工资标准 元/月 ")
@Schema(description = "计时工资 工资标准 元/月 ") @Schema(description = "计时工资 工资标准 元/月 ")
@ExcelProperty("计时工资 工资标准 元/月 ") @ExcelProperty("计时工资 工资标准 元/月 ")
private BigDecimal salaryStandardPerHour; private String salaryStandardPerHour;
/** /**
* 入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义 * 入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义
*/ */
...@@ -342,7 +334,7 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -342,7 +334,7 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "计件工资 工资标准单价/元 ") @ExcelAttribute(name = "计件工资 工资标准单价/元 ")
@Schema(description = "计件工资 工资标准单价/元 ") @Schema(description = "计件工资 工资标准单价/元 ")
@ExcelProperty("计件工资 工资标准单价/元 ") @ExcelProperty("计件工资 工资标准单价/元 ")
private BigDecimal salaryStandardPerPiece; private String salaryStandardPerPiece;
/** /**
* 配置id * 配置id
*/ */
...@@ -432,16 +424,16 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -432,16 +424,16 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
/** /**
* 派遣期限 * 派遣期限
*/ */
@Length(max = 1, message = "派遣期限-年 不能超过1 个字符") @Length(max = 3, message = "派遣期限-年 不能超过3 个字符")
@ExcelAttribute(name = "派遣期限-年", maxLength = 1) @ExcelAttribute(name = "派遣期限-年", maxLength = 3)
@Schema(description = "派遣期限-年") @Schema(description = "派遣期限-年")
@ExcelProperty("派遣期限-年") @ExcelProperty("派遣期限-年")
private String dispatchPeriodYear; private String dispatchPeriodYear;
/** /**
* 派遣期限 * 派遣期限
*/ */
@Length(max = 1, message = "派遣期限-月 不能超过1 个字符") @Length(max = 3, message = "派遣期限-月 不能超过3 个字符")
@ExcelAttribute(name = "派遣期限-月", maxLength = 1) @ExcelAttribute(name = "派遣期限-月", maxLength = 3)
@Schema(description = "派遣期限-月") @Schema(description = "派遣期限-月")
@ExcelProperty("派遣期限-月") @ExcelProperty("派遣期限-月")
private String dispatchPeriodMonth; private String dispatchPeriodMonth;
......
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
<result property="updateFlag" column="update_flag"/> <result property="updateFlag" column="update_flag"/>
<result property="tryPeriodType" column="TRY_PERIOD_TYPE"/> <result property="tryPeriodType" column="TRY_PERIOD_TYPE"/>
<result property="tryPeriod" column="TRY_PERIOD"/> <result property="tryPeriod" column="TRY_PERIOD"/>
<result property="periodSalaryPerMonth" column="PERIOD_SALARY_PER_MONTH"/>
<result property="salaryType" column="SALARY_TYPE"/> <result property="salaryType" column="SALARY_TYPE"/>
<result property="salaryStandardPerHour" column="SALARY_STANDARD_PER_HOUR"/> <result property="salaryStandardPerHour" column="SALARY_STANDARD_PER_HOUR"/>
<result property="salaryStandardPerPiece" column="SALARY_STANDARD_PER_PIECE"/> <result property="salaryStandardPerPiece" column="SALARY_STANDARD_PER_PIECE"/>
...@@ -115,7 +114,6 @@ ...@@ -115,7 +114,6 @@
,update_flag ,update_flag
,try_period_type ,try_period_type
,try_period ,try_period
,period_salary_per_month
,salary_type ,salary_type
,salary_standard_per_hour ,salary_standard_per_hour
,salary_standard_per_piece ,salary_standard_per_piece
......
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