员工修改流程bug修复
This commit is contained in:
parent
9c8753a6d4
commit
e49f94e82c
|
|
@ -77,7 +77,7 @@ public class EmployeesApply implements Serializable {
|
||||||
/**身高*/
|
/**身高*/
|
||||||
@Excel(name = "身高", width = 15)
|
@Excel(name = "身高", width = 15)
|
||||||
@ApiModelProperty(value = "身高")
|
@ApiModelProperty(value = "身高")
|
||||||
private java.lang.Double height;
|
private java.lang.String height;
|
||||||
/**体重*/
|
/**体重*/
|
||||||
@Excel(name = "体重", width = 15)
|
@Excel(name = "体重", width = 15)
|
||||||
@ApiModelProperty(value = "体重")
|
@ApiModelProperty(value = "体重")
|
||||||
|
|
|
||||||
|
|
@ -361,6 +361,7 @@ public class EmployeesMQListener {
|
||||||
employeesApply.setDelFlag("0");
|
employeesApply.setDelFlag("0");
|
||||||
employeesApply.setIzHistory("1");
|
employeesApply.setIzHistory("1");
|
||||||
employeesApply.setApplyType("2");
|
employeesApply.setApplyType("2");
|
||||||
|
employeesApply.setModifyStatus("1");
|
||||||
|
|
||||||
//资源文件拉完图片统一存储,不然页面有路径没资源可显示
|
//资源文件拉完图片统一存储,不然页面有路径没资源可显示
|
||||||
String idCardPositive = employeesApply.getIdCardPositive();
|
String idCardPositive = employeesApply.getIdCardPositive();
|
||||||
|
|
@ -973,8 +974,10 @@ public class EmployeesMQListener {
|
||||||
qw.eq("iz_history", "1");
|
qw.eq("iz_history", "1");
|
||||||
qw.eq("employee_id", dto.getEmployeeId());
|
qw.eq("employee_id", dto.getEmployeeId());
|
||||||
EmployeesApply empApply = employeesApplyService.getOne(qw);
|
EmployeesApply empApply = employeesApplyService.getOne(qw);
|
||||||
|
String appId = empApply.getId();
|
||||||
if (!downMedia && empApply != null && "1".equals(empApply.getApplyType())) {
|
if (!downMedia && empApply != null && "1".equals(empApply.getApplyType())) {
|
||||||
BeanUtils.copyProperties(dto, empApply);
|
BeanUtils.copyProperties(dto, empApply);
|
||||||
|
empApply.setId(appId);
|
||||||
empApply.setModifyStatus(null);
|
empApply.setModifyStatus(null);
|
||||||
empApply.setApplyType(null);
|
empApply.setApplyType(null);
|
||||||
empApply.setIzHistory(null);
|
empApply.setIzHistory(null);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue