From ce96649e79bf730aef73f3bec205c1c00a743635 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 03 三月 2021 22:08:01 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionLogController.java | 20 +++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java | 22 +----
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.java | 10 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 42 +++++-----
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionLogService.java | 3
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionAttendService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 9 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java | 3
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 21 ++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 20 ++++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java | 2
febs-common/febs-common-datasource-starter/src/main/java/cc/mrbird/febs/common/datasource/starter/configure/FebsDataSourceAutoConfigure.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java | 2
36 files changed, 132 insertions(+), 86 deletions(-)
diff --git a/febs-common/febs-common-datasource-starter/src/main/java/cc/mrbird/febs/common/datasource/starter/configure/FebsDataSourceAutoConfigure.java b/febs-common/febs-common-datasource-starter/src/main/java/cc/mrbird/febs/common/datasource/starter/configure/FebsDataSourceAutoConfigure.java
index 25e3d62..dc74822 100644
--- a/febs-common/febs-common-datasource-starter/src/main/java/cc/mrbird/febs/common/datasource/starter/configure/FebsDataSourceAutoConfigure.java
+++ b/febs-common/febs-common-datasource-starter/src/main/java/cc/mrbird/febs/common/datasource/starter/configure/FebsDataSourceAutoConfigure.java
@@ -34,6 +34,8 @@
@Order(-2)
public PaginationInterceptor paginationInterceptor() {
PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+ // 设置最大单页限制数量，默认 500 条，-1 不受限制
+ paginationInterceptor.setLimit(-1);
List<ISqlParser> sqlParserList = new ArrayList<>();
sqlParserList.add(new BlockAttackSqlParser());
paginationInterceptor.setSqlParserList(sqlParserList);
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index 38bcb74..400137b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -99,7 +99,7 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBaseInfoService.findEmpBaseInfos(request, empBaseinfo));
return new FebsResponse().data(dataTable);
}
-
+
@ApiOperation(value = "智搜人员基本信息翻页列表")
@GetMapping("zslist")
@PreAuthorize("hasAuthority('empBaseinfo:list')")
@@ -186,7 +186,7 @@
List<EmpBaseInfo> allRoles = empBaseInfoService.list(wrapper);
return new FebsResponse().data(allRoles);
}
-
+
@ApiOperation(value = "导出员工")
@RequestMapping(value = "export",method= RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
@@ -195,7 +195,7 @@
List<EmpBaseInfo> records = this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpBaseInfo.class, response).downXlsx(records, false);
}
-
+
@ApiOperation(value = "导出员工")
@RequestMapping(value = "exportWithField",method= RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
@@ -213,32 +213,34 @@
@ApiOperation(value = "导入员工")
@PostMapping("importEmp")
- public void importEmp(MultipartFile file) throws IOException {
- InputStream in = null;
- List<List<List<Object>>> listObject = null;
+ public FebsResponse importEmp(MultipartFile file) {
+ InputStream in;
+ List<List<List<Object>>> listObject;
+ List<String> returnList = new ArrayList<>();
try {
if (!file.isEmpty()) {
in = file.getInputStream();
listObject = PoiImportExcel.getMulitListByExcel(in, file.getOriginalFilename());
in.close();
- empBaseInfoService.importEmpBaseInfo(listObject.get(0));
- empWorkExperienceService.importEmpWorkExperience(listObject.get(1));
- empPhysicalExamService.importEmpPhysicalExam(listObject.get(2));
- empContractInfoService.importEmpContractInfo(listObject.get(3));
- empDimissionAttendService.importEmpDimissionAttend(listObject.get(4));
- empLeaveInfoService.importEmpLeaveInfo(listObject.get(5));
- empResignService.importEmpResign(listObject.get(6));
- empUnemploymentService.importEmpUnemployment(listObject.get(7));
- empInsuranceService.importEmpInsurance(listObject.get(8));
- empAccidentCasesService.importEmpAccidentCases(listObject.get(9));
- empOccupationalService.importEmpOccupational(listObject.get(10));
- empLaborTroubleService.importEmpLaborTrouble(listObject.get(11));
- empBadRecordService.importEmpBadRecord(listObject.get(12));
- empRemarkinfoService.importEmpRemarkInfo(listObject.get(13));
+ empBaseInfoService.importEmpBaseInfo(listObject.get(0),returnList);
+ empWorkExperienceService.importEmpWorkExperience(listObject.get(1),returnList);
+ empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList);
+ empContractInfoService.importEmpContractInfo(listObject.get(3),returnList);
+ 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);
+ empAccidentCasesService.importEmpAccidentCases(listObject.get(9),returnList);
+ empOccupationalService.importEmpOccupational(listObject.get(10),returnList);
+ empLaborTroubleService.importEmpLaborTrouble(listObject.get(11),returnList);
+ empBadRecordService.importEmpBadRecord(listObject.get(12),returnList);
+ empRemarkinfoService.importEmpRemarkInfo(listObject.get(13),returnList);
}
} catch (Exception e) {
log.error("导入员工", e);
}
+ return new FebsResponse().data(returnList);
}
@ApiOperation(value = "关闭员工档案")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionLogController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionLogController.java
index 0a43f34..be76cfa 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionLogController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionLogController.java
@@ -3,11 +3,14 @@
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
+import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,6 +24,7 @@
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* name:EmpDimissionlog
@@ -51,18 +55,24 @@
@ApiOperation(value = "员工离职记录翻页列表")
@GetMapping("list")
public FebsResponse empDimissionlogList(QueryRequest request, EmpDimissionLog empDimissionlog) {
- Map
- <String, Object> dataTable = FebsUtil.getDataTable(this.empDimissionlogService.findEmpDimissionLogs(request, empDimissionlog));
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empDimissionlogService.findEmpDimissionLogs(request, empDimissionlog));
return new FebsResponse().data(dataTable);
}
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpDimissionLog empBaseinfo, HttpServletResponse response) {
request.setPageSize(this.empDimissionlogService.count());
- List<EmpDimissionLog> records = this.empDimissionlogService.findEmpDimissionLogs(request, empBaseinfo).getRecords();
- ExcelKit.$Export(EmpDimissionLog.class, response).downXlsx(records, false);
+ List<Map<String,Object>> records = this.empDimissionlogService.findEmpDimissionLogs(request, empBaseinfo).getRecords();
+ List<EmpDimissionLog> list = records.parallelStream().map(i->{
+ i.put("entryDate", DateUtil.parse(i.get("entryDate").toString()));
+ i.put("dimissionDate", DateUtil.parse(i.get("dimissionDate").toString()));
+ return BeanUtil.toBean(i,EmpDimissionLog.class);
+ }).collect(Collectors.toList());
+ ExcelKit.$Export(EmpDimissionLog.class, response).downXlsx(list, false);
}
+
@ApiOperation(value = "员工离职记录增加")
@PostMapping
@PreAuthorize("hasAuthority('empDimissionlog:add')")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
index 2f6e660..bd8f6c1 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
@@ -119,10 +119,10 @@
@FieldInfo(name = "entryDates", explain = "关闭档案人员入职日期")
@TableField(exist = false)
private String entryDates;
-
+
@TableField(exist = false)
private String entryDateStr= "";
-
+
@TableField(exist = false)
private String dimissionDateStr= "";
@@ -130,5 +130,20 @@
private String afterOperation= "";
@TableField(exist = false)
+ @ExcelField(value = "身份证号码")
private String certificateNumb= "";
-}
\ No newline at end of file
+
+ @TableField(exist = false)
+ @ExcelField(value = "员工编号")
+ private String empNumb= "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "新部门")
+ private String newDeptName= "";
+
+ @TableField(exist = false)
+ @ExcelField(value = "新岗位")
+ private String newJobName= "";
+
+
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.java
index c790120..54b3928 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.java
@@ -1,11 +1,16 @@
package cc.mrbird.febs.server.hr.mapper;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import java.util.List;
+import java.util.Map;
/**
* name:EmpDimissionlog
@@ -38,4 +43,7 @@
" </foreach>\n" +
"</script>")
void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
-}
\ No newline at end of file
+
+ IPage<Map<String,Object>> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);
+
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml
index f311303..e13db54 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpDimissionLogMapper">
-
+ <select id="selectPageVo" resultType="java.util.Map">
+ select a.*,b.empNumb,b.certificateNumb, (select dept_Name from t_dept as dept where dept.dept_Id= a.deptId) as newDeptName,a.newJobName from t_emp_dimissionlog a inner join t_emp_baseinfo b on a.empId = b.empId ${ew.customSqlSegment}
+ </select>
</mapper>
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java
index 148d2c7..42480e3 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java
@@ -79,5 +79,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpAccidentCases(List<List<Object>> listObject);
+ void importEmpAccidentCases(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java
index eeec45b..42de8ec 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java
@@ -79,5 +79,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpBadRecord(List<List<Object>> listObject);
+ void importEmpBadRecord(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
index d7d6420..965314e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -175,7 +176,7 @@
* 导入员工
* @param listObject
*/
- void importEmpBaseInfo(List<List<Object>> listObject);
+ void importEmpBaseInfo(List<List<Object>> listObject,List<String> returnList) throws FebsException;
void getImage(String empId, HttpServletResponse response) throws Exception;
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
index c4e7795..b45697e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
@@ -78,7 +78,7 @@
*/
boolean momentToNormal(String ids);
- void importEmpContractInfo(List<List<Object>> listObject);
+ void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList);
void terminateContract(String empIds, String operatorId);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionAttendService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionAttendService.java
index f8a1cf1..3185299 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionAttendService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionAttendService.java
@@ -78,5 +78,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpDimissionAttend(List<List<Object>> listObject);
+ void importEmpDimissionAttend(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionLogService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionLogService.java
index 7ea7138..42feded 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionLogService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionLogService.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
+import java.util.Map;
/**
* name:EmpDimissionlog
@@ -25,7 +26,7 @@
* @param empDimissionlog empDimissionlog
* @return IPage<EmpDimissionlog>
*/
- IPage<EmpDimissionLog> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog);
+ IPage<Map<String, Object>> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog);
/**
* 查询（所有）
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.java
index b684294..f865a33 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.java
@@ -79,5 +79,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpInsurance(List<List<Object>> listObject);
+ void importEmpInsurance(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
index aa91190..059a74f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
@@ -79,5 +79,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpLaborTrouble(List<List<Object>> listObject);
+ void importEmpLaborTrouble(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
index 824ae66..7f2ebdb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
@@ -78,5 +78,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpLeaveInfo(List<List<Object>> listObject);
+ void importEmpLeaveInfo(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java
index deaedb0..38e056c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java
@@ -78,5 +78,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpOccupational(List<List<Object>> listObject);
+ void importEmpOccupational(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java
index 5f323c5..c07c66e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java
@@ -78,5 +78,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpPhysicalExam(List<List<Object>> listObject);
+ void importEmpPhysicalExam(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
index 4115672..0f37a9d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
+++ b/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 importEmpRemarkInfo(List<List<Object>> listObject);
+ void importEmpRemarkInfo(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java
index 418b310..91a2fb8 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java
@@ -79,5 +79,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpResign(List<List<Object>> listObject);
+ void importEmpResign(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
index df92e31..f089eb4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
@@ -79,5 +79,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpUnemployment(List<List<Object>> listObject);
+ void importEmpUnemployment(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java
index 73eac0a..7b70e35 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java
@@ -78,5 +78,5 @@
*/
boolean momentToNormal(String ids);
- void importEmpWorkExperience(List<List<Object>> listObject);
+ void importEmpWorkExperience(List<List<Object>> listObject,List<String> returnList);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
index 33ecc93..9037930 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
@@ -176,7 +176,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpAccidentCases(List<List<Object>> listObject) {
+ public void importEmpAccidentCases(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpAccidentCases empAccidentcases=new EmpAccidentCases();
empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
index 94d7f6d..b22482d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
@@ -152,7 +152,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpBadRecord(List<List<Object>> listObject) {
+ public void importEmpBadRecord(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpBadRecord empBadrecord=new EmpBadRecord();
empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 8927b0c..9441a8b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -8,6 +8,7 @@
import java.util.function.Consumer;
import cc.mrbird.febs.common.core.entity.system.SysConfig;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.MyUtil;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
@@ -366,8 +367,15 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpBaseInfo(List<List<Object>> listObject) {
+ public void importEmpBaseInfo(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
+ if (this.count(new LambdaQueryWrapper<EmpBaseInfo>().eq(EmpBaseInfo::getEmpNumb,list.get(1).toString()).ne(EmpBaseInfo::getDelFlag,1))>0){
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}员工编号重复",listObject.indexOf(list),list.get(1).toString()));
+ continue;
+ }
EmpBaseInfo empBaseInfo = new EmpBaseInfo();
empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empBaseInfo.setArchivesNumb(list.get(0).toString());
@@ -375,9 +383,12 @@
empBaseInfo.setEmpName(list.get(2).toString());
List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
empBaseInfo.setDeptName(list.get(3).toString());
- Long deptId = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().get()
- .getDeptId();
- empBaseInfo.setDeptId(deptId);
+ Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(3).toString())).findFirst().orElse(null);
+ if (null == dept) {
+ returnList.add(StrUtil.format("导入员工基本信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list),list.get(3).toString()));
+ continue;
+ }
+ empBaseInfo.setDeptId(dept.getDeptId());
empBaseInfo.setJobName(list.get(4).toString());
empBaseInfo.setEmpType(list.get(5).toString());
empBaseInfo.setSex("男".equals(list.get(6).toString()) ? "1" : "2");
@@ -411,6 +422,7 @@
empBaseInfo.setHandbookStatus(list.get(28).toString());
empBaseInfo.setEmpCardStatus(list.get(29).toString());
empBaseInfo.setCertificateList(list.get(30).toString());
+ empBaseInfo.setDelFlag(2);
empBaseInfo.setEmpStatus("0");
this.save(empBaseInfo);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index 45a898b..3956cec 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -160,7 +160,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpContractInfo(List<List<Object>> listObject) {
+ public void importEmpContractInfo(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpContractInfo contractInfo = new EmpContractInfo();
contractInfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
@@ -196,4 +196,4 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empContractinfoMapper.terminateContract(list, operatorId);
}
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
index d0ddb58..de8f910 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
@@ -140,7 +140,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpDimissionAttend(List<List<Object>> listObject) {
+ public void importEmpDimissionAttend(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpDimissionAttend dimissionAttend = new EmpDimissionAttend();
dimissionAttend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
@@ -174,4 +174,4 @@
this.save(dimissionAttend);
}
}
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
index eaf9cf4..d32753b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
@@ -41,21 +41,10 @@
.orElse("1");
@Override
- public IPage<EmpDimissionLog> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog) {
+ public IPage<Map<String, Object>> findEmpDimissionLogs(QueryRequest request, EmpDimissionLog empDimissionlog) {
LambdaQueryWrapper<EmpDimissionLog> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpDimissionLog::getDelFlag, 0);
-// if (StringUtils.isNotBlank(empDimissionlog.getEmpNumb())) {
-// queryWrapper.like(EmpDimissionLog::getEmpNumb, empDimissionlog.getEmpNumb());
-// }
-// if (StringUtils.isNotBlank(empDimissionlog.getEmpName())) {
-// queryWrapper.like(EmpDimissionLog::getEmpName, empDimissionlog.getEmpName());
-// }
-// if (StringUtils.isNotBlank(empDimissionlog.getCertificateNumb())) {
-// queryWrapper.like(EmpDimissionLog::getCertificateNumb, empDimissionlog.getCertificateNumb());
-// }
-// if (StringUtils.isNotBlank(empDimissionlog.getDeptName())) {
-// queryWrapper.like(EmpDimissionLog::getDeptName, empDimissionlog.getDeptName());
-// }
+
if (StringUtils.isNotBlank(empDimissionlog.getEntryDateStr())) {
queryWrapper.between(EmpDimissionLog::getEntryDate, empDimissionlog.getEntryDateStr().split(",")[0], empDimissionlog.getEntryDateStr().split(",")[1]);
}
@@ -65,8 +54,9 @@
if (StringUtils.isNotBlank(empDimissionlog.getDimissionType())) {
queryWrapper.eq(EmpDimissionLog::getDimissionType, empDimissionlog.getDimissionType());
}
- Page<EmpDimissionLog> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.page(page, queryWrapper);
+ Page<Map<String, Object>> page = new Page<>(request.getPageNum(), request.getPageSize());
+
+ return this.baseMapper.selectPageVo(page,queryWrapper);
}
@Override
@@ -121,4 +111,4 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empDimissionlogMapper.logicDeleteByIds(list, operatorId);
}
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
index 7213797..a02fac8 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
@@ -158,7 +158,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpInsurance(List<List<Object>> listObject) {
+ public void importEmpInsurance(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpInsurance empInsurance = new EmpInsurance();
empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index 4300fb6..a356ac4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -169,7 +169,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpLaborTrouble(List<List<Object>> listObject) {
+ public void importEmpLaborTrouble(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index 3775db2..b7f6c27 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -137,7 +137,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpLeaveInfo(List<List<Object>> listObject) {
+ public void importEmpLeaveInfo(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpLeaveInfo leaveInfo = new EmpLeaveInfo();
leaveInfo.setLeaveId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
@@ -191,4 +191,4 @@
return list;
}
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index 2db64db..d4062f0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -158,7 +158,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpOccupational(List<List<Object>> listObject) {
+ public void importEmpOccupational(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpOccupational empOccupational=new EmpOccupational();
empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
@@ -212,4 +212,4 @@
this.save(empOccupational);
}
}
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
index c9f84e1..fb1fe0d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
@@ -167,7 +167,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpPhysicalExam(List<List<Object>> listObject) {
+ public void importEmpPhysicalExam(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpPhysicalExam physicalExam = new EmpPhysicalExam();
physicalExam.setPhysicalExamId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
@@ -195,4 +195,4 @@
this.save(physicalExam);
}
}
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
index 6af90f9..c41db98 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
+++ b/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 importEmpRemarkInfo(List<List<Object>> listObject) {
+ public void importEmpRemarkInfo(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
@@ -155,4 +155,4 @@
this.save(empRemarkinfo);
}
}
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index c81f57a..bc7edcb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -152,7 +152,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpResign(List<List<Object>> listObject) {
+ public void importEmpResign(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpResign resign = new EmpResign();
resign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index 14b2364..3a92ea7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
@@ -156,7 +156,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpUnemployment(List<List<Object>> listObject) {
+ public void importEmpUnemployment(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
EmpUnemployment empUnemployment=new EmpUnemployment();
empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index f8d1e83..0e2371b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -129,8 +129,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void importEmpWorkExperience(List<List<Object>> listObject) {
+ public void importEmpWorkExperience(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
+ if (list.size()==0){
+ continue;
+ }
EmpWorkExperience workExperience = new EmpWorkExperience();
workExperience.setWorkExperienceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
workExperience.setEmpNumb(list.get(0).toString());
@@ -142,10 +145,10 @@
workExperience.setBeginDate(DateUtil.parseDate(list.get(5).toString()));
}
if (StringUtils.isNotBlank(list.get(6).toString())) {
- workExperience.setBeginDate(DateUtil.parseDate(list.get(6).toString()));
+ workExperience.setEndDate(DateUtil.parseDate(list.get(6).toString()));
}
workExperience.setJobContent(list.get(7).toString());
this.save(workExperience);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0