fix(bug修复): 查询bug

luoyb

2021-06-03 ae8267320996082be9bae84aa5248ca76d735777

fix(bug修复): 查询bug

1、工作经历、体检信息导入系统，性别没有转换。
2、员工智搜->离职当月考勤->考勤年月查询失败。
3、员工智搜->体检信息，不要默认查询在职的体检信息，而是查所有人员体检信息，勾选在职时才查在职。

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java

@@ -107,7 +107,7 @@
    

    @FieldInfo(name = "attendYear", type = "varchar", explain = "离职考勤年份")
    @TableField(exist = false)
    @TableField("attendYear")
//    @ExcelField(value = "考勤年份")
    private String attendYear = "";
    

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

@@ -99,6 +99,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void createEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
        empDimissionattend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empDimissionattend.setAttendYear(StringUtils.left(empDimissionattend.getAttendMonth(),4));
        empDimissionattend.setCreator(operatorId);
        empDimissionattend.setModifier(operatorId);
        this.save(empDimissionattend);
@@ -108,6 +109,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
        EmpDimissionAttend dbData = this.getById(empDimissionattend.getDimissionAttendId());
        empDimissionattend.setAttendYear(StringUtils.left(empDimissionattend.getAttendMonth(),4));
        empDimissionattend.setCreateTime(dbData.getCreateTime());
        empDimissionattend.setCreator(dbData.getCreator());
        empDimissionattend.setDelFlag(dbData.getDelFlag());

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

@@ -84,8 +84,6 @@
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empPhysicalexam.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

@@ -123,6 +121,11 @@
    @Transactional(rollbackFor = Exception.class)
    public void createEmpPhysicalExam(EmpPhysicalExam empPhysicalexam) {
        empPhysicalexam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        if("1".equals(empPhysicalexam.getSex())){
            empPhysicalexam.setSex("男");
        } else  if("2".equals(empPhysicalexam.getSex())){
            empPhysicalexam.setSex("女");
        }
        empPhysicalexam.setCreator(operatorId);
        empPhysicalexam.setModifier(operatorId);
        this.save(empPhysicalexam);

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

@@ -99,6 +99,11 @@
                .orElse("1");
        if(!checkRepetitiveData(empWorkexperience)) {
            empWorkexperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            if("1".equals(empWorkexperience.getSex())){
                empWorkexperience.setSex("男");
            } else  if("2".equals(empWorkexperience.getSex())){
                empWorkexperience.setSex("女");
            }
            empWorkexperience.setCreator(operatorId);
            empWorkexperience.setModifier(operatorId);
            this.save(empWorkexperience);