fix: 问题修复 1.数据统计模块中查看合同出错

luoyb

2024-05-05 44cca7956f99c8960fbdf877f78695221f8bcb17

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

@@ -1,70 +1,195 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpRemarkInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpRemarkInfoService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.*;

/**
*
* name:EmpRemarkinfo
* package:cc.mrbird.febs.server.hr.controller
* description:员工备注信息服务接口实现
*
* @author luoyibo
* @date 2021-01-24 20:35:15
* @since JDK1.8
*/
 * name:EmpRemarkinfo
 * package:cc.mrbird.febs.server.hr.controller
 * description:员工备注信息服务接口实现
 *
 * @author luoyibo
 * @date 2021-01-31 11:26:48
 * @since JDK1.8
 */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class EmpRemarkInfoServiceImpl extends ServiceImpl
<EmpRemarkInfoMapper, EmpRemarkInfo> implements IEmpRemarkInfoService {
class EmpRemarkInfoServiceImpl extends ServiceImpl<EmpRemarkInfoMapper, EmpRemarkInfo> implements IEmpRemarkinfoService {

private final EmpRemarkInfoMapper empRemarkinfoMapper;
   private final RedisService redisService;
    private final EmpRemarkInfoMapper empRemarkinfoMapper;
    private final IEmpBaseInfoService empBaseInfoService;
    private final IRemoteDeptService remoteDeptService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

@Override
public IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
    @Override
    public IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
       QueryWrapper<EmpRemarkInfo> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empRemarkinfo.getDelFlag());
        if (StringUtils.isNotBlank(empRemarkinfo.getEmpNumb())) {
         queryWrapper.like("a.EmpNumb", empRemarkinfo.getEmpNumb());
      }
      if (StringUtils.isNotBlank(empRemarkinfo.getEmpName())) {
         queryWrapper.like("a.EmpName", empRemarkinfo.getEmpName());
      }
      if (StringUtils.isNotBlank(empRemarkinfo.getCertificateNumb())) {
         queryWrapper.like("a.CertificateNumb", empRemarkinfo.getCertificateNumb());
      }
      if (StringUtils.isNotBlank(empRemarkinfo.getAllDeptName())) {
         queryWrapper.like("b.allDeptName", empRemarkinfo.getAllDeptName());
      }

@Override
public List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
// TODO 设置查询条件
return this.baseMapper.selectList(queryWrapper);
}
        if (StringUtils.isNotBlank(empRemarkinfo.getDeptName())) {
            queryWrapper.like("a.DeptName", empRemarkinfo.getDeptName());
        }
      if (StringUtils.isNotBlank(empRemarkinfo.getRemarkDateStr())) {
         queryWrapper.between("a.RemarkDate", empRemarkinfo.getRemarkDateStr().split(",")[0],
               empRemarkinfo.getRemarkDateStr().split(",")[1]);
      }
      if (StringUtils.isNotBlank(empRemarkinfo.getRemarkContent())) {
         queryWrapper.like("a.RemarkContent", empRemarkinfo.getRemarkContent());
      }
        if (StringUtils.isNotBlank(empRemarkinfo.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empRemarkinfo.getEmpStatus().split(","));
        }
      queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "remarkDate", FebsConstant.ORDER_ASC, true);
        return empRemarkinfoMapper.selectPageVo(page, queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void createEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
this.save(empRemarkinfo);
}
    @Override
    public List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
        LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpRemarkInfo::getDelFlag, empRemarkinfo.getDelFlag());
        return this.baseMapper.selectList(queryWrapper);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
this.saveOrUpdate(empRemarkinfo);
}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
        empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
        empRemarkinfo.setCreator(operatorId);
        empRemarkinfo.setModifier(operatorId);
        this.save(empRemarkinfo);
    }

@Override
@Transactional(rollbackFor = Exception.class)
public void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
LambdaQueryWrapper<EmpRemarkInfo> wapper = new LambdaQueryWrapper<>();
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
        EmpRemarkInfo dbData = this.getById(empRemarkinfo.getRemarkId());
        empRemarkinfo.setCreateTime(dbData.getCreateTime());
        empRemarkinfo.setCreator(dbData.getCreator());
        empRemarkinfo.setDelFlag(dbData.getDelFlag());
        empRemarkinfo.setModifyTime(new Date());
        empRemarkinfo.setModifier(operatorId);
        this.saveOrUpdate(empRemarkinfo);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
        LambdaQueryWrapper<EmpRemarkInfo> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
}
        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 logicDelEmpRemarkinfo(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        empRemarkinfoMapper.logicDeleteByIds(list, operatorId);
    }

    @Override
    public boolean momentToNormal(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empRemarkinfoMapper.momentToNormal(list, operatorId)>0;
    }

    @Override
   @Transactional(rollbackFor = Exception.class)
    public void importEmpRemarkInfo(List<List<Object>> listObject,List<String>  returnList) {
       for (List<Object> list : listObject) {
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
          EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
          empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
          empRemarkinfo.setEmpNumb(list.get(0).toString());
         List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            if(null == depts){
                depts =remoteDeptService.setDeptRedis();
            }
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
                continue;
            }
            Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
            if (null == empId){
                returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            empRemarkinfo.setDelFlag(0);
            empRemarkinfo.setEmpId(empId);
         empRemarkinfo.setDeptName(list.get(1).toString());
         empRemarkinfo.setDeptId(dept.getDeptId());
         empRemarkinfo.setJobName(list.get(2).toString());
         empRemarkinfo.setEmpName(list.get(3).toString());
         empRemarkinfo.setCertificateNumb(list.get(4).toString());
         try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empRemarkinfo.setRemarkDate(DateUtil.parse(list.get(5).toString()));
                }
            }catch (Exception e){
                returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}时间格式错误",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }

         empRemarkinfo.setRemarkContent(list.get(6).toString());
         this.save(empRemarkinfo);
       }
    }
}