diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/EmployeesOrg.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/EmployeesOrg.java index 0bdaa73..068ecd3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/EmployeesOrg.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/EmployeesOrg.java @@ -104,4 +104,6 @@ public class EmployeesOrg implements Serializable { /**机构访问地址*/ @TableField(exist = false) private String departName; + + } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java index c056060..40e84c4 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java @@ -129,6 +129,12 @@ public class NuEmployeesAdvisoryInfo implements Serializable { @Excel(name = "住址(身份证上)", width = 15) @ApiModelProperty(value = "住址(身份证上)") private java.lang.String idCardAddress; + /** + * 现住址 + */ + @Excel(name = "现住址", width = 15) + @ApiModelProperty(value = "现住址") + private String currentAddress; /** * 身份证号 */ diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java index 0ea7af7..81e1ee7 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java @@ -65,26 +65,26 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); - qw.eq("employees_id",dto.getId()); - qw.eq("iz_history","1"); - qw.eq("org_code",dto.getOrgCode()); + qw.eq("employees_id", dto.getId()); + qw.eq("iz_history", "1"); + qw.eq("org_code", dto.getOrgCode()); EmployeesOrg oldData = employeesOrgService.getOne(qw); UpdateWrapper uw = new UpdateWrapper(); - uw.eq("employees_id",dto.getId()); + uw.eq("employees_id", dto.getId()); // uw.eq("iz_history","1"); // uw.eq("org_code",dto.getOrgCode()); EmployeesOrg employeesOrg = new EmployeesOrg(); employeesOrg.setModifyStatus("1"); - employeesOrgService.update(employeesOrg,uw); + employeesOrgService.update(employeesOrg, uw); uw = new UpdateWrapper(); - uw.eq("employees_id",dto.getId()); + uw.eq("employees_id", dto.getId()); // uw.eq("iz_history","1"); - uw.eq("org_code",dto.getOrgCode()); + uw.eq("org_code", dto.getOrgCode()); employeesOrg = new EmployeesOrg(); employeesOrg.setIzHistory("0"); - employeesOrgService.update(employeesOrg,uw); + employeesOrgService.update(employeesOrg, uw); //插入数据 EmployeesOrg emAdd = new EmployeesOrg(); @@ -195,24 +195,25 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl list = employeesOrgService.getEmployeesOrgListByEmpId(entity.getId()); - resultData.set("orgList",list); - }else{ - resultData.set("code","1"); - resultData.set("msg","此号码无效,请确认此员工是否成功入驻机构!"); + resultData.set("orgList", list); + } else { + resultData.set("code", "1"); + resultData.set("msg", "此号码无效,请确认此员工是否成功入驻机构!"); } return resultData; } /** * 验证是否有变化 + * * @param employeesAdvisoryInfoEntity * @return */ @@ -221,6 +222,12 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.eq("id", employeesAdvisoryInfoEntity.getId()); NuEmployeesAdvisoryInfo dbRecord = baseMapper.selectOne(qw); + if(StringUtils.isNotBlank(dbRecord.getHeight())){ + dbRecord.setHeight(dbRecord.getHeight().substring(0,dbRecord.getHeight().indexOf("."))); + } + if(StringUtils.isNotBlank(dbRecord.getWeight())){ + dbRecord.setWeight(dbRecord.getWeight().substring(0,dbRecord.getWeight().indexOf("."))); + } NuEmployeesAdvisoryInfo inputRecord = new NuEmployeesAdvisoryInfo(); BeanUtils.copyProperties(employeesAdvisoryInfoEntity, inputRecord); @@ -255,7 +262,8 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl