diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5665264a..effe3682 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,9 @@ - + + + @@ -180,94 +182,9 @@ - file://$PROJECT_DIR$/src/main/java/com/lz/common/utils/FeishuUtil.java - 94 - - - file://$PROJECT_DIR$/src/test/java/com/lz/FumeiaiTest.java - 191 - - - file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/DepartmentsController.java - 53 - - - file://$PROJECT_DIR$/src/main/java/com/lz/modules/sys/controller/SysRoleController.java - 61 - - - file://$PROJECT_DIR$/src/test/java/com/lz/FumeiaiTest.java - 42 - - - file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java - 106 - - - file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java - 212 - - - file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java - 249 - - - file://$PROJECT_DIR$/src/main/java/com/lz/common/utils/ExcelUtil.java - 184 - - - file://$PROJECT_DIR$/src/main/java/com/lz/common/utils/ExcelUtil.java - 205 - - - file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java - 167 - - - file://$PROJECT_DIR$/src/main/java/com/lz/modules/job/business/FeishuBusiness.java - 51 - - - file://$PROJECT_DIR$/src/main/java/com/lz/modules/job/task/SynchronizeFlybookDataJob.java - 34 - - - 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/controller/StaffController.java - 95 - 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 7bc7ab95..46d6d224 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; +import com.lz.common.utils.DateUtils; import com.lz.common.utils.PageUtils; import com.lz.common.utils.Query; import com.lz.modules.app.Dto.GraphicsStatisticalDto; @@ -211,31 +212,43 @@ public class StaffServiceImpl extends ServiceImpl impleme staffEducationService.updateById(educationEntity); } } + for (Map map : sheet3List) { + StaffEntity Staff = this.getByName(map.get("name")); + if (Staff != null) { + staffProjectExperienceService.update(new UpdateWrapper().set("is_delete", 1).eq("staff_id", Staff.getId())); + } + } for (Map map : sheet3List) { StaffProjectExperienceEntity staffProjectExperienceEntity = JSON.parseObject(JSON.toJSONString(map), StaffProjectExperienceEntity.class); StaffEntity Staff = this.getByName(map.get("name")); if (Staff == null) { continue; } else { - staffProjectExperienceService.update(new UpdateWrapper().set("is_delete", 1).eq("staff_id", Staff.getId())); StaffProjectExperienceEntity projectExperienceEntity = staffProjectExperienceService.getOne(new QueryWrapper().eq("staff_id", Staff.getId()).eq("project_name", staffProjectExperienceEntity.getProjectName())); if (projectExperienceEntity == null) { staffProjectExperienceEntity.setStaffId(Staff.getId()); staffProjectExperienceService.save(staffProjectExperienceEntity); } else { + logger.info(DateUtils.format(staffProjectExperienceEntity.getProjectBeginTime(), DateUtils.DATE_TIME_PATTERN)); + logger.info(DateUtils.format(staffProjectExperienceEntity.getProjectEndTime(), DateUtils.DATE_TIME_PATTERN)); staffProjectExperienceEntity.setId(projectExperienceEntity.getId()); staffProjectExperienceEntity.setIsDelete(0); staffProjectExperienceService.updateById(staffProjectExperienceEntity); } } } + for (Map map : sheet4List) { + StaffEntity Staff = this.getByName(map.get("name")); + if (Staff != null) { + staffWorkTransferRecordService.update(new UpdateWrapper().set("is_delete", 1).eq("staff_id", Staff.getId())); + } + } for (Map map : sheet4List) { StaffWorkTransferRecordEntity staffWorkTransferRecordEntity = JSON.parseObject(JSON.toJSONString(map), StaffWorkTransferRecordEntity.class); StaffEntity Staff = this.getByName(map.get("name")); if (Staff == null) { continue; } else { - staffWorkTransferRecordService.update(new UpdateWrapper().set("is_delete", 1).eq("staff_id", Staff.getId())); StaffWorkTransferRecordEntity workTransferRecordEntity = staffWorkTransferRecordService.getOne(new QueryWrapper().eq("staff_id", Staff.getId()).eq("transfer_time", staffWorkTransferRecordEntity.getTransferTime())); if (workTransferRecordEntity == null) { staffWorkTransferRecordEntity.setStaffId(Staff.getId()); diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 739a6d10..8cd99cce 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -8,6 +8,7 @@ + diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index aa73be06..63e918fc 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -159,7 +159,7 @@ ifnull(round(count(DISTINCT(td.leader_employee_id))/count(DISTINCT(ls.id))*100,2),0) managementRate, count(DISTINCT(ls.new_staff)) newStaffCount, count(DISTINCT(ls.leave_staff)) leaveStaffCount, - ifnull(round(count(DISTINCT(ls.leave_staff))/(count(DISTINCT(ls.leave_staff))+count(DISTINCT(ls.id)))*100,2),0) + ifnull(round(count(DISTINCT(ls.leave_staff))/(count(DISTINCT(ls.leave_staff))+count(DISTINCT(ls.nowin_staff)))*100,2),0) leaveRate from (select * from lz_staff ll 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 760b967a..5cf6377b 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 diff --git a/target/classes/logback-spring.xml b/target/classes/logback-spring.xml index 739a6d10..3c3c33fa 100644 --- a/target/classes/logback-spring.xml +++ b/target/classes/logback-spring.xml @@ -8,6 +8,7 @@ +