1、员工流程增加身份证有效期存储
This commit is contained in:
parent
8d5c10ad84
commit
d6793b7bb7
|
|
@ -99,4 +99,9 @@ public class EmployeesApplyMQDto implements Serializable {
|
||||||
private Date opeTime;
|
private Date opeTime;
|
||||||
/**修改状态 1修改申请中 2通过 3驳回 */
|
/**修改状态 1修改申请中 2通过 3驳回 */
|
||||||
private java.lang.String modifyStatus;
|
private java.lang.String modifyStatus;
|
||||||
|
|
||||||
|
/**身份证有效开始日期 */
|
||||||
|
private Date startTime;
|
||||||
|
/**身份证有效结束日期 */
|
||||||
|
private Date endTime;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 员工信息
|
* @Description: 员工信息
|
||||||
|
|
@ -221,4 +222,13 @@ public class BizEmployeesInfo implements Serializable {
|
||||||
@Excel(name = "修改状态", width = 15)
|
@Excel(name = "修改状态", width = 15)
|
||||||
@ApiModelProperty(value = "修改状态")
|
@ApiModelProperty(value = "修改状态")
|
||||||
private java.lang.String modifyStatus;
|
private java.lang.String modifyStatus;
|
||||||
|
|
||||||
|
/**有效开始日期*/
|
||||||
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
|
||||||
|
@DateTimeFormat(pattern="yyyy.MM.dd")
|
||||||
|
private Date startTime;
|
||||||
|
/**有效结束日期*/
|
||||||
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
|
||||||
|
@DateTimeFormat(pattern="yyyy.MM.dd")
|
||||||
|
private Date endTime;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@ public class EmployeesApplyController extends JeecgController<EmployeesApply, IE
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("审核成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
// /**
|
// /**
|
||||||
|
|
@ -301,6 +301,6 @@ public class EmployeesApplyController extends JeecgController<EmployeesApply, IE
|
||||||
@RequestMapping(value = "/audit", method = {RequestMethod.POST})
|
@RequestMapping(value = "/audit", method = {RequestMethod.POST})
|
||||||
public Result<String> audit(@RequestBody EmployeesApply employeesApply) {
|
public Result<String> audit(@RequestBody EmployeesApply employeesApply) {
|
||||||
employeesApplyService.audit(employeesApply);
|
employeesApplyService.audit(employeesApply);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("审核成功!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -217,4 +217,13 @@ public class EmployeesApply implements Serializable {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String paramsTime;
|
private String paramsTime;
|
||||||
|
|
||||||
|
/**有效开始日期*/
|
||||||
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
|
||||||
|
@DateTimeFormat(pattern="yyyy.MM.dd")
|
||||||
|
private Date startTime;
|
||||||
|
/**有效结束日期*/
|
||||||
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
|
||||||
|
@DateTimeFormat(pattern="yyyy.MM.dd")
|
||||||
|
private Date endTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue