From 8cfc0759f49ba2e8493980789e6369249ac56493 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 08 三月 2021 07:39:58 +0800
Subject: [PATCH] fix(bug修复): 系统管理、员工信息
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java | 2
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java | 5 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 42 ----------
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java | 153 +++++++++++++++++++------------------
4 files changed, 85 insertions(+), 117 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
index f2d9ff0..e03e10e 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
@@ -72,4 +72,9 @@
* 结案状态
*/
public final static String SETTLE_STATUS = "settleStatus";
+
+ /**
+ * 入离职类型
+ */
+ public final static String IN_OUT_TYPE = "LZTYPE";
}
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
index aed8afb..e550d75 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
@@ -32,7 +32,7 @@
@FieldInfo(name = "positionId",type = "varchar",explain = "岗位Id")
@TableId(value = "positionId")
- private String positionId;
+ private Long positionId=0L;
@FieldInfo(name = "positionName",type = "varchar",explain = "岗位名称")
@TableField("positionName")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index f5a05f8..9df2048 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -876,48 +876,6 @@
if (StringUtils.isNotBlank(empBaseInfo.getCertificateNumb())) {
p.or().like("a.CertificateNumb", empBaseInfo.getCertificateNumb());
}
- if (StringUtils.isNotBlank(empBaseInfo.getEntryDateStr())) {
- p.between("a.EntryDate", empBaseInfo.getEntryDateStr().split(",")[0], empBaseInfo.getEntryDateStr().split(",")[1]);
- }
- if (StringUtils.isNotBlank(empBaseInfo.getDimissionDateStr())) {
- p.between("a.DimissionDate", empBaseInfo.getDimissionDateStr().split(",")[0], empBaseInfo.getDimissionDateStr().split(",")[1]);
- }
- if (StringUtils.isNotBlank(empBaseInfo.getSex())) {
- p.or().in("a.Sex", empBaseInfo.getSex().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getEducation())) {
- p.or().in("a.Education", empBaseInfo.getEducation().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getPolitics())) {
- p.or().in("a.Politics", empBaseInfo.getPolitics().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getAgeStr())) {
- String[] ages = empBaseInfo.getAgeStr().split(",");
- Consumer<QueryWrapper<EmpBaseInfo>> consumer = new Consumer<QueryWrapper<EmpBaseInfo>>() {
- public void accept(QueryWrapper<EmpBaseInfo> wrapper) {
- for (int i = 0; i < ages.length; i++) {
- String ageBtn = ages[i];
- wrapper.or().between("a.Age", ageBtn.split("-")[0], ageBtn.split("-")[1]);
- }
- }
- };
- p.or().and(consumer);
- }
- if (StringUtils.isNotBlank(empBaseInfo.getArchivesStatus())) {
- p.or().in("a.ArchivesStatus", empBaseInfo.getArchivesStatus().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getInsuranceType())) {
- p.or().in("a.InsuranceType", empBaseInfo.getInsuranceType().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getHandbookStatus())) {
- p.or().in("a.HandbookStatus", empBaseInfo.getHandbookStatus().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getEmpCardStatus())) {
- p.or().in("a.EmpCardStatus", empBaseInfo.getEmpCardStatus().split(","));
- }
- if (StringUtils.isNotBlank(empBaseInfo.getEmpType())) {
- p.or().in("a.empType", empBaseInfo.getEmpType().split(","));
- }
});
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
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 38313e7..e6ec051 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
@@ -1,7 +1,10 @@
package cc.mrbird.febs.server.system.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.system.Position;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
+import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.system.mapper.PositionMapper;
import cc.mrbird.febs.server.system.service.IPositionService;
import org.apache.commons.lang3.StringUtils;
@@ -19,92 +22,94 @@
import java.util.*;
/**
-*
-* 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
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> implements IPositionService {
-private final PositionMapper positionMapper;
-private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
-.map(u -> u.getUserId().toString())
-.orElse("1");
-@Override
-public IPage<Position> findPositions(QueryRequest request, Position position) {
-LambdaQueryWrapper<Position> queryWrapper = new LambdaQueryWrapper<>();
-queryWrapper.eq(Position::getDelFlag, 0);
-if(StringUtils.isNotBlank(position.getPositionName())){
- queryWrapper.like(Position::getPositionName, position.getPositionName());
-}
- queryWrapper.orderByDesc(Boolean.parseBoolean("createTime"));
-Page<Position> page = new Page<>(request.getPageNum(), request.getPageSize());
- IPage<Position> page1 = this.page(page, queryWrapper);
- return page1;
-}
+ private final PositionMapper positionMapper;
+ private final RedisService redisService;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public List<Position> findPositions(Position position) {
-LambdaQueryWrapper<Position> queryWrapper = new LambdaQueryWrapper<>();
-queryWrapper.eq(Position::getDelFlag, 0);
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public IPage<Position> findPositions(QueryRequest request, Position position) {
+ LambdaQueryWrapper<Position> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Position::getDelFlag, 0);
+ if (StringUtils.isNotBlank(position.getPositionName())) {
+ queryWrapper.like(Position::getPositionName, position.getPositionName());
+ }
+ queryWrapper.orderByDesc(Boolean.parseBoolean("createTime"));
+ Page<Position> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<Position> page1 = this.page(page, queryWrapper);
+ return page1;
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createPosition(Position position) {
- position.setPositionId(UUID.randomUUID().toString());
-position.setCreator(FebsUtil.getCurrentUsername());
-position.setModifier(FebsUtil.getCurrentUsername());
-this.save(position);
-}
+ @Override
+ public List<Position> findPositions(Position position) {
+ LambdaQueryWrapper<Position> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Position::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updatePosition(Position position) {
-Position dbData = this.getById(position.getPositionId());
-position.setCreateTime(dbData.getCreateTime());
-position.setCreator(dbData.getCreator());
-position.setDelFlag(dbData.getDelFlag());
-position.setModifyTime(new Date());
-position.setModifier(operatorId);
-this.saveOrUpdate(position);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createPosition(Position position) {
+ position.setPositionId(SequenceUtil.generateId(0L, ModuleCode.FRAM_SYSTEM));
+ position.setCreator(FebsUtil.getCurrentUsername());
+ position.setModifier(FebsUtil.getCurrentUsername());
+ this.save(position);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deletePosition(Position position) {
-LambdaQueryWrapper<Position> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Position::getPositionId, position.getPositionId());
-// TODO 设置删除条件
-this.remove(wrapper);
-}
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void logicDelPosition(String ids) {
- String[] str = ids.split(",");
- List<String> list = new ArrayList<>(Arrays.asList(str));
- for (String strs:list){
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePosition(Position position) {
+ Position dbData = this.getById(position.getPositionId());
+ position.setCreateTime(dbData.getCreateTime());
+ position.setCreator(dbData.getCreator());
+ position.setDelFlag(dbData.getDelFlag());
+ position.setModifyTime(new Date());
+ position.setModifier(operatorId);
+ this.saveOrUpdate(position);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deletePosition(Position position) {
LambdaQueryWrapper<Position> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Position::getPositionId, strs);
+ wrapper.eq(Position::getPositionId, position.getPositionId());
// TODO 设置删除条件
this.remove(wrapper);
}
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelPosition(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ for (String strs : list) {
+ LambdaQueryWrapper<Position> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Position::getPositionId, strs);
+// TODO 设置删除条件
+ this.remove(wrapper);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0