From 9318e9731e4d87678405917f2555f6c088d93f7f Mon Sep 17 00:00:00 2001 From: fumeiai Date: Fri, 22 May 2020 16:27:24 +0800 Subject: [PATCH] update code --- .idea/workspace.xml | 97 ++---------------- .../app/service/impl/StaffServiceImpl.java | 17 ++- src/main/resources/logback-spring.xml | 1 + .../resources/mapper/generator/StaffDao.xml | 2 +- .../app/service/impl/StaffServiceImpl.class | Bin 14635 -> 15105 bytes target/classes/logback-spring.xml | 1 + 6 files changed, 25 insertions(+), 93 deletions(-) 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 760b967a1c7a43fde5a3e14b9f6e23f1fc80d015..5cf6377b69f66393e28eec48b23ce14b9d8daebc 100644 GIT binary patch delta 5829 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 delta 5367 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 +