fix(bug修复): 员工附属信息级联删除

luoyb

2021-03-15 65dd37fa28891be5aeb60535e3f09639abbaea79

fix(bug修复): 员工附属信息级联删除

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccidentCasesMapper.java

@@ -69,4 +69,16 @@
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpAccidentCases> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_accidentcases SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId}\n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java

@@ -67,4 +67,16 @@
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpBadRecord> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_badrecord SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java

@@ -103,6 +103,7 @@
            " UPDATE t_emp_baseinfo SET \n" +
            " deptId = #{mapParams.deptId},\n" +
            " deptName = #{mapParams.deptName},\n" +
            " allDeptName = #{mapParams.allDeptName},\n" +
            " jobId = #{mapParams.jobId},\n" +
            " jobName = #{mapParams.jobName},\n" +
            " modifyTime = NOW(),\n" +

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java

@@ -83,5 +83,16 @@
            "        </foreach>\n" +
            "</script>")
    int terminateContract(@Param("list") List<String> list,@Param("operatorId") String operatorId);
	

    @Update("<script> " +
            " UPDATE t_emp_contractinfo SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionAttendMapper.java

@@ -58,4 +58,16 @@
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpDimissionAttend> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_dimissionattend SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "           #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.java

@@ -46,4 +46,15 @@

    IPage<Map<String,Object>> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_dimissionLog SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpInsuranceMapper.java

@@ -59,4 +59,16 @@
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpInsurance> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_insurance SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "           #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.java

@@ -48,4 +48,17 @@
    IPage<Map<String,Object>> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    IPage<EmpJobChange> selectPageVoBean(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_jobchange SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.java

@@ -59,4 +59,17 @@
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpLaborTrouble> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_labortrouble SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java

@@ -59,4 +59,17 @@
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpLeaveInfo> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_leaveinfo SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpOccupationalMapper.java

@@ -59,4 +59,17 @@
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpOccupational> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_occupational SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "           #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpOpenArchivesMapper.java

@@ -38,4 +38,16 @@
            "        </foreach>\n" +
            "</script>")
    void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    @Update("<script> " +
            " UPDATE t_emp_openarchives SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE openArchivesId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpPhysicalExamMapper.java

@@ -69,4 +69,17 @@
            "        </foreach>\n" +
            "</script>")
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    @Update("<script> " +
            " UPDATE t_emp_physicalexam SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpRemarkInfoMapper.java

@@ -59,4 +59,17 @@
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpRemarkInfo> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_remarkinfo SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpResignMapper.java

@@ -59,4 +59,16 @@
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpResign> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_resign SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpUnemploymentMapper.java

@@ -58,5 +58,18 @@
            "</script>")
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpUnemployment> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);;
    IPage<EmpUnemployment> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_unemployment SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId}\n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java

@@ -59,4 +59,17 @@
    int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    IPage<EmpWorkExperience> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    @Update("<script> " +
            " UPDATE t_emp_workExperience SET delFlag = 1,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE empId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId}\n" +
            "        </foreach>\n" +
            "</script>")
    void logicDelByUserIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java

@@ -80,4 +80,6 @@
    boolean momentToNormal(String ids);

    void importEmpBadRecord(List<List<Object>> listObject,List<String>  returnList);

    void logicDelByUserIds(String userIds);
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java

@@ -257,4 +257,6 @@
            this.save(empAccidentcases);
        }
    }


}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java

@@ -202,4 +202,11 @@
            this.save(empBadrecord);
        }
    }

    @Override
    public void logicDelByUserIds(String userIds) {
        String[] str = userIds.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empBadrecordMapper.logicDelByUserIds(list, operatorId);
    }
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java

@@ -79,6 +79,9 @@
    private final IRemoteDicItemService remoteDicItemService;
    private final EmpOccupationalMapper empOccupationalMapper;
    private final IRemotePositionService remotePositionService;
    private final EmpDimissionLogMapper empDimissionLogMapper;
    private final EmpOpenArchivesMapper empOpenArchivesMapper;
    private final EmpResignMapper empResignMapper;

    @Override
    public IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
@@ -236,6 +239,25 @@
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empBaseInfoMapper.logicDeleteByIds(list, operatorId);

        //同步删除关联数据
        //不良记录
        empBadRecordMapper.logicDelByUserIds(list,operatorId);
        empAccidentCasesMapper.logicDelByUserIds(list,operatorId);
        empContractInfoMapper.logicDelByUserIds(list,operatorId);
        empDimissionAttendMapper.logicDelByUserIds(list,operatorId);
        empDimissionLogMapper.logicDelByUserIds(list,operatorId);
        empInsuranceMapper.logicDelByUserIds(list,operatorId);
        empJobChangeMapper.logicDelByUserIds(list,operatorId);
        empLaborTroubleMapper.logicDelByUserIds(list,operatorId);
        empLeaveInfoMapper.logicDelByUserIds(list,operatorId);
        empOccupationalMapper.logicDelByUserIds(list,operatorId);
        empOpenArchivesMapper.logicDelByUserIds(list,operatorId);
        empPhysicalExamMapper.logicDelByUserIds(list,operatorId);
        empRemarkInfoMapper.logicDelByUserIds(list,operatorId);
        empResignMapper.logicDelByUserIds(list,operatorId);
        empUnemploymentMapper.logicDelByUserIds(list,operatorId);
        empWorkExperienceMapper.logicDelByUserIds(list,operatorId);
    }

    /**
@@ -378,6 +400,7 @@
            saveChange.setOldDeptName(strDeptName[i]);
            saveChange.setOldJobName(strJobName[i]);
            saveChange.setNewDeptName(empJobChange.getNewDeptName());
            saveChange.setAllDeptName(empJobChange.getAllDeptName());
            saveChange.setNewJobName(empJobChange.getNewJobName());
            saveChange.setChangeType(empJobChange.getChangeType());
            saveChange.setChangeDate(empJobChange.getChangeDate());
@@ -392,6 +415,7 @@
        Map<String, Object> mapParams = new HashMap<>();
        mapParams.put("deptId", empJobChange.getDeptId());
        mapParams.put("deptName", empJobChange.getNewDeptName());
        mapParams.put("allDeptName", empJobChange.getAllDeptName());
        mapParams.put("jobId", empJobChange.getJobId());
        mapParams.put("jobName", empJobChange.getNewJobName());
        mapParams.put("operatorId", operatorId);