From 3f50415850d93bf58306583086bf5400e18aeee0 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 10 三月 2021 07:59:05 +0800
Subject: [PATCH] fix(bug修复): 岗位管理
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 77 ++++-------
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/PositionMapper.java | 69 +++++----
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IPositionService.java | 106 +++++++-------
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/PositionController.java | 126 +++++++++--------
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java | 5
5 files changed, 191 insertions(+), 192 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index 1f33669..f41de30 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/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
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/PositionController.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/PositionController.java
index 3fe389c..1e6df78 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/PositionController.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/PositionController.java
@@ -15,18 +15,18 @@
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:岗位信息控制器
-*
-* @author Alan
-* @date 2021-02-16 11:52:53
-* @since JDK1.8
-*/
+ * name:Position
+ * package:cc.mrbird.febs.server.system.controller
+ * description:岗位信息控制器
+ *
+ * @author Alan
+ * @date 2021-02-16 11:52:53
+ * @since JDK1.8
+ */
@Api(tags = "岗位信息管理接口")
@Slf4j
@Validated
@@ -35,64 +35,68 @@
@RequiredArgsConstructor
public class PositionController {
-private final IPositionService positionService;
+ private final IPositionService positionService;
-@ApiOperation(value = "岗位信息翻页列表")
-@GetMapping
-public FebsResponse getAllPositions(QueryRequest request,Position position) {
- Map
- <String, Object> dataTable = FebsUtil.getDataTable(this.positionService.findPositions(request, position));
- return new FebsResponse().data(dataTable);
-}
+ @ApiOperation(value = "岗位信息翻页列表")
+ @GetMapping
+ public FebsResponse getAllPositions(QueryRequest request, Position position) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.positionService.findPositions(request, position));
+ return new FebsResponse().data(dataTable);
+ }
-@ApiOperation(value = "岗位信息增加")
-@PostMapping
-public void addPosition(@Valid Position position) throws FebsException {
-try {
-this.positionService.createPosition(position);
-} catch (Exception e) {
-String message = "新增岗位信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "岗位信息增加")
+ @PostMapping
+ public void addPosition(@Valid Position position) throws FebsException {
+ try {
+ this.positionService.createPosition(position);
+ } catch (Exception e) {
+ String message = "新增岗位信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@ApiOperation(value = "岗位信息物理删除")
-@DeleteMapping
+ @ApiOperation(value = "岗位信息物理删除")
+ @DeleteMapping
-public void deletePosition(Position position) throws FebsException {
-try {
-this.positionService.deletePosition(position);
-} catch (Exception e) {
-String message = "删除岗位信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ public void deletePosition(Position position) throws FebsException {
+ try {
+ this.positionService.deletePosition(position);
+ } catch (Exception e) {
+ String message = "删除岗位信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@ApiOperation(value = "岗位信息逻辑删除")
-@DeleteMapping("{ids}")
+ @ApiOperation(value = "岗位信息逻辑删除")
+ @DeleteMapping("{ids}")
-public void logicDeletePosition(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.positionService.logicDelPosition(ids);
-} catch (Exception e) {
-String message = "逻辑删除岗位信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ public void logicDeletePosition(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.positionService.logicDelPosition(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除岗位信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@ApiOperation(value = "岗位信息修改")
-@PutMapping
-public void updatePosition(Position position) throws FebsException {
-try {
-this.positionService.updatePosition(position);
-} catch (Exception e) {
-String message = "修改岗位信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "岗位信息修改")
+ @PutMapping
+ public void updatePosition(Position position) throws FebsException {
+ try {
+ this.positionService.updatePosition(position);
+ } catch (Exception e) {
+ String message = "修改岗位信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @GetMapping("dicJob")
+ public FebsResponse selectDicJobs() {
+ return new FebsResponse().data(positionService.selectDicJobs());
+ }
}
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/PositionMapper.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/PositionMapper.java
index d43fad5..33fcbd5 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/PositionMapper.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/PositionMapper.java
@@ -3,40 +3,49 @@
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
-*
-* @author Alan
-* @date 2021-02-16 11:52:53
-* @since JDK1.8
-*/
+ * name:Position
+ * package:cc.mrbird.febs.server.system.controller
+ * description:岗位信息实体Mapper
+ *
+ * @author Alan
+ * @date 2021-02-16 11:52:53
+ * @since JDK1.8
+ */
public interface PositionMapper extends BaseMapper<Position> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date Alan
-* @author: 2021-02-16 11:52:53
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_position SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = , \n" +
- " version = version+1 \n" +
- " WHERE badId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " \n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date Alan
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-02-16 11:52:53
+ */
+ @Update("<script> " +
+ " UPDATE t_position SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = , \n" +
+ " version = version+1 \n" +
+ " WHERE badId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " \n" +
+ " </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();
}
\ No newline at end of file
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IPositionService.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IPositionService.java
index 0e812c2..2c6f679 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IPositionService.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IPositionService.java
@@ -7,64 +7,66 @@
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:岗位信息服务接口
-*
-* @author Alan
-* @date 2021-02-16 11:52:53
-* @since JDK1.8
-*/
+ * name:Position
+ * package:cc.mrbird.febs.server.system.controller
+ * description:岗位信息服务接口
+ *
+ * @author Alan
+ * @date 2021-02-16 11:52:53
+ * @since JDK1.8
+ */
public interface IPositionService extends IService<Position> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param position position
-* @return IPage<Position>
-*/
-IPage<Position> findPositions(QueryRequest request, Position position);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param position position
+ * @return IPage<Position>
+ */
+ IPage<Position> findPositions(QueryRequest request, Position position);
-/**
-* 查询（所有）
-*
-* @param position position
-* @return List<Position>
-*/
-List<Position> findPositions(Position position);
+ /**
+ * 查询（所有）
+ *
+ * @param position position
+ * @return List<Position>
+ */
+ List<Position> findPositions(Position position);
-/**
-* 新增
-*
-* @param position position
-*/
-void createPosition(Position position);
+ /**
+ * 新增
+ *
+ * @param position position
+ */
+ void createPosition(Position position);
-/**
-* 修改
-*
-* @param position position
-*/
-void updatePosition(Position position);
+ /**
+ * 修改
+ *
+ * @param position position
+ */
+ void updatePosition(Position position);
-/**
-* 删除
-*
-* @param position position
-*/
-void deletePosition(Position position);
+ /**
+ * 删除
+ *
+ * @param position position
+ */
+ void deletePosition(Position position);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelPosition(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelPosition(String ids);
+
+ List<Map<String, Object>> selectDicJobs();
}
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java
index e6ec051..573fc98 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java
+++ b/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();
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0