feat(信息录入): 合同信息

luoyb

2021-02-20 f0d3fc365295e8a8cb8a0f7a3e7bc248d1e969c3

feat(信息录入): 合同信息

1.增加了合同状态字典项
2.返回数据增加了合同状态状态名称

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java

@@ -43,5 +43,8 @@
     * 心电图结果
     */
    public final static String ECG = "ECG";

    /**
     * 合同状态
     */
    public final static String CONTRACTSTATUS = "CONTRACTSTATUS";
}

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

@@ -46,7 +46,7 @@
    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
    @TableField("empName")
    private String empName = "";
    

    @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
    @TableField("empStatus")
    private String empStatus = "";
@@ -142,11 +142,15 @@
    @TableField("version")
    @Version
    private Integer version = 0;
    

    @TableField(exist = false)
    private String signingDateStr= "";
    
    private String signingDateStr = "";

    @TableField(exist = false)
    private String endDateStr= "";
    private String endDateStr = "";

    @FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
    @TableField(exist = false)
    private String contractStatusName = "";

}

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

@@ -6,6 +6,11 @@
import java.util.List;
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -40,6 +45,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpContractInfoServiceImpl extends ServiceImpl<EmpContractInfoMapper, EmpContractInfo> implements IEmpContractInfoService {

    private final RedisService redisService;
    private final EmpContractInfoMapper empContractinfoMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
@@ -62,10 +68,10 @@
            queryWrapper.like(EmpContractInfo::getDeptName, empContractinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
            queryWrapper.between(EmpContractInfo::getSigningDate, empContractinfo.getSigningDateStr().split(",")[0],  empContractinfo.getSigningDateStr().split(",")[1]);
            queryWrapper.between(EmpContractInfo::getSigningDate, empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
            queryWrapper.between(EmpContractInfo::getEndDate, empContractinfo.getEndDateStr().split(",")[0],  empContractinfo.getEndDateStr().split(",")[1]);
            queryWrapper.between(EmpContractInfo::getEndDate, empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.like(EmpContractInfo::getEmpStatus, empContractinfo.getEmpStatus());
@@ -74,7 +80,19 @@
            queryWrapper.eq(EmpContractInfo::getContractStatus, empContractinfo.getContractStatus());
        }
        Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
        IPage<EmpContractInfo> iPage = this.page(page, queryWrapper);
        List<EmpContractInfo> list = iPage.getRecords();
        //设置字典数据
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
        list.forEach(p -> {
            p.setContractStatusName(dicItems.stream()
                    .filter(k -> DicCode.CONTRACTSTATUS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getContractStatus()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("新签"));
        });
        iPage.setRecords(list);
        return iPage;
    }

    @Override
@@ -88,7 +106,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void createEmpContractinfo(EmpContractInfo empContractinfo) {
        empContractinfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        if(empContractinfo.getBeginDate()==null){
        if (empContractinfo.getBeginDate() == null) {
            empContractinfo.setBeginDate(empContractinfo.getSigningDate());
        }
        empContractinfo.setCreator(operatorId);
@@ -137,6 +155,6 @@
    public boolean momentToNormal(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empContractinfoMapper.momentToNormal(list, operatorId)>0;
        return empContractinfoMapper.momentToNormal(list, operatorId) > 0;
    }
}