增加修改bug

yz

2021-03-10 1b78ef13d002fa39bdcad7e0a70a3509a9709d3e

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java

@@ -12,10 +12,12 @@
import javax.validation.constraints.NotBlank;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.feign.IRemoteDicItemService;
import cn.hutool.core.annotation.AnnotationUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.wuwenze.poi.ExcelKit;
@@ -85,8 +87,7 @@
    private final IEmpLaborTroubleService empLaborTroubleService;
    private final IEmpBadRecordService empBadRecordService;
    private final IEmpRemarkinfoService empRemarkinfoService;
    private final IRemoteUserService remoteUserService;
    private final IRemoteDeptService remoteDeptService;
    private final IRemoteDicItemService dicItemService;

    @ApiOperation(value = "人员基本信息无翻页列表")
    @GetMapping
@@ -226,23 +227,24 @@
      InputStream in;
      List<List<List<Object>>> listObject;
      List<String>  returnList = new ArrayList<>();
      List<DicItem> dicItems = dicItemService.getAllDicitemsAll();
      try {
         if (!file.isEmpty()) {
            in = file.getInputStream();
            listObject = PoiImportExcel.getMulitListByExcel(in, file.getOriginalFilename());
            in.close();
            empBaseInfoService.importEmpBaseInfo(listObject.get(0),returnList);
            empBaseInfoService.importEmpBaseInfo(listObject.get(0),returnList,dicItems);
            empWorkExperienceService.importEmpWorkExperience(listObject.get(1),returnList);
            empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList);
            empContractInfoService.importEmpContractInfo(listObject.get(3),returnList);
            empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList,dicItems);
            empContractInfoService.importEmpContractInfo(listObject.get(3),returnList,dicItems);
            empDimissionAttendService.importEmpDimissionAttend(listObject.get(4),returnList);
            empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList);
            empResignService.importEmpResign(listObject.get(6),returnList);
            empUnemploymentService.importEmpUnemployment(listObject.get(7),returnList);
            empInsuranceService.importEmpInsurance(listObject.get(8),returnList);
            empInsuranceService.importEmpInsurance(listObject.get(8),returnList,dicItems);
            empAccidentCasesService.importEmpAccidentCases(listObject.get(9),returnList);
            empOccupationalService.importEmpOccupational(listObject.get(10),returnList);
            empLaborTroubleService.importEmpLaborTrouble(listObject.get(11),returnList);
            empLaborTroubleService.importEmpLaborTrouble(listObject.get(11),returnList,dicItems);
            empBadRecordService.importEmpBadRecord(listObject.get(12),returnList);
            empRemarkinfoService.importEmpRemarkInfo(listObject.get(13),returnList);
         }