Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-08 4e52cb2253af9a22571c7d0c239ee283178d2fd4

Merge remote-tracking branch 'origin/master'

 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";
}

 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")

 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));

 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,7 +22,6 @@
import java.util.*;

/**
*
* name:Position
* package:cc.mrbird.febs.server.system.controller
* description:岗位信息服务接口实现
@@ -34,9 +36,11 @@
class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> implements IPositionService {

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 IPage<Position> findPositions(QueryRequest request, Position position) {
LambdaQueryWrapper<Position> queryWrapper = new LambdaQueryWrapper<>();
@@ -60,7 +64,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createPosition(Position position) {
    position.setPositionId(UUID.randomUUID().toString());
        position.setPositionId(SequenceUtil.generateId(0L, ModuleCode.FRAM_SYSTEM));
position.setCreator(FebsUtil.getCurrentUsername());
position.setModifier(FebsUtil.getCurrentUsername());
this.save(position);
@@ -86,14 +90,15 @@
// TODO 设置删除条件
this.remove(wrapper);
}

/**
*
* 根据Id批量逻辑删除记录
*
     * <p>
* date 2021-01-28 10:48
* @author: luoyibo
     *
* @param ids 待删除Id
* @return void
     * @author: luoyibo
*/
@Override
@Transactional(rollbackFor = Exception.class)