diff --git a/src/main/java/com/lz/modules/performance/controller/ExportController.java b/src/main/java/com/lz/modules/performance/controller/ExportController.java index 9545b7a2..d8d2b7be 100644 --- a/src/main/java/com/lz/modules/performance/controller/ExportController.java +++ b/src/main/java/com/lz/modules/performance/controller/ExportController.java @@ -102,7 +102,7 @@ public class ExportController { writer.merge(7 + data.size(),8 + data.size(),0,0,"签字",false); //设置下拉框数据 - String[] values = { "当月入职", "当月离职", "当月跨部门调动", "当月转正", "已转正", "试用期"}; + String[] values = {"已转正", "试用期"}; Sheet sheet = writer.getSheet(); int firstRow = 4; int lastRow = 4; diff --git a/src/main/java/com/lz/modules/performance/res/LevelDetailExportRes.java b/src/main/java/com/lz/modules/performance/res/LevelDetailExportRes.java index c418ea1c..50b56404 100644 --- a/src/main/java/com/lz/modules/performance/res/LevelDetailExportRes.java +++ b/src/main/java/com/lz/modules/performance/res/LevelDetailExportRes.java @@ -16,7 +16,7 @@ public class LevelDetailExportRes { //姓名 private String staffName; //当月状态 - private int staffType; + private String staffType; //一级部门 private String departmentOne; //二级部门 diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index 66ab431d..e85918b2 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -80,8 +80,6 @@ public class ChartResultServiceImpl implements ChartResultService { private EvaluationGroupMapper evaluationGroupMapper; @Autowired private StaffOccupationService staffOccupationService; - @Autowired - private StaffWorkTransferRecordService staffWorkTransferRecordService; private static final Long processId = 1L; @@ -290,13 +288,16 @@ public class ChartResultServiceImpl implements ChartResultService { } } - // TODO 人员变动信息 人员状态 - //staffWorkTransferRecordService - //拷贝为excel格式 List levelDetailExportRes = levelDetailExportDtos.stream().map(levelDetailExportDto -> { LevelDetailExportRes res = new LevelDetailExportRes(); BeanUtils.copyProperties(levelDetailExportDto,res); + if(1 == levelDetailExportDto.getStaffType()){ + res.setStaffType("已转正"); + } + if(2 == levelDetailExportDto.getStaffType()){ + res.setStaffType("试用期"); + } return res; }).collect(Collectors.toList()); diff --git a/src/main/resources/mapper/generator/StaffOccupationDao.xml b/src/main/resources/mapper/generator/StaffOccupationDao.xml index 8750018d..ff2f00c7 100644 --- a/src/main/resources/mapper/generator/StaffOccupationDao.xml +++ b/src/main/resources/mapper/generator/StaffOccupationDao.xml @@ -74,7 +74,7 @@