febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -11,7 +11,6 @@ import javax.validation.Valid; import javax.validation.constraints.NotBlank; import cc.mrbird.febs.common.core.entity.system.Role; 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; @@ -112,7 +111,7 @@ @ApiOperation(value = "人员基本信息增加") @PostMapping @PreAuthorize("hasAuthority('empBaseinfo:add')") public void addEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException { public void addEmpBaseInfo( MultipartFile file,@Valid EmpBaseInfo empBaseinfo) throws FebsException { if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){ throw new FebsException("已存在此员工编号"); } @@ -155,7 +154,7 @@ @ApiOperation(value = "人员基本信息修改") @PutMapping @PreAuthorize("hasAuthority('empBaseinfo:update')") public void updateEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException { public void updateEmpBaseInfo(MultipartFile file,@Valid EmpBaseInfo empBaseinfo) throws FebsException { if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){ throw new FebsException("已存在此员工编号:" + empBaseinfo.getEmpNumb()); } @@ -220,7 +219,7 @@ empOccupationalService.importEmpOccupational(listObject.get(10)); empLaborTroubleService.importEmpLaborTrouble(listObject.get(11)); empBadRecordService.importEmpBadRecord(listObject.get(12)); empRemarkinfoService.importEmpBadRecord(listObject.get(13)); empRemarkinfoService.importEmpRemarkInfo(listObject.get(13)); } } catch (Exception e) { log.error("导入员工", e); febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
@@ -78,5 +78,5 @@ */ boolean momentToNormal(String ids); void importEmpBadRecord(List<List<Object>> listObject); void importEmpRemarkInfo(List<List<Object>> listObject); } febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -79,44 +79,37 @@ queryWrapper.between("a.entryDate", vo.getEntryDate().split(",")[0], vo.getEntryDate().split(",")[1]); } if (StrUtil.isNotBlank(vo.getAge())) { if (StrUtil.equals(vo.getAge(), "1")) { queryWrapper.between("a.age", 18, 29); } else if (StrUtil.equals(vo.getAge(), "2")) { queryWrapper.between("a.age", 30, 39); } else if (StrUtil.equals(vo.getAge(), "3")) { queryWrapper.between("a.age", 40, 49); } else if (StrUtil.equals(vo.getAge(), "4")) { queryWrapper.between("a.age", 50, 59); } else if (StrUtil.equals(vo.getAge(), "5")) { queryWrapper.between("a.age", 60, 69); } else if (StrUtil.equals(vo.getAge(), "6")) { queryWrapper.ge("a.age", 69); String[] arr = vo.getAge().split(","); for (String s : arr) { if (StrUtil.equals(s, "1")) { queryWrapper.between("a.age", 18, 29); } if (StrUtil.equals(s, "2")) { queryWrapper.between("a.age", 30, 39); } if (StrUtil.equals(s, "3")) { queryWrapper.between("a.age", 40, 49); } if (StrUtil.equals(s, "4")) { queryWrapper.between("a.age", 50, 59); } if (StrUtil.equals(s, "5")) { queryWrapper.between("a.age", 60, 69); } if (StrUtil.equals(s, "6")) { queryWrapper.ge("a.age", 69); } } } if (StrUtil.isNotBlank(vo.getArchivesStatus())) { if (!StrUtil.equals(vo.getArchivesStatus(), "-1")) { queryWrapper.eq("a.archivesStatus", vo.getArchivesStatus()); } queryWrapper.in("a.archivesStatus", vo.getArchivesStatus()); } if (StrUtil.isNotBlank(vo.getEducation())) { if (!StrUtil.equals(vo.getEducation(), "-1")) { queryWrapper.eq("a.education", vo.getEducation()); } queryWrapper.in("a.education", vo.getEducation()); } if (StrUtil.isNotBlank(vo.getSex())) { if (!StrUtil.equals(vo.getSex(), "-1")) { queryWrapper.eq("a.sex", vo.getSex()); } queryWrapper.in("a.sex", vo.getSex()); } if (StrUtil.isNotBlank(vo.getInsuranceType())) { if (!StrUtil.equals(vo.getInsuranceType(), "-1")) { queryWrapper.eq("a.insuranceType", vo.getInsuranceType()); } queryWrapper.in("a.insuranceType", vo.getInsuranceType()); } if (StrUtil.isNotBlank(vo.getPolitics())) { if (!StrUtil.equals(vo.getPolitics(), "-1")) { queryWrapper.eq("a.politics", vo.getPolitics()); } queryWrapper.in("a.politics", vo.getPolitics()); } queryWrapper.eq("a.delFlag", 0); Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize()); febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
@@ -135,7 +135,7 @@ @Override @Transactional(rollbackFor = Exception.class) public void importEmpBadRecord(List<List<Object>> listObject) { public void importEmpRemarkInfo(List<List<Object>> listObject) { for (List<Object> list : listObject) { EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo(); empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE)); febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -58,7 +58,7 @@ queryWrapper.like(EmpWorkExperience::getCertificateNumb, empWorkexperience.getCertificateNumb()); } if (StringUtils.isNotBlank(empWorkexperience.getJobContent())) { queryWrapper.eq(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent()); queryWrapper.like(EmpWorkExperience::getJobContent, empWorkexperience.getJobContent()); } Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize()); return this.page(page, queryWrapper);
