1、员工信息相关接口增加现住址字段的处理

2、解决员工变更信息时：无变化未提示无变更无需提交问题

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;
+
+
 }

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;
     /**
      * 身份证号
      */

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<NuEmployeesA
     @Override
     public int updateById(EmployeesAdvisoryInfoEntity dto) {
         QueryWrapper<EmployeesOrg> qw = new QueryWrapper<>();
-        qw.eq("employees_id",dto.getId());
+        qw.eq("employees_id", dto.getId());
-        qw.eq("iz_history","1");
+        qw.eq("iz_history", "1");
-        qw.eq("org_code",dto.getOrgCode());
+        qw.eq("org_code", dto.getOrgCode());
         EmployeesOrg oldData = employeesOrgService.getOne(qw);
 
         UpdateWrapper<EmployeesOrg> uw = new UpdateWrapper<EmployeesOrg>();
-        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<EmployeesOrg>();
-        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<NuEmployeesA
     }
 
     @Override
-    public JSONObject getEmployeeInfo(String tel){
+    public JSONObject getEmployeeInfo(String tel) {
         JSONObject resultData = new JSONObject();
-        resultData.set("code","0");
+        resultData.set("code", "0");
-        resultData.set("msg","成功！");
+        resultData.set("msg", "成功！");
         NuEmployeesAdvisoryInfo entity = baseMapper.getEmployeeInfoByTel(tel);
-        if(entity!=null){
+        if (entity != null) {
-            resultData.set("data",entity);
+            resultData.set("data", entity);
             List<EmployeesOrg> list = employeesOrgService.getEmployeesOrgListByEmpId(entity.getId());
-            resultData.set("orgList",list);
+            resultData.set("orgList", list);
-        }else{
+        } else {
-            resultData.set("code","1");
+            resultData.set("code", "1");
-            resultData.set("msg","此号码无效，请确认此员工是否成功入驻机构！");
+            resultData.set("msg", "此号码无效，请确认此员工是否成功入驻机构！");
         }
         return resultData;
     }
 
     /**
      * 验证是否有变化
+     *
      * @param employeesAdvisoryInfoEntity
      * @return
      */
@@ -221,6 +222,12 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
         QueryWrapper<NuEmployeesAdvisoryInfo> 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<NuEmployeesA
                         Objects.equals(dbRecord.getHealthZmPath(), inputRecord.getHealthZmPath()) &&
                         Objects.equals(dbRecord.getHealthFmPath(), inputRecord.getHealthFmPath()) &&
                         Objects.equals(dbRecord.getQualificationPath(), inputRecord.getQualificationPath()) &&
-                        Objects.equals(dbRecord.getNoCrimeCertificate(), inputRecord.getNoCrimeCertificate())
+                        Objects.equals(dbRecord.getNoCrimeCertificate(), inputRecord.getNoCrimeCertificate()) &&
+                        Objects.equals(dbRecord.getCurrentAddress(), inputRecord.getCurrentAddress())
         );
     }
 

nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java

@@ -101,4 +101,8 @@ public class EmployeesApplyMQDto implements Serializable {
     private Date startTime;
     /**身份证有效结束日期 */
     private Date endTime;
+    /**
+     * 现住址
+     */
+    private String currentAddress;
 }

nursing-unit-common/src/main/java/com/nu/entity/EmployeesAdvisoryInfoEntity.java

@@ -125,4 +125,8 @@ public class EmployeesAdvisoryInfoEntity implements Serializable {
 
     //信息修改状态 空：没提交过修改 1修改申请中 2通过 3驳回*/
     private String modifyState;
+    /**
+     * 现住址
+     */
+    private String currentAddress;
 }

nursing-unit-common/src/main/java/com/nu/entity/EmployeesApplyEntity.java

@@ -110,4 +110,9 @@ public class EmployeesApplyEntity implements Serializable {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd")
     @DateTimeFormat(pattern="yyyy.MM.dd")
     private Date endTime;
+
+    /**
+     * 现住址
+     */
+    private String currentAddress;
 }