修改bug

yz

2021-03-01 4c136bc8d4c7d16a7918a06bb4bda5f34a54ba5d

修改bug

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/MyUtil.java

@@ -119,7 +119,7 @@
        String suffix = "";
        if (fileName.indexOf(".") > 0) {
            //后缀
            suffix = fileName.substring(fileName.indexOf("."), fileName.length());
            suffix = fileName.substring(fileName.indexOf("."));
        }
        //生成新的名字
        String newName = nextIdStr + suffix;

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/constant/MyConstant.java

New file
@@ -0,0 +1,10 @@
package cc.mrbird.febs.server.hr.constant;


public class MyConstant {
    /**
     * 返回值提示
     */
    public final static String MESSAGE="NATION";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java

@@ -1,6 +1,7 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.service.IEmpAccidentCasesService;
@@ -8,6 +9,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cn.hutool.core.util.StrUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -72,6 +74,9 @@
            this.empAccidentCasesService.createEmpAccidentcases(empAccidentcases);
        } catch (Exception e) {
            String message = "新增员工意外险案件失败";
            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }
@@ -108,6 +113,9 @@
            this.empAccidentCasesService.updateEmpAccidentcases(empAccidentcases);
        } catch (Exception e) {
            String message = "修改员工意外险案件失败";
            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java

@@ -1,6 +1,7 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
@@ -9,6 +10,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cn.hutool.core.util.StrUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -72,6 +74,9 @@
            this.empBadrecordService.createEmpBadrecord(empBadrecord);
        } catch (Exception e) {
            String message = "新增员工不良记录信息失败";
            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }
@@ -108,6 +113,9 @@
            this.empBadrecordService.updateEmpBadrecord(empBadrecord);
        } catch (Exception e) {
            String message = "修改员工不良记录信息失败";
            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java

@@ -1,6 +1,7 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
@@ -8,6 +9,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cn.hutool.core.util.StrUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -71,6 +73,9 @@
            this.empLabortroubleService.createEmpLabortrouble(empLabortrouble);
        } catch (Exception e) {
            String message = "新增员工劳资案件失败";
            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }
@@ -107,6 +112,9 @@
            this.empLabortroubleService.updateEmpLabortrouble(empLabortrouble);
        } catch (Exception e) {
            String message = "修改员工劳资案件失败";
            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java

@@ -1,6 +1,7 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
@@ -8,6 +9,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cn.hutool.core.util.StrUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -71,6 +73,9 @@
            this.empResignService.createEmpResign(empResign);
        } catch (Exception e) {
            String message = "新增员工辞职申请失败";
            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }
@@ -107,6 +112,9 @@
            this.empResignService.updateEmpResign(empResign);
        } catch (Exception e) {
            String message = "修改员工辞职申请失败";
            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java

@@ -1,6 +1,7 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.service.IEmpUnemploymentService;
@@ -8,6 +9,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cn.hutool.core.util.StrUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -69,6 +71,9 @@
            this.empUnemploymentService.createEmpUnemployment(empUnemployment);
        } catch (Exception e) {
            String message = "新增失业金领取表失败";
            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }
@@ -105,6 +110,9 @@
            this.empUnemploymentService.updateEmpUnemployment(empUnemployment);
        } catch (Exception e) {
            String message = "修改失业金领取表失败";
            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                message = e.getMessage();
            }
            log.error(message, e);
            throw new FebsException(message);
        }

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

@@ -9,6 +9,8 @@

import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -101,9 +103,9 @@
        LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
        lambdaQueryWrapper.eq(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDate());
        lambdaQueryWrapper.eq(EmpAccidentCases::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        if (empAccidentcases.getReprotTime() == null) {
@@ -126,10 +128,10 @@
        LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
        lambdaQueryWrapper.eq(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDate());
        lambdaQueryWrapper.eq(EmpAccidentCases::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpAccidentCases::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpAccidentCases::getAccidentId,empAccidentcases.getAccidentId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpAccidentCases dbData = this.getById(empAccidentcases.getAccidentId());
        empAccidentcases.setCreateTime(dbData.getCreateTime());

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

@@ -2,6 +2,7 @@

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
@@ -87,9 +88,9 @@
        LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
        lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
        lambdaQueryWrapper.eq(EmpBadRecord::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpBadRecord::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empBadrecord.setCreator(operatorId);
@@ -103,10 +104,10 @@
        LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
        lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
        lambdaQueryWrapper.eq(EmpBadRecord::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpBadRecord::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpBadRecord::getBadId,empBadrecord.getBadId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpBadRecord dbData = this.getById(empBadrecord.getBadId());
        empBadrecord.setCreateTime(dbData.getCreateTime());

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

@@ -4,6 +4,7 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper;
@@ -104,9 +105,9 @@
        LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
        lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
        lambdaQueryWrapper.eq(EmpLaborTrouble::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empLabortrouble.setCreator(operatorId);
@@ -120,10 +121,10 @@
        LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
        lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
        lambdaQueryWrapper.eq(EmpLaborTrouble::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpLaborTrouble::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpLaborTrouble::getArbitrationId,empLabortrouble.getArbitrationId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpLaborTrouble dbData = this.getById(empLabortrouble.getArbitrationId());
        empLabortrouble.setCreateTime(dbData.getCreateTime());

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

@@ -2,6 +2,8 @@

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
@@ -86,9 +88,9 @@
        LambdaQueryWrapper<EmpResign> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpResign::getEmpId, empResign.getEmpId());
        lambdaQueryWrapper.eq(EmpResign::getApplayDate, empResign.getApplayDate());
        lambdaQueryWrapper.eq(EmpResign::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpResign::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        empResign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empResign.setCreator(operatorId);
@@ -102,10 +104,10 @@
        LambdaQueryWrapper<EmpResign> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpResign::getEmpId, empResign.getEmpId());
        lambdaQueryWrapper.eq(EmpResign::getApplayDate, empResign.getApplayDate());
        lambdaQueryWrapper.eq(EmpResign::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpResign::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpResign::getApplayDate,empResign.getApplayDate());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpResign dbData = this.getById(empResign.getResignId());
        empResign.setCreateTime(dbData.getCreateTime());

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

@@ -90,9 +90,9 @@
        LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
        lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
        lambdaQueryWrapper.eq(EmpUnemployment::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empUnemployment.setCreator(operatorId);
@@ -106,10 +106,10 @@
        LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
        lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
        lambdaQueryWrapper.eq(EmpUnemployment::getDelFlag,0);
        lambdaQueryWrapper.ne(EmpUnemployment::getApplayDate,empUnemployment.getApplayDate());
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpUnemployment::getUnemploymentId,empUnemployment.getUnemploymentId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException("当日记录已存在");
            throw new FebsException(MyConstant.MESSAGE);
        }
        EmpUnemployment dbData = this.getById(empUnemployment.getUnemploymentId());
        empUnemployment.setCreateTime(dbData.getCreateTime());