Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-13 cd26732c2a34dbc3f24b0cca8d82e8a365fcba7b

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

@@ -2,8 +2,10 @@

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
@@ -88,13 +90,14 @@
         queryWrapper.eq("a.ArbitrationStatus", empLabortrouble.getArbitrationStatus());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getEmpStatus())) {
         queryWrapper.eq("a.EmpStatus", empLabortrouble.getEmpStatus());
         queryWrapper.in("a.EmpStatus", empLabortrouble.getEmpStatus().split(","));
      }
      if (StringUtils.isNotBlank(empLabortrouble.getArbitrationReason())) {
         queryWrapper.like("a.ArbitrationReason", empLabortrouble.getArbitrationReason());
      }
      queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        IPage<EmpLaborTrouble> iPage = empLabortroubleMapper.selectPageVo(page, queryWrapper);
        iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
        return iPage;
@@ -177,7 +180,7 @@

   @Override
   @Transactional(rollbackFor = Exception.class)
   public void importEmpLaborTrouble(List<List<Object>> listObject,List<String>  returnList) {
   public void importEmpLaborTrouble(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems ) {
      for (List<Object> list : listObject) {
         if (list.size()==0){
            continue;
@@ -206,7 +209,14 @@
         if (StringUtils.isNotBlank(list.get(5).toString())) {
            empLabortrouble.setArbitrationDate(DateUtil.parseDateTime(list.get(5).toString()));
         }
         empLabortrouble.setArbitrationType(list.get(6).toString());

         //仲裁类型
         DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"zctype")&&StrUtil.equals(j.getDicItemName(),list.get(6).toString())).findFirst().orElse(null);
         if (null!=dicItem){
            empLabortrouble.setArbitrationType(dicItem.getDicItemCode());
         }


         empLabortrouble.setArbitrationReason(list.get(7).toString());
         empLabortrouble.setReporter(list.get(8).toString());
         empLabortrouble.setRemark(list.get(9).toString());