diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java index a32e744a..4d0b43b9 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java @@ -77,7 +77,7 @@ public class EmployeesApply implements Serializable { /**身高*/ @Excel(name = "身高", width = 15) @ApiModelProperty(value = "身高") - private java.lang.Double height; + private java.lang.String height; /**体重*/ @Excel(name = "体重", width = 15) @ApiModelProperty(value = "体重") diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java index 03ec014b..79323445 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java @@ -361,6 +361,7 @@ public class EmployeesMQListener { employeesApply.setDelFlag("0"); employeesApply.setIzHistory("1"); employeesApply.setApplyType("2"); + employeesApply.setModifyStatus("1"); //资源文件拉完图片统一存储,不然页面有路径没资源可显示 String idCardPositive = employeesApply.getIdCardPositive(); @@ -973,8 +974,10 @@ public class EmployeesMQListener { qw.eq("iz_history", "1"); qw.eq("employee_id", dto.getEmployeeId()); EmployeesApply empApply = employeesApplyService.getOne(qw); + String appId = empApply.getId(); if (!downMedia && empApply != null && "1".equals(empApply.getApplyType())) { BeanUtils.copyProperties(dto, empApply); + empApply.setId(appId); empApply.setModifyStatus(null); empApply.setApplyType(null); empApply.setIzHistory(null);