员工入职审批拒绝后，再次申请错变成变更信息的BUG处理

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java

@@ -63,40 +63,48 @@ 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("iz_history", "N");
         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("iz_history","1");
-//        uw.eq("org_code",dto.getOrgCode());
-        EmployeesOrg employeesOrg = new EmployeesOrg();
-        employeesOrg.setModifyStatus("1");
-        employeesOrgService.update(employeesOrg, uw);
-
-        uw = new UpdateWrapper<EmployeesOrg>();
-        uw.eq("employees_id", dto.getId());
-//        uw.eq("iz_history","1");
         uw.eq("org_code", dto.getOrgCode());
-        employeesOrg = new EmployeesOrg();
+        EmployeesOrg employeesOrg = new EmployeesOrg();
         employeesOrg.setIzHistory("Y");
         employeesOrgService.update(employeesOrg, uw);
 
-        //插入数据
+        //获取审批通过记录
+        QueryWrapper<EmployeesOrg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("employees_id", dto.getId());
+        queryWrapper.eq("org_code", dto.getOrgCode());
+        queryWrapper.eq("status", "2");
+        queryWrapper.isNull("modify_status");
+        List<EmployeesOrg> empOrgList = employeesOrgService.list(queryWrapper);
+
         EmployeesOrg emAdd = new EmployeesOrg();
         BeanUtils.copyProperties(dto, emAdd);
         emAdd.setId(null);
         emAdd.setEmployeesId(dto.getId());
         emAdd.setIzHistory("N");
-        emAdd.setModifyStatus("1");
         emAdd.setStatus("1");
-        emAdd.setApplyType("2");
         emAdd.setIzOnline(oldData.getIzOnline());
         emAdd.setIzFreeze(oldData.getIzFreeze());
+        if(empOrgList.size()>0){
+            //有审批通过记录，后续全是变更操作
+            emAdd.setModifyStatus("1");
+            emAdd.setApplyType("2");
+        }else{
+            //没有审批通过记录，则后续全是申请操作
+            emAdd.setApplyType(oldData.getApplyType());
+        }
+        //插入数据
         employeesOrgService.save(emAdd);
+
         //更新员工信息需要有审核流程 审核通过后才修改正式数据
         //通知业务平台有员工信息变更
         EmployeesApplyMQDto mqdto = new EmployeesApplyMQDto();
@@ -119,6 +127,8 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
         mqdto.setEmployeeId(dto.getId());
         mqdto.setStartTime(dto.getStartTime());
         mqdto.setEndTime(dto.getEndTime());
+        mqdto.setApplyType(emAdd.getApplyType());
+        mqdto.setModifyStatus(emAdd.getModifyStatus());
         rabbitMQUtil.sendToExchange("hldy.employee", dto.getOrgCode() + ".employee.infoUpdate.audit", mqdto);
         return 1;
     }

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

@@ -95,8 +95,10 @@ public class EmployeesApplyMQDto implements Serializable {
     private String orgCode;
     /**操作时间*/
     private Date opeTime;
+    /**申请类型 0被邀请 1主动申请 2变更*/
+    private String applyType;
     /**修改状态 1修改申请中 2通过 3驳回 */
-    private java.lang.String modifyStatus;
+    private String modifyStatus;
     /**身份证有效开始日期 */
     private Date startTime;
     /**身份证有效结束日期 */