diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7b169cb8..41f536f9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,8 +3,8 @@ - - + + @@ -156,7 +157,7 @@ - + @@ -251,9 +252,34 @@ file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java - 93 + 97 + + file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java + 225 + + + file://$PROJECT_DIR$/src/main/java/com/lz/common/utils/ExcelUtil.java + 1057 + + + file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java + 229 + + + file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java + 231 + + + file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java + 180 + diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index a6a123f2..7bc7ab95 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -41,6 +41,10 @@ public class StaffServiceImpl extends ServiceImpl impleme StaffProjectExperienceService staffProjectExperienceService; @Resource StaffWorkTransferRecordService staffWorkTransferRecordService; + @Resource + DepartmentsService departmentsService; + @Resource + DepartmentsStaffRelateService departmentsStaffRelateService; @Override public PageUtils queryPage(Map params) { @@ -184,6 +188,11 @@ public class StaffServiceImpl extends ServiceImpl impleme staffEntity.setId(Staff.getId()); this.updateById(staffEntity); } + + createDepartmentInfo(staffEntity, map.get("primarySector")); + createDepartmentInfo(staffEntity, map.get("secondarySector")); + createDepartmentInfo(staffEntity, map.get("tertiarySector")); + StaffOccupationEntity occupation = staffOccupationService.getOne(new QueryWrapper().eq("staff_id", staffEntity.getId())); if (occupation == null) { occupationEntity.setStaffId(staffEntity.getId()); @@ -240,6 +249,19 @@ public class StaffServiceImpl extends ServiceImpl impleme } } + private void createDepartmentInfo(StaffEntity staffEntity, String departmentName) { + DepartmentsEntity departmentsEntity = departmentsService.getOne(new QueryWrapper().eq("department_name", departmentName)); + if (departmentsEntity != null) { + DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.getOne(new QueryWrapper().eq("department_id", departmentsEntity.getDepartmentId()).eq("staff_id", staffEntity.getId())); + if (departmentsStaffRelateEntity == null) { + departmentsStaffRelateEntity = new DepartmentsStaffRelateEntity(); + departmentsStaffRelateEntity.setStaffId(staffEntity.getId()); + departmentsStaffRelateEntity.setDepartmentId(departmentsEntity.getDepartmentId()); + departmentsStaffRelateService.save(departmentsStaffRelateEntity); + } + } + } + private StaffEntity convertStaffEntity(DepartmentStaffBo staffBo) { StaffEntity staffEntity = new StaffEntity(); staffEntity.setName(staffBo.getName());//员工姓名 diff --git a/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class b/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class index 50949e79..760b967a 100644 Binary files a/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class and b/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class differ