fix(bug修复): 岗位管理

luoyb

2021-03-10 3f50415850d93bf58306583086bf5400e18aeee0

fix(bug修复): 岗位管理

信息录入与在职员工录入的岗位从系统中获取

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

@@ -1,60 +1,39 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.feign.IRemoteDicItemService;
import cc.mrbird.febs.server.hr.service.*;
import cc.mrbird.febs.server.hr.util.PoiExportExcel;
import cc.mrbird.febs.server.hr.util.PoiImportExcel;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.feign.IRemoteDicItemService;
import cn.hutool.core.annotation.AnnotationUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.wuwenze.poi.ExcelKit;

import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import cc.mrbird.febs.common.core.entity.FebsResponse;
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 cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
import cc.mrbird.febs.server.hr.service.IEmpAccidentCasesService;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
import cc.mrbird.febs.server.hr.service.IEmpInsuranceService;
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
import cc.mrbird.febs.server.hr.service.IEmpUnemploymentService;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
import cc.mrbird.febs.server.hr.util.PoiExportExcel;
import cc.mrbird.febs.server.hr.util.PoiImportExcel;
import cn.hutool.core.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

/**
 * name:EmpBaseInfo

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/PositionController.java

@@ -15,10 +15,10 @@
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.List;
import java.util.Map;

/**
*
* name:Position
* package:cc.mrbird.febs.server.system.controller
* description:岗位信息控制器
@@ -40,8 +40,7 @@
@ApiOperation(value = "岗位信息翻页列表")
@GetMapping
public FebsResponse getAllPositions(QueryRequest request,Position position) {
    Map
            <String, Object> dataTable = FebsUtil.getDataTable(this.positionService.findPositions(request, position));
        Map<String, Object> dataTable = FebsUtil.getDataTable(this.positionService.findPositions(request, position));
    return new FebsResponse().data(dataTable);
}

@@ -95,4 +94,9 @@
throw new FebsException(message);
}
}

    @GetMapping("dicJob")
    public FebsResponse selectDicJobs() {
        return new FebsResponse().data(positionService.selectDicJobs());
    }
}

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/PositionMapper.java

@@ -3,12 +3,13 @@
import cc.mrbird.febs.common.core.entity.system.Position;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;

import java.util.List;
import java.util.Map;

/**
*
* name:Position
* package:cc.mrbird.febs.server.system.controller
* description:岗位信息实体Mapper
@@ -19,14 +20,14 @@
*/
public interface PositionMapper extends BaseMapper<Position> {
/**
*
* 根据Id批量逻辑删除记录
*
     * <p>
* date Alan
* @author: 2021-02-16 11:52:53
     *
* @param list 待删除Id
* @param operatorId 操作员Id
* @return void
     * @author: 2021-02-16 11:52:53
*/
@Update("<script> " +
    " UPDATE t_position SET delFlag = 1,\n" +
@@ -39,4 +40,12 @@
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);

    @Select("<script>" +
            "select positionName as value, positionId as code\n" +
            " from t_position\n" +
            " where delFlag = 0\n" +
            " order by positionCode asc;" +
            "</script>")
    List<Map<String, Object>> selectDicJobs();
}

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IPositionService.java

@@ -7,9 +7,9 @@
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import java.util.Map;

/**
*
* name:Position
* package:cc.mrbird.febs.server.system.controller
* description:岗位信息服务接口
@@ -58,13 +58,15 @@
void deletePosition(Position position);

/**
*
* 根据Id批量逻辑删除记录
*
     * <p>
* date 2021-01-28 10:48
* @author: luoyibo
     *
* @param ids 待删除Id
* @return void
     * @author: luoyibo
*/
void logicDelPosition(String ids);

    List<Map<String, Object>> selectDicJobs();
}

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java

@@ -112,4 +112,9 @@
            this.remove(wrapper);
        }
    }

    @Override
    public List<Map<String, Object>> selectDicJobs() {
        return positionMapper.selectDicJobs();
    }
}