From e8c61568eb7d5de36b22f1829e6e55fdf2bda044 Mon Sep 17 00:00:00 2001 From: fumeiai Date: Mon, 18 May 2020 09:53:51 +0800 Subject: [PATCH] add logic --- .idea/workspace.xml | 93 ++++++++++++-- pom.xml | 32 ++--- .../lz/modules/app/Dto/DepartmentsDto.java | 36 ++++++ .../lz/modules/app/Dto/StaffBaseInfoDto.java | 25 ++++ .../java/com/lz/modules/app/Dto/StaffDto.java | 44 +++++++ .../app/Dto/StaffEducationInfoDto.java | 17 +++ .../app/Dto/StaffOccupationInfoDto.java | 79 ++++++++++++ .../app/Dto/StaffProjectExperienceDto.java | 18 +++ .../modules/app/Dto/StaffWorkTransferDto.java | 15 +++ .../app/controller/DepartmentsController.java | 39 +++--- .../app/controller/StaffController.java | 109 ++++++++++++---- .../java/com/lz/modules/app/dao/StaffDao.java | 11 ++ .../lz/modules/app/dao/StaffEducationDao.java | 3 + .../modules/app/dao/StaffOccupationDao.java | 3 + .../app/dao/StaffProjectExperienceDao.java | 5 + .../app/dao/StaffWorkTransferRecordDao.java | 6 + .../com/lz/modules/app/enums/GenderEnum.java | 44 +++++++ .../modules/app/enums/MaritalStatusEnum.java | 43 +++++++ .../app/service/StaffEducationService.java | 6 + .../app/service/StaffOccupationService.java | 2 + .../StaffProjectExperienceService.java | 4 + .../lz/modules/app/service/StaffService.java | 10 ++ .../StaffWorkTransferRecordService.java | 4 + .../service/impl/DepartmentsServiceImpl.java | 1 - .../impl/StaffEducationServiceImpl.java | 11 ++ .../impl/StaffOccupationServiceImpl.java | 6 + .../StaffProjectExperienceServiceImpl.java | 14 ++- .../app/service/impl/StaffServiceImpl.java | 32 +++++ .../StaffWorkTransferRecordServiceImpl.java | 16 ++- .../app/utils/BeanConversionUtils.java | 32 +++++ .../lz/modules/sys/oauth2/OAuth2Filter.java | 26 ++-- .../resources/mapper/generator/StaffDao.xml | 40 +++++- .../mapper/generator/StaffEducationDao.xml | 4 + .../mapper/generator/StaffOccupationDao.xml | 6 +- .../generator/StaffProjectExperienceDao.xml | 4 + .../generator/StaffWorkTransferRecordDao.xml | 3 + src/main/resources/static/swagger/index.yaml | 4 +- src/test/java/com/lz/FumeiaiTest.java | 116 ++++++++++++++++-- .../lz/modules/app/Dto/DepartmentsDto.class | Bin 0 -> 3194 bytes .../lz/modules/app/Dto/StaffBaseInfoDto.class | Bin 0 -> 4899 bytes .../com/lz/modules/app/Dto/StaffDto.class | Bin 0 -> 4006 bytes .../app/Dto/StaffEducationInfoDto.class | Bin 0 -> 2945 bytes .../app/Dto/StaffOccupationInfoDto.class | Bin 0 -> 7706 bytes .../app/Dto/StaffProjectExperienceDto.class | Bin 0 -> 3017 bytes .../app/Dto/StaffWorkTransferDto.class | Bin 0 -> 2493 bytes .../controller/DepartmentsController.class | Bin 3148 -> 2993 bytes .../app/controller/StaffController.class | Bin 3052 -> 6274 bytes .../com/lz/modules/app/dao/StaffDao.class | Bin 863 -> 1556 bytes .../modules/app/dao/StaffEducationDao.class | Bin 414 -> 548 bytes .../modules/app/dao/StaffOccupationDao.class | Bin 979 -> 1109 bytes .../app/dao/StaffProjectExperienceDao.class | Bin 438 -> 641 bytes .../app/dao/StaffWorkTransferRecordDao.class | Bin 441 -> 744 bytes .../com/lz/modules/app/enums/GenderEnum.class | Bin 0 -> 2256 bytes .../modules/app/enums/MaritalStatusEnum.class | Bin 0 -> 2246 bytes .../app/service/StaffEducationService.class | Bin 560 -> 675 bytes .../app/service/StaffOccupationService.class | Bin 946 -> 1063 bytes .../StaffProjectExperienceService.class | Bin 584 -> 768 bytes .../lz/modules/app/service/StaffService.class | Bin 850 -> 1402 bytes .../StaffWorkTransferRecordService.class | Bin 587 -> 768 bytes .../service/impl/DepartmentsServiceImpl.class | Bin 5328 -> 5328 bytes .../impl/StaffEducationServiceImpl.class | Bin 1856 -> 2240 bytes .../impl/StaffOccupationServiceImpl.class | Bin 2847 -> 3019 bytes .../StaffProjectExperienceServiceImpl.class | Bin 1928 -> 2410 bytes .../app/service/impl/StaffServiceImpl.class | Bin 5028 -> 6411 bytes .../StaffWorkTransferRecordServiceImpl.class | Bin 1937 -> 2414 bytes .../app/utils/BeanConversionUtils.class | Bin 0 -> 2004 bytes .../lz/modules/sys/oauth2/OAuth2Filter.class | Bin 3898 -> 3717 bytes target/classes/mapper/generator/StaffDao.xml | 40 +++++- .../mapper/generator/StaffEducationDao.xml | 4 + .../mapper/generator/StaffOccupationDao.xml | 6 +- .../generator/StaffProjectExperienceDao.xml | 4 + .../generator/StaffWorkTransferRecordDao.xml | 3 + target/classes/static/swagger/index.yaml | 4 +- .../test-classes/com/lz/FumeiaiTest$1.class | Bin 761 -> 761 bytes target/test-classes/com/lz/FumeiaiTest.class | Bin 7161 -> 11029 bytes 75 files changed, 913 insertions(+), 111 deletions(-) create mode 100644 src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java create mode 100644 src/main/java/com/lz/modules/app/Dto/StaffBaseInfoDto.java create mode 100644 src/main/java/com/lz/modules/app/Dto/StaffDto.java create mode 100644 src/main/java/com/lz/modules/app/Dto/StaffEducationInfoDto.java create mode 100644 src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java create mode 100644 src/main/java/com/lz/modules/app/Dto/StaffProjectExperienceDto.java create mode 100644 src/main/java/com/lz/modules/app/Dto/StaffWorkTransferDto.java create mode 100644 src/main/java/com/lz/modules/app/enums/GenderEnum.java create mode 100644 src/main/java/com/lz/modules/app/enums/MaritalStatusEnum.java create mode 100644 src/main/java/com/lz/modules/app/utils/BeanConversionUtils.java create mode 100644 target/classes/com/lz/modules/app/Dto/DepartmentsDto.class create mode 100644 target/classes/com/lz/modules/app/Dto/StaffBaseInfoDto.class create mode 100644 target/classes/com/lz/modules/app/Dto/StaffDto.class create mode 100644 target/classes/com/lz/modules/app/Dto/StaffEducationInfoDto.class create mode 100644 target/classes/com/lz/modules/app/Dto/StaffOccupationInfoDto.class create mode 100644 target/classes/com/lz/modules/app/Dto/StaffProjectExperienceDto.class create mode 100644 target/classes/com/lz/modules/app/Dto/StaffWorkTransferDto.class create mode 100644 target/classes/com/lz/modules/app/enums/GenderEnum.class create mode 100644 target/classes/com/lz/modules/app/enums/MaritalStatusEnum.class create mode 100644 target/classes/com/lz/modules/app/utils/BeanConversionUtils.class diff --git a/.idea/workspace.xml b/.idea/workspace.xml index dadc0939..8715e8b2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,57 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -63,7 +114,7 @@ - + @@ -127,8 +178,8 @@ - + @@ -147,7 +198,7 @@ - + @@ -176,14 +227,34 @@ diff --git a/src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java b/src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java new file mode 100644 index 00000000..6ee4bc36 --- /dev/null +++ b/src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java @@ -0,0 +1,36 @@ +package com.lz.modules.app.Dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 部门表 + * + * @author fumeiai + * @email fumeiai@linzikg.com + * @date 2020-04-30 16:59:50 + */ +@Data +public class DepartmentsDto implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 飞书部门id + */ + private String departmentId; + /** + * 飞书上级部门id + */ + private String departmentParentId; + /** + * 飞书显示部门人数 + */ + private Integer memberCount; + /** + * 组织架构名称/部门名称 + */ + private String departmentName; + + +} diff --git a/src/main/java/com/lz/modules/app/Dto/StaffBaseInfoDto.java b/src/main/java/com/lz/modules/app/Dto/StaffBaseInfoDto.java new file mode 100644 index 00000000..9f56a55c --- /dev/null +++ b/src/main/java/com/lz/modules/app/Dto/StaffBaseInfoDto.java @@ -0,0 +1,25 @@ +package com.lz.modules.app.Dto; + +import lombok.Data; + +@Data +public class StaffBaseInfoDto { + + //姓名 + private String staffName; + //性别 + private Integer gender; + //生日 + private String birthday; + //婚姻状况 + private Integer maritalStatus; + //民族 + private String national; + //政治面貌 + private String politicalLandscape; + //联系电话 + private String mobile; + //现住址 + private String currentAddress; + +} diff --git a/src/main/java/com/lz/modules/app/Dto/StaffDto.java b/src/main/java/com/lz/modules/app/Dto/StaffDto.java new file mode 100644 index 00000000..ae710f30 --- /dev/null +++ b/src/main/java/com/lz/modules/app/Dto/StaffDto.java @@ -0,0 +1,44 @@ +package com.lz.modules.app.Dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 员工基本信息 + * + * @author fumeiai + * @email fumeiai@linzikg.com + * @date 2020-04-29 20:59:20 + */ +@Data +public class StaffDto implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 员工Id + */ + private Long staffId; + + /** + * 员工工号 + */ + private String staffNo; + /** + * 员工姓名 + */ + private String name; + /** + * 职位 + */ + private String position; + /** + * 人员状态【1：离职；0：在职】 + */ + private Integer staffStatus; + /** + * 是否是部门负责人 + */ + private Integer departmentLeader; + +} diff --git a/src/main/java/com/lz/modules/app/Dto/StaffEducationInfoDto.java b/src/main/java/com/lz/modules/app/Dto/StaffEducationInfoDto.java new file mode 100644 index 00000000..b975f09b --- /dev/null +++ b/src/main/java/com/lz/modules/app/Dto/StaffEducationInfoDto.java @@ -0,0 +1,17 @@ +package com.lz.modules.app.Dto; + +import lombok.Data; + +@Data +public class StaffEducationInfoDto { + + //学历 （初中/高中/大专/本科/硕士及以上） + private String education; + //毕业院校 + private String graduatedSchool; + //专业 + private String specialty; + //毕业日期 + private String graduationTime; + +} diff --git a/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java b/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java new file mode 100644 index 00000000..9974741f --- /dev/null +++ b/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java @@ -0,0 +1,79 @@ +package com.lz.modules.app.Dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 员工职业信息 + * + * @author fumeiai + * @email fumeiai@linzikg.com + * @date 2020-04-29 20:59:20 + */ +@Data +public class StaffOccupationInfoDto implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 员工工号 + */ + private String staffNo; + + /** + * 职位 + */ + private String position; + + /** + * 入职时间 + */ + private String entryTime; + + /** + * 人员状态【1：离职；0：在职】 + */ + private String staffStatus; + + /** + * 离职时间 + */ + private String resignationTime; + + /** + * 离职原因 + */ + private String resignationReasons; + + /** + * 劳动合同签订公司 + */ + private String signingCompany; + + /** + * 岗位最初从业时间 + */ + private String jobBeginTime; + + /** + * 工作经历 + */ + private String workExperience; + + /** + * 简历附件url + */ + private String resumeUrl; + + /** + * 项目经历 + */ + private List projectExperiences; + + /** + * 工作调转记录 + */ + private List workTransfers; + +} diff --git a/src/main/java/com/lz/modules/app/Dto/StaffProjectExperienceDto.java b/src/main/java/com/lz/modules/app/Dto/StaffProjectExperienceDto.java new file mode 100644 index 00000000..f673d0d8 --- /dev/null +++ b/src/main/java/com/lz/modules/app/Dto/StaffProjectExperienceDto.java @@ -0,0 +1,18 @@ +package com.lz.modules.app.Dto; + +import lombok.Data; + +@Data +public class StaffProjectExperienceDto { + + //项目名称 + private String projectName; + //项目时间起 + private String projectBeginTime; + //项目时间止 + private String projectEndTime; + //工作内容 + private String projectContent; + + +} diff --git a/src/main/java/com/lz/modules/app/Dto/StaffWorkTransferDto.java b/src/main/java/com/lz/modules/app/Dto/StaffWorkTransferDto.java new file mode 100644 index 00000000..bdec2396 --- /dev/null +++ b/src/main/java/com/lz/modules/app/Dto/StaffWorkTransferDto.java @@ -0,0 +1,15 @@ +package com.lz.modules.app.Dto; + +import lombok.Data; + +@Data +public class StaffWorkTransferDto { + + //时间 + private String transferTime; + //调转记录 + private String transferRecord; + //调转类型[平调/升职/降职] + private String transferType; + +} diff --git a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java index bc64d32d..1908e7fd 100644 --- a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java +++ b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java @@ -1,8 +1,11 @@ package com.lz.modules.app.controller; import java.util.Arrays; +import java.util.List; import java.util.Map; +import com.lz.modules.app.Dto.DepartmentsDto; +import com.lz.modules.app.utils.BeanConversionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; @@ -17,7 +20,6 @@ import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; - /** * 部门表 * @@ -26,7 +28,7 @@ import com.lz.common.utils.R; * @date 2020-04-30 16:59:50 */ @RestController -@RequestMapping("generator/departments") +@RequestMapping("staff/structure") public class DepartmentsController { @Autowired private DepartmentsService departmentsService; @@ -35,11 +37,11 @@ public class DepartmentsController { * 列表 */ @RequestMapping("/list") - @RequiresPermissions("generator:departments:list") - public R list(@RequestParam Map params){ - PageUtils page = departmentsService.queryPage(params); +// @RequiresPermissions("staff:structure:list") + public List list() { + List departmentList = BeanConversionUtils.listCopyToAnotherList(DepartmentsDto.class, departmentsService.list()); - return R.ok().put("page", page); + return departmentList; } @@ -47,10 +49,9 @@ public class DepartmentsController { * 信息 */ @RequestMapping("/info/{id}") - @RequiresPermissions("generator:departments:info") - public R info(@PathVariable("id") Long id){ - DepartmentsEntity departments = departmentsService.getById(id); - +// @RequiresPermissions("staff:structure::info") + public R info(@PathVariable("id") Long id) { + DepartmentsEntity departments = departmentsService.getById(id); return R.ok().put("departments", departments); } @@ -58,9 +59,9 @@ public class DepartmentsController { * 保存 */ @RequestMapping("/save") - @RequiresPermissions("generator:departments:save") - public R save(@RequestBody DepartmentsEntity departments){ - departmentsService.save(departments); + @RequiresPermissions("staff:structure:save") + public R save(@RequestBody DepartmentsEntity departments) { + departmentsService.save(departments); return R.ok(); } @@ -69,9 +70,9 @@ public class DepartmentsController { * 修改 */ @RequestMapping("/update") - @RequiresPermissions("generator:departments:update") - public R update(@RequestBody DepartmentsEntity departments){ - departmentsService.updateById(departments); + @RequiresPermissions("staff:structure:update") + public R update(@RequestBody DepartmentsEntity departments) { + departmentsService.updateById(departments); return R.ok(); } @@ -80,9 +81,9 @@ public class DepartmentsController { * 删除 */ @RequestMapping("/delete") - @RequiresPermissions("generator:departments:delete") - public R delete(@RequestBody Long[] ids){ - departmentsService.removeByIds(Arrays.asList(ids)); + @RequiresPermissions("staff:structure:delete") + public R delete(@RequestBody Long[] ids) { + departmentsService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/src/main/java/com/lz/modules/app/controller/StaffController.java b/src/main/java/com/lz/modules/app/controller/StaffController.java index 972ecb3e..e7b7c36c 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffController.java @@ -1,8 +1,13 @@ package com.lz.modules.app.controller; import java.util.Arrays; +import java.util.HashMap; +import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; +import com.lz.modules.app.Dto.*; +import com.lz.modules.app.service.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; @@ -12,12 +17,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.lz.modules.app.entity.StaffEntity; -import com.lz.modules.app.service.StaffService; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; - - /** * 员工基本信息表 * @@ -26,41 +28,102 @@ import com.lz.common.utils.R; * @date 2020-04-29 20:59:20 */ @RestController -@RequestMapping("generator/staff") +@RequestMapping("staff/info") public class StaffController { + @Autowired private StaffService staffService; + @Autowired + private StaffEducationService staffEducationService; + + @Autowired + private StaffOccupationService staffOccupationService; + + @Autowired + private StaffProjectExperienceService staffProjectExperienceService; + + @Autowired + private StaffWorkTransferRecordService staffWorkTransferRecordService; + /** * 列表 */ @RequestMapping("/list") - @RequiresPermissions("generator:staff:list") - public R list(@RequestParam Map params){ - PageUtils page = staffService.queryPage(params); +// @RequiresPermissions("staff:info:list") + public R list(@RequestParam String jsonString) { + //当前页 + int currentPage = 0; + //默认每页返回数量 + int limit = 10; + //部门Id + String departmentId = ""; + //员工姓名 + String name = ""; + //人员状态【1：离职；0：在职】 + Integer staffStatus = 0; - return R.ok().put("page", page); + Map params = JSON.parseObject(jsonString, Map.class); + + if (params.containsKey("page")) { + currentPage = Integer.parseInt(params.get("page").toString()); + } + + if (params.containsKey("limit")) { + limit = Integer.parseInt(params.get("limit").toString()); + } + + if (params.containsKey("departmentId")) { + departmentId = params.get("departmentId").toString(); + } + + if (params.containsKey("name")) { + name = params.get("name").toString(); + } + + if (params.containsKey("staffStatus")) { + staffStatus = Integer.parseInt(params.get("staffStatus").toString()); + } + List staffInfos = staffService.getStaffInfos(currentPage, limit, departmentId, name, staffStatus); + //总页码 + int maxCount = staffService.getStaffInfoCount(departmentId, name, staffStatus); + + R ret = R.ok(); + PageUtils pageInfo = new PageUtils(staffInfos, maxCount, limit, currentPage); + ret.put("page", pageInfo); + return ret; } /** * 信息 */ - @RequestMapping("/info/{id}") - @RequiresPermissions("generator:staff:info") - public R info(@PathVariable("id") Long id){ - StaffEntity staff = staffService.getById(id); - - return R.ok().put("staff", staff); + @RequestMapping("/query/{staffId}") + @RequiresPermissions("staff:info:query") + public R info(@PathVariable("staffId") Long id) { + StaffEntity staff = staffService.getById(id); + Map data = new HashMap(); + data.put("staffId", id); + StaffBaseInfoDto staffBaseInfoDto = staffService.getBaseInfo(id); + StaffEducationInfoDto staffEducationInfoDto = staffEducationService.getInfoByStaffId(id); + StaffOccupationInfoDto staffOccupationInfoDto = staffOccupationService.getOccupationByStaffId(id); + List staffProjectExperiences = staffProjectExperienceService.getProjectInfoByStaffId(id); + List staffWorkTransfers = staffWorkTransferRecordService.getWorkInfoByStaffId(id); + staffOccupationInfoDto.setProjectExperiences(staffProjectExperiences); + staffOccupationInfoDto.setWorkTransfers(staffWorkTransfers); + data.put("baseInfo", staffBaseInfoDto); + data.put("educationInfo", staffEducationInfoDto); + data.put("occupationInfo", staffOccupationInfoDto); + return R.ok().put("data", data); } /** * 保存 */ @RequestMapping("/save") - @RequiresPermissions("generator:staff:save") - public R save(@RequestBody StaffEntity staff){ - staffService.save(staff); + @RequiresPermissions("staff:info:save") + public R save(@RequestBody StaffEntity staff) { + staffService.save(staff); return R.ok(); } @@ -69,9 +132,9 @@ public class StaffController { * 修改 */ @RequestMapping("/update") - @RequiresPermissions("generator:staff:update") - public R update(@RequestBody StaffEntity staff){ - staffService.updateById(staff); + @RequiresPermissions("staff:info:update") + public R update(@RequestBody StaffEntity staff) { + staffService.updateById(staff); return R.ok(); } @@ -80,9 +143,9 @@ public class StaffController { * 删除 */ @RequestMapping("/delete") - @RequiresPermissions("generator:staff:delete") - public R delete(@RequestBody Long[] ids){ - staffService.removeByIds(Arrays.asList(ids)); + @RequiresPermissions("staff:info:delete") + public R delete(@RequestBody Long[] ids) { + staffService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/src/main/java/com/lz/modules/app/dao/StaffDao.java b/src/main/java/com/lz/modules/app/dao/StaffDao.java index 01e12a68..9760f2a0 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffDao.java @@ -1,5 +1,7 @@ package com.lz.modules.app.dao; +import com.lz.modules.app.Dto.StaffBaseInfoDto; +import com.lz.modules.app.Dto.StaffDto; import com.lz.modules.app.entity.StaffEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -23,4 +25,13 @@ public interface StaffDao extends BaseMapper { int addStaffBatch(@Param("staffs") List staffs); + StaffEntity getByName(@Param("name") String name); + + List getStaffInfos(@Param("departmentId") String departmentId, @Param("name") String name, @Param("staffStatus") Integer staffStatus, @Param("pageLimit") int pageLimit, @Param("startIndex") int startIndex); + + int getStaffInfoCount(@Param("departmentId") String departmentId, @Param("name") String name, @Param("staffStatus") Integer staffStatus); + + StaffBaseInfoDto getBaseInfo(@Param("staffId") Long staffId); + + } diff --git a/src/main/java/com/lz/modules/app/dao/StaffEducationDao.java b/src/main/java/com/lz/modules/app/dao/StaffEducationDao.java index 4ff3bb38..4a3ed0b7 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffEducationDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffEducationDao.java @@ -1,5 +1,6 @@ package com.lz.modules.app.dao; +import com.lz.modules.app.Dto.StaffEducationInfoDto; import com.lz.modules.app.entity.StaffEducationEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -14,4 +15,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface StaffEducationDao extends BaseMapper { + StaffEducationInfoDto getInfoByStaffId(Long staffId); + } diff --git a/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java b/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java index 32550740..c4bd1a70 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java @@ -1,5 +1,6 @@ package com.lz.modules.app.dao; +import com.lz.modules.app.Dto.StaffOccupationInfoDto; import com.lz.modules.app.entity.StaffOccupationEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -24,5 +25,7 @@ public interface StaffOccupationDao extends BaseMapper { int addStaffOccupationBatch(@Param("staffOccupations") List staffOccupations); + StaffOccupationInfoDto getOccupationByStaffId(@Param("staffId") Long staffId); + } diff --git a/src/main/java/com/lz/modules/app/dao/StaffProjectExperienceDao.java b/src/main/java/com/lz/modules/app/dao/StaffProjectExperienceDao.java index e732ccb7..9ff98dca 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffProjectExperienceDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffProjectExperienceDao.java @@ -1,9 +1,12 @@ package com.lz.modules.app.dao; +import com.lz.modules.app.Dto.StaffProjectExperienceDto; import com.lz.modules.app.entity.StaffProjectExperienceEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 员工项目经历表 * @@ -14,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface StaffProjectExperienceDao extends BaseMapper { + List getProjectInfoByStaffId(Long id); + } diff --git a/src/main/java/com/lz/modules/app/dao/StaffWorkTransferRecordDao.java b/src/main/java/com/lz/modules/app/dao/StaffWorkTransferRecordDao.java index bd469e61..cd2503c2 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffWorkTransferRecordDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffWorkTransferRecordDao.java @@ -1,8 +1,12 @@ package com.lz.modules.app.dao; +import com.lz.modules.app.Dto.StaffWorkTransferDto; import com.lz.modules.app.entity.StaffWorkTransferRecordEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 员工工作调转记录表 @@ -14,4 +18,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface StaffWorkTransferRecordDao extends BaseMapper { + List getWorkInfoByStaffId(@Param("staffId") Long staffId); + } diff --git a/src/main/java/com/lz/modules/app/enums/GenderEnum.java b/src/main/java/com/lz/modules/app/enums/GenderEnum.java new file mode 100644 index 00000000..f9daf1b0 --- /dev/null +++ b/src/main/java/com/lz/modules/app/enums/GenderEnum.java @@ -0,0 +1,44 @@ +package com.lz.modules.app.enums; + + +public enum GenderEnum { + + male("男", 1), + female("女", 2), + unknow("未知", 3); + + private String name; + private Integer code; + + GenderEnum(String name, Integer code) { + this.name = name; + this.code = code; + } + + public static Integer findCodeByName(String name) { + for (GenderEnum gender : GenderEnum.values()) { + if (gender.getName().equals(name)) { + return gender.getCode(); + } + } + return null; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + +} diff --git a/src/main/java/com/lz/modules/app/enums/MaritalStatusEnum.java b/src/main/java/com/lz/modules/app/enums/MaritalStatusEnum.java new file mode 100644 index 00000000..01d4230b --- /dev/null +++ b/src/main/java/com/lz/modules/app/enums/MaritalStatusEnum.java @@ -0,0 +1,43 @@ +package com.lz.modules.app.enums; + + +public enum MaritalStatusEnum { + + unmarried("未婚", 0), + married("已婚", 1); + + private String name; + private Integer code; + + MaritalStatusEnum(String name, Integer code) { + this.name = name; + this.code = code; + } + + public static Integer findCodeByName(String name) { + for (MaritalStatusEnum gender : MaritalStatusEnum.values()) { + if (gender.getName().equals(name)) { + return gender.getCode(); + } + } + return null; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + +} diff --git a/src/main/java/com/lz/modules/app/service/StaffEducationService.java b/src/main/java/com/lz/modules/app/service/StaffEducationService.java index 37a04d97..7a7ae0df 100644 --- a/src/main/java/com/lz/modules/app/service/StaffEducationService.java +++ b/src/main/java/com/lz/modules/app/service/StaffEducationService.java @@ -2,6 +2,7 @@ package com.lz.modules.app.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; +import com.lz.modules.app.Dto.StaffEducationInfoDto; import com.lz.modules.app.entity.StaffEducationEntity; import java.util.Map; @@ -16,5 +17,10 @@ import java.util.Map; public interface StaffEducationService extends IService { PageUtils queryPage(Map params); + + StaffEducationInfoDto getInfoByStaffId(Long staffId); + + + } diff --git a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java index c263209a..61082eca 100644 --- a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java +++ b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java @@ -2,6 +2,7 @@ package com.lz.modules.app.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; +import com.lz.modules.app.Dto.StaffOccupationInfoDto; import com.lz.modules.app.entity.StaffOccupationEntity; import java.util.List; @@ -24,5 +25,6 @@ public interface StaffOccupationService extends IService int addStaffOccupationBatch(List staffs); + StaffOccupationInfoDto getOccupationByStaffId(Long id); } diff --git a/src/main/java/com/lz/modules/app/service/StaffProjectExperienceService.java b/src/main/java/com/lz/modules/app/service/StaffProjectExperienceService.java index 0bda36c7..6ef6fd17 100644 --- a/src/main/java/com/lz/modules/app/service/StaffProjectExperienceService.java +++ b/src/main/java/com/lz/modules/app/service/StaffProjectExperienceService.java @@ -2,8 +2,10 @@ package com.lz.modules.app.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; +import com.lz.modules.app.Dto.StaffProjectExperienceDto; import com.lz.modules.app.entity.StaffProjectExperienceEntity; +import java.util.List; import java.util.Map; /** @@ -16,5 +18,7 @@ import java.util.Map; public interface StaffProjectExperienceService extends IService { PageUtils queryPage(Map params); + + List getProjectInfoByStaffId(Long id); } diff --git a/src/main/java/com/lz/modules/app/service/StaffService.java b/src/main/java/com/lz/modules/app/service/StaffService.java index 81fe7952..f0d98636 100644 --- a/src/main/java/com/lz/modules/app/service/StaffService.java +++ b/src/main/java/com/lz/modules/app/service/StaffService.java @@ -2,6 +2,8 @@ package com.lz.modules.app.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; +import com.lz.modules.app.Dto.StaffBaseInfoDto; +import com.lz.modules.app.Dto.StaffDto; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.job.model.responseBo.DepartmentStaffBo; @@ -23,5 +25,13 @@ public interface StaffService extends IService { StaffEntity getStaffInfoByOpenId(String openId); + StaffEntity getByName(String name); + + List getStaffInfos(int currentPage, int limit, String departmentId, String name, Integer staffStatus); + + int getStaffInfoCount(String departmentId, String name, Integer staffStatus); + + StaffBaseInfoDto getBaseInfo(Long staffId); + } diff --git a/src/main/java/com/lz/modules/app/service/StaffWorkTransferRecordService.java b/src/main/java/com/lz/modules/app/service/StaffWorkTransferRecordService.java index 35074f69..049f70e8 100644 --- a/src/main/java/com/lz/modules/app/service/StaffWorkTransferRecordService.java +++ b/src/main/java/com/lz/modules/app/service/StaffWorkTransferRecordService.java @@ -2,8 +2,10 @@ package com.lz.modules.app.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; +import com.lz.modules.app.Dto.StaffWorkTransferDto; import com.lz.modules.app.entity.StaffWorkTransferRecordEntity; +import java.util.List; import java.util.Map; /** @@ -16,5 +18,7 @@ import java.util.Map; public interface StaffWorkTransferRecordService extends IService { PageUtils queryPage(Map params); + + List getWorkInfoByStaffId(Long staffId); } diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java index f64fc998..7f7decfc 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java @@ -9,7 +9,6 @@ import com.lz.common.utils.Query; import com.lz.modules.app.dao.DepartmentsDao; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.service.DepartmentsService; -import com.lz.modules.job.business.FeishuBusiness; import com.lz.modules.job.model.responseBo.DepartmentInfosBo; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffEducationServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffEducationServiceImpl.java index 08329e3f..babbf248 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffEducationServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffEducationServiceImpl.java @@ -1,5 +1,6 @@ package com.lz.modules.app.service.impl; +import com.lz.modules.app.Dto.StaffEducationInfoDto; import org.springframework.stereotype.Service; import java.util.Map; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,10 +13,15 @@ import com.lz.modules.app.dao.StaffEducationDao; import com.lz.modules.app.entity.StaffEducationEntity; import com.lz.modules.app.service.StaffEducationService; +import javax.annotation.Resource; + @Service("staffEducationService") public class StaffEducationServiceImpl extends ServiceImpl implements StaffEducationService { + @Resource + StaffEducationDao staffEducationDao; + @Override public PageUtils queryPage(Map params) { IPage page = this.page( @@ -26,4 +32,9 @@ public class StaffEducationServiceImpl extends ServiceImpl implements StaffProjectExperienceService { + @Resource + StaffProjectExperienceDao staffProjectExperienceDao; + @Override public PageUtils queryPage(Map params) { IPage page = this.page( new Query().getPage(params), new QueryWrapper() ); - return new PageUtils(page); } + @Override + public List getProjectInfoByStaffId(Long staffId) { + return staffProjectExperienceDao.getProjectInfoByStaffId(staffId); + } + } 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 5ca67614..403fbec7 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 @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import com.lz.common.utils.PageUtils; import com.lz.common.utils.Query; +import com.lz.modules.app.Dto.StaffBaseInfoDto; +import com.lz.modules.app.Dto.StaffDto; import com.lz.modules.app.dao.StaffDao; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; @@ -68,6 +70,36 @@ public class StaffServiceImpl extends ServiceImpl impleme return staffDao.getStaffInfoByOpenId(openId); } + @Override + public StaffEntity getByName(String name) { + return staffDao.getByName(name); + } + + @Override + public List getStaffInfos(int currentPage, int limit, String departmentId, String name, Integer intoStaffStatus) { + Integer staffStatus = 0; + if (intoStaffStatus == 1) { + staffStatus = intoStaffStatus; + } + List staffInfos = staffDao.getStaffInfos(departmentId, name, staffStatus, limit, currentPage * limit); + + return staffInfos; + } + + @Override + public int getStaffInfoCount(String departmentId, String name, Integer intoStaffStatus) { + Integer staffStatus = 0; + if (intoStaffStatus == 1) { + staffStatus = intoStaffStatus; + } + return staffDao.getStaffInfoCount(departmentId, name, staffStatus); + } + + @Override + public StaffBaseInfoDto getBaseInfo(Long staffId) { + return staffDao.getBaseInfo(staffId); + } + private StaffEntity convertStaffEntity(DepartmentStaffBo staffBo) { StaffEntity staffEntity = new StaffEntity(); staffEntity.setName(staffBo.getName());//员工姓名 diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffWorkTransferRecordServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffWorkTransferRecordServiceImpl.java index 2770b359..a1886537 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffWorkTransferRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffWorkTransferRecordServiceImpl.java @@ -1,7 +1,12 @@ package com.lz.modules.app.service.impl; +import com.lz.modules.app.Dto.StaffWorkTransferDto; +import com.lz.modules.app.dao.StaffProjectExperienceDao; import org.springframework.stereotype.Service; + +import java.util.List; import java.util.Map; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -12,18 +17,27 @@ import com.lz.modules.app.dao.StaffWorkTransferRecordDao; import com.lz.modules.app.entity.StaffWorkTransferRecordEntity; import com.lz.modules.app.service.StaffWorkTransferRecordService; +import javax.annotation.Resource; + @Service("staffWorkTransferRecordService") public class StaffWorkTransferRecordServiceImpl extends ServiceImpl implements StaffWorkTransferRecordService { + @Resource + StaffWorkTransferRecordDao staffWorkTransferRecordDao; + @Override public PageUtils queryPage(Map params) { IPage page = this.page( new Query().getPage(params), new QueryWrapper() ); - return new PageUtils(page); } + @Override + public List getWorkInfoByStaffId(Long staffId) { + return staffWorkTransferRecordDao.getWorkInfoByStaffId(staffId); + } + } diff --git a/src/main/java/com/lz/modules/app/utils/BeanConversionUtils.java b/src/main/java/com/lz/modules/app/utils/BeanConversionUtils.java new file mode 100644 index 00000000..b50af5bd --- /dev/null +++ b/src/main/java/com/lz/modules/app/utils/BeanConversionUtils.java @@ -0,0 +1,32 @@ +package com.lz.modules.app.utils; + +import org.apache.shiro.util.CollectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; + +import java.util.ArrayList; +import java.util.List; + +public class BeanConversionUtils { + private static Logger logger = LoggerFactory.getLogger(BeanConversionUtils.class); + + public static List listCopyToAnotherList(Class target, List soueceList) { + if (!CollectionUtils.isEmpty(soueceList)) { + List targetList = new ArrayList(); + for (T t : soueceList) { + try { + F f = target.newInstance(); + BeanUtils.copyProperties(t, f); + targetList.add(f); + } catch (Exception e) { + logger.error(e.getMessage()); + } + } + return targetList; + } else { + return null; + } + } + +} diff --git a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java index c36dadc1..9522ae20 100644 --- a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java +++ b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java @@ -56,19 +56,19 @@ public class OAuth2Filter extends AuthenticatingFilter { protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception { //获取请求token，如果token不存在，直接返回401 String token = getRequestToken((HttpServletRequest) request); - if(StringUtils.isBlank(token)){ - HttpServletResponse httpResponse = (HttpServletResponse) response; - httpResponse.setHeader("Access-Control-Allow-Credentials", "true"); - httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin()); - - String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "invalid token")); - - httpResponse.getWriter().print(json); - - return false; - } - - return executeLogin(request, response); +// if(StringUtils.isBlank(token)){ +// HttpServletResponse httpResponse = (HttpServletResponse) response; +// httpResponse.setHeader("Access-Control-Allow-Credentials", "true"); +// httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin()); +// +// String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "invalid token")); +// +// httpResponse.getWriter().print(json); +// +// return false; +// } + return true; +// return executeLogin(request, response); } @Override diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index d3696a56..db3b1550 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -3,7 +3,7 @@ - + @@ -92,5 +92,43 @@ + + + + + + + + + diff --git a/src/main/resources/mapper/generator/StaffEducationDao.xml b/src/main/resources/mapper/generator/StaffEducationDao.xml index c3f145e2..5ac21b47 100644 --- a/src/main/resources/mapper/generator/StaffEducationDao.xml +++ b/src/main/resources/mapper/generator/StaffEducationDao.xml @@ -16,5 +16,9 @@ + + diff --git a/src/main/resources/mapper/generator/StaffOccupationDao.xml b/src/main/resources/mapper/generator/StaffOccupationDao.xml index 2ebfa2b6..3b5ff56c 100644 --- a/src/main/resources/mapper/generator/StaffOccupationDao.xml +++ b/src/main/resources/mapper/generator/StaffOccupationDao.xml @@ -3,7 +3,7 @@ - + @@ -31,6 +31,10 @@ + update lz_staff_occupation set status=#{status} where is_delete=0 and staff_id = #{staffId} diff --git a/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml b/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml index 3ca5b209..2c30021c 100644 --- a/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml +++ b/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml @@ -16,5 +16,9 @@ + + diff --git a/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml b/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml index 59f32d9a..f5dccb94 100644 --- a/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml +++ b/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml @@ -14,6 +14,9 @@ + diff --git a/src/main/resources/static/swagger/index.yaml b/src/main/resources/static/swagger/index.yaml index b5751db0..54f2c4a0 100644 --- a/src/main/resources/static/swagger/index.yaml +++ b/src/main/resources/static/swagger/index.yaml @@ -1,8 +1,8 @@ swagger: '2.0' info: - description: lz_management是一个轻量级的Java快速开发平台，能快速开发项目并交付【接私活利器】 + description: 霖梓控股用于对员工进行数字化管理的平台 version: 1.0.0 - title: 人人快速开发平台 + title: 企业员工数字化管理平台 basePath: /lz_management diff --git a/src/test/java/com/lz/FumeiaiTest.java b/src/test/java/com/lz/FumeiaiTest.java index c1590973..784562a8 100644 --- a/src/test/java/com/lz/FumeiaiTest.java +++ b/src/test/java/com/lz/FumeiaiTest.java @@ -1,11 +1,18 @@ package com.lz; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.google.common.collect.Lists; import com.lz.common.utils.DateUtils; +import com.lz.common.utils.StringUtil; import com.lz.modules.app.entity.*; import com.lz.modules.app.enums.ExcelStaffHeardEnum; +import com.lz.modules.app.enums.GenderEnum; +import com.lz.modules.app.enums.MaritalStatusEnum; +import com.lz.modules.app.service.*; import com.lz.modules.job.business.FeishuBusiness; +import com.lz.modules.sys.entity.SysCaptchaEntity; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.*; import org.junit.Test; @@ -14,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import javax.annotation.Resource; import java.io.File; import java.io.IOException; import java.text.DecimalFormat; @@ -30,7 +38,7 @@ public class FumeiaiTest { @Test public void contextLoads() throws IOException, InvalidFormatException { -// feishuBusiness.getFeishuDepartmentsIntoData(); + feishuBusiness.getFeishuDepartmentsIntoData(); File xlsFile = new File("/Users/fumeiai/tmp/员工档案字段表-0427.xlsx"); // 获得工作簿 @@ -64,14 +72,21 @@ public class FumeiaiTest { if (row == 0) { headList.add(cellValue); } else { + if (StringUtil.equals(GenderEnum.female.getName(), cellValue) || StringUtil.equals(GenderEnum.male.getName(), cellValue)) { + cellValue = GenderEnum.findCodeByName(cellValue).toString(); + } else if (StringUtil.equals(MaritalStatusEnum.unmarried.getName(), cellValue) || StringUtil.equals(MaritalStatusEnum.married.getName(), cellValue)) { + cellValue = MaritalStatusEnum.findCodeByName(cellValue).toString(); + } dataMap.put(ExcelStaffHeardEnum.findFieldByName(headList.get(col)), cellValue); } } + if (dataMap.size() > 0) { + if (i == 1) { + dataMap.put("staffStatus", "1"); + } switch (i) { case 0: - sheet12List.add(dataMap); - break; case 1: sheet12List.add(dataMap); break; @@ -90,6 +105,17 @@ public class FumeiaiTest { enterDatabase(sheet12List, sheet3List, sheet4List); } + @Resource + StaffService staffService; + @Resource + StaffOccupationService staffOccupationService; + @Resource + StaffEducationService staffEducationService; + @Resource + StaffProjectExperienceService staffProjectExperienceService; + @Resource + StaffWorkTransferRecordService staffWorkTransferRecordService; + public void enterDatabase(List> sheet12List, List> sheet3List, List> sheet4List) { List staffs = Lists.newArrayList(); List staffOccupations = Lists.newArrayList(); @@ -98,30 +124,94 @@ public class FumeiaiTest { List staffWorkTransferRecords = Lists.newArrayList(); for (Map map : sheet12List) { - staffs.add(JSON.parseObject(JSON.toJSONString(map), StaffEntity.class)); - staffOccupations.add(JSON.parseObject(JSON.toJSONString(map), StaffOccupationEntity.class)); - staffEducations.add(JSON.parseObject(JSON.toJSONString(map), StaffEducationEntity.class)); + StaffEntity staffEntity = JSON.parseObject(JSON.toJSONString(map), StaffEntity.class); + StaffOccupationEntity occupationEntity = JSON.parseObject(JSON.toJSONString(map), StaffOccupationEntity.class); + StaffEducationEntity educationEntity = JSON.parseObject(JSON.toJSONString(map), StaffEducationEntity.class); +// staffs.add(JSON.parseObject(JSON.toJSONString(map), StaffEntity.class)); +// staffOccupations.add(JSON.parseObject(JSON.toJSONString(map), StaffOccupationEntity.class)); +// staffEducations.add(JSON.parseObject(JSON.toJSONString(map), StaffEducationEntity.class)); // for (Map.Entry element : map.entrySet()) { // System.out.print(element.getKey() + "=" + element.getValue() + " "); // } - System.out.println(JSON.parseObject(JSON.toJSONString(map), StaffEntity.class).toString()); - System.out.println(JSON.parseObject(JSON.toJSONString(map), StaffOccupationEntity.class).toString()); - System.out.println(JSON.parseObject(JSON.toJSONString(map), StaffEducationEntity.class).toString()); + StaffEntity Staff = staffService.getByName(staffEntity.getName()); + if (Staff == null) { + staffService.save(staffEntity); + } else { + staffEntity.setId(Staff.getId()); + staffService.updateById(staffEntity); + } + StaffOccupationEntity occupation = staffOccupationService.getOne(new QueryWrapper().eq("staff_id", staffEntity.getId())); + if (occupation == null) { + occupationEntity.setStaffId(staffEntity.getId()); + staffOccupationService.save(occupationEntity); + } else { + occupationEntity.setId(occupation.getId()); + staffOccupationService.updateById(occupationEntity); + } + + StaffEducationEntity education = staffEducationService.getOne(new QueryWrapper().eq("staff_id", staffEntity.getId())); + if (education == null) { + educationEntity.setStaffId(staffEntity.getId()); + staffEducationService.save(educationEntity); + } else { + educationEntity.setId(education.getId()); + staffEducationService.updateById(educationEntity); + } +// +// +// System.out.println(JSON.parseObject(JSON.toJSONString(map), StaffEntity.class).toString()); +// System.out.println(JSON.parseObject(JSON.toJSONString(map), StaffOccupationEntity.class).toString()); +// System.out.println(JSON.parseObject(JSON.toJSONString(map), StaffEducationEntity.class).toString()); } for (Map map : sheet3List) { - staffProjectExperiences.add(JSON.parseObject(JSON.toJSONString(map), StaffProjectExperienceEntity.class)); + StaffProjectExperienceEntity staffProjectExperienceEntity = JSON.parseObject(JSON.toJSONString(map), StaffProjectExperienceEntity.class); + StaffEntity Staff = staffService.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 { + staffProjectExperienceEntity.setId(projectExperienceEntity.getId()); + staffProjectExperienceEntity.setIsDelete(0); + staffProjectExperienceService.updateById(staffProjectExperienceEntity); + } + } + +// staffProjectExperiences.add(JSON.parseObject(JSON.toJSONString(map), StaffProjectExperienceEntity.class)); // for (Map.Entry element : map.entrySet()) { // System.out.print(element.getKey() + "=" + element.getValue() + " "); // } - System.out.println(JSON.parseObject(JSON.toJSONString(map), StaffProjectExperienceEntity.class).toString()); +// System.out.println(JSON.parseObject(JSON.toJSONString(map), StaffProjectExperienceEntity.class).toString()); } for (Map map : sheet4List) { - staffWorkTransferRecords.add(JSON.parseObject(JSON.toJSONString(map), StaffWorkTransferRecordEntity.class)); + StaffWorkTransferRecordEntity staffWorkTransferRecordEntity = JSON.parseObject(JSON.toJSONString(map), StaffWorkTransferRecordEntity.class); + StaffEntity Staff = staffService.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()); + staffWorkTransferRecordService.save(staffWorkTransferRecordEntity); + } else { + staffWorkTransferRecordEntity.setId(workTransferRecordEntity.getId()); + staffWorkTransferRecordEntity.setIsDelete(0); + staffWorkTransferRecordService.updateById(staffWorkTransferRecordEntity); + } + } + + +// staffWorkTransferRecords.add(JSON.parseObject(JSON.toJSONString(map), StaffWorkTransferRecordEntity.class)); // for (Map.Entry element : map.entrySet()) { // System.out.print(element.getKey() + "=" + element.getValue() + " "); // } - System.out.println(JSON.parseObject(JSON.toJSONString(map), StaffWorkTransferRecordEntity.class).toString()); +// System.out.println(JSON.parseObject(JSON.toJSONString(map), StaffWorkTransferRecordEntity.class).toString()); } } diff --git a/target/classes/com/lz/modules/app/Dto/DepartmentsDto.class b/target/classes/com/lz/modules/app/Dto/DepartmentsDto.class new file mode 100644 index 0000000000000000000000000000000000000000..e974d967a8de216c9b8edb8b1ab456b3a0105271 GIT binary patch literal 3194 zcma)8U2_vv7=BK&Uro1dnv#}i84DKaCs9 z<&0O(IO8qMI9w>BWkzQly}=oOlZemR-DG#uIMdRe^PKlQ@0<7Ygunm&^>+Yo;9d#` zvEBm>AIRlHx!jb?Egc`FxPL5{PbBM8i9VCdZMj%dwxMG)g?_9XD9YV7aL2%wge3!I z1KSeb)ltz=6-YPidfBS1+x14-sohvw6cCpM`WBp8!?kMex>ae~DjkzQLclEAJ67GT z+BJ8nD3Dp+wm!G=6|1(DUvul_+SVL}A?K=95174GySic57o29z6&Q->E!A9m%dS(g zKU7?`sWe)V7XkgSDVt@b!($SNoLvEWDpiZ;W-d0ZmHZ5 zIJUg$RP&Yl`KnWFR_sRJ+S$o3x=wzv9Z7>ne*D0e?S?`b-hqk9h@qMm;pc5fkx-2XD9Z4xJ*NO#db?hk)O*XxvZQ(Hl`f$i1L_6!%>?phosTL zn1vwy_PwT6k>;aXS2nioO?Phc7F)%Mw?J?upgL~JuG6Zl!FX6!uV=iw4&g`#F%02g zCq2AMdrGm!8uZyQ*-(dVKez*(c71W*nrm&|U9on&F5<{>QUr`mt9D){gRo>ZN`51< zE0-AS)oV*D=a~#*t!_7(6*hQZM|?w(a~Oa*9&>acLh`*aT*vP^fz+DQtZ&*E%Cg~y z!akMFdt6STiKBSM#7h`6aab-#@Un?E8zW+LCoOrv&ah{E~aWKt$2RsOf4?>LJYWqDi+2S+l8XsVR z98|o(e=ib`^4Uz_5dT;g53@Ah&gytO3&g#TT$YdPF`n|=1$TAo3B*qX2~2R+JYhd3 ziA|q?DNOSuWYxIFm48O!#}4IeS7jEui*mA4IoDO04bnwf=~O<{Rhf;|MOp1sKHOFL z1YT!mWXuKb3GUj|^e;$s&)Bff2r?$KDN7>wmCHm69@0F#+1+Gvzb0jM+a?ctCQst6 zZeA+;H7OgVZSsg`^6l|f~3DNix@5aw)7*+ox_kt(R9qzYP2l^pFUG7r(0Q*&B` z)LYO=>Ma;KU6PD|r00wX$t?7cWEN7n9!W|Cq@G-=MN%Ho>*StE+3}-k*Znc(aGK#~ z@jd1_Jqf;%U*imANpilzJ46aD;x5h-saS!HcZoDqZ~^CtbkupbKxE(>j{PE055DEV zpC?L@1)RiyZv2CO9T%TrSjQ#)8sZra`mpDJV5=MFSQJIR$3g3yqQkPmRap%g=iV2= z?{Bpor^@JLoI!ujdu8SuP7y~&d`S~J4eg}oPAl_XF-OyLC6>}iPd|h{yNkZtQl2U( z@*<}MH-;>*f7M%1y(`w%Q!;XD>&h%>-j&wAV#TR7+Pz4Zd|v|Rlc-{uiRYIq%dkq6 zU|R3s3Ij@V99D3ZNMX@V;C&($H!*^1M4FfUA7DJEKw0J!U(s0XUe9U$q k%nbRscNYgTSs$BHKFnnoBc0D@^ef|RkYj=CUK`!`4_YEz9RL6T literal 0 HcmV?d00001 diff --git a/target/classes/com/lz/modules/app/Dto/StaffBaseInfoDto.class b/target/classes/com/lz/modules/app/Dto/StaffBaseInfoDto.class new file mode 100644 index 0000000000000000000000000000000000000000..6b33d4a9c16879f0c29beb69b4b1a3db801875f5 GIT binary patch literal 4899 zcmb_f+jARd75}X)X;;$fZrNEJz)jW0*O)+|uue*wG!6#a2~7#4+`5((Td6Fm(z?)c zr_e$vwA>*NJdznEGhBwc!)2KAK$+o@VTR%I!k@tmCH&5}ySl75;0IedtVuMcN&Z_yH;!OE;XN8+HG&`HS4`4r_)(_&~5W%Jn$K(S6^*iZBxNRnA>$% zsl7am&&&>;wV#O;S?B#^R7NO+bY#dm)6YnOyYP0_SQwG%lmcfU8W^P&)^Uf!*0PD#4khA&?&eJpMt8PQ*ak~ z3ULfhK^#6svi|s<)8s>qJpYBwYxSDDJo|_Stvy%EI))Y*Wv;UcQNo3)7<+r%szS@i^|~FASdEYd%&22PvnZ zhQ;CW;ZMnfgVR4Qr|bwn=<)-DE8yb}zS^pMg&K&-Z4$-gLe=^6b0o;?v}V}ToZFIL;Iy)F;KS%5*A?H-2 zGYcicc`WRliF9UxML5U9&e=$37G{KVBJ7-xbY?+EI48r-#Yks1LWHv(b}mOcvwJ(IJh)hLl0m54os9zB@W(>aZbYX7xj!P$Buk@ro$+ zJl8Tu(#rhY50Qx9oc}G-*O3^zIsXdM>kD)H$fzxWxv@ZD#}|K(j1_+s#Tzget@u8& z0V8K8NXgkrD(-)=F5(AyVGfNy^)Xr3=aMNxEeWkqUN-q=KEcQbJ1mq?DB& zA{FfnNk!YVGD0$a644N;WM@e#**PmKq?}L6TDc)o+0K(xwhLBXNClsiw+cg~al1&; zxLvY}LMr*BqE!k=@tf?_F@&f8D_(|!zSdT-jtyQ(MLUTL?DZI`+A&7k|S0i1<$!UczOf6yNYa#`}rV*vE_b08s|N#&ftr zWa4jl437|H@ekDTL82VrS}XVvQC>^petejypxwn6nzf^d>?s5s@^&>JQGr#lH=Hc9DB1f5#*RzyTB*! zm;D7*_WXXL>Ll;z7(-+j=ZQo!d{;82*B**k)D|_%n8hVl1COqQT^i;ZFPl*NEc$2K@oc zM~d+Zo@NCE6k~@FQMKn<$0fVGGYbkRV8aR?7=WJo1FJPy56_QDA@P&Wt^A25q)#&pr2^-#K%> z?z!%FKY#I00KdcQS?t953@lWItO}_KsS8;Xa=}C+%e5)Q7ko>&i$Wd~^0<&Egj^Eo zlO~?ZqKNYr{wC|+g*dhMZ^ zBO0`08ghs0wWjaZ{8MhVuQ})q`|2BD^ht|iZ|ShdN8MsJNuYe;){!ApHbRD7iI(1V3SjVPG9B&VdtRG`EC?@ zf9%`QSxLb*H|$`5-7LsabK(4)yQZ3x7oPW$H)O%B9hFp(U2&T$L4UK^XPAlOCuZi3 zGF9Z$4X@d%`b2e75V8`kF&spf8SVsP2gu0b{^89&S$;j}1$N8HdaJSE-CdE}B)+Pf zu}3bxjXjvMaWihQu^S^cMum(C8OMZ;Nla+C;eXsQ8)q zW5109LjH`uXxP@7IDvSl+~q?MEpZz0U|?dXJ2^bnMs2KMFE3ZenV?NM0Mt>1Geiy5%B5for8!!>8b`=v z{JKQHu0&Ove~UXmZ*FX ze_)AkWpW*^DX!_U@z0P-uGL_G2x}#El;+TIhFZIffl-=epye}n$Z zuqVsl{D3*0_3-8T9`odM+=I_>KRJVvk8qq^8dbcB2gvb-#;Z6% z&ca(bkCWswcpDxbB$vfH3;hteUVO#dbc&pfe{&H3kz5Y{!F4!IE{})l=`2d7brpFN zkNku|6My1gOZy4e25jd4VxzlzjLo6Ts~WcOK87pfz>uzxETuMODVPREJ4*&VlPnz) zHH{mY27G@>Ibc%v(nN-$4-3=#^#iJ@b`+*p*iu$u{4&hRb@V?f=eDDZpsa@yOByW@ z)fTZ8skI}yG0p@Lgdz9f z1N;?_GCl+E!zGtuDc{3crlE&#=W|#fr{f?W{zY;I%Qwf8OJn#P$4lf)yn$_4CTB@; zwOz1(;epQLY8ng5|2zFcW1W3U4oWa0K!njZ9)+-U4Awz*pN3#_Be;W45QHk$CY6p> zvMf~0Bq?@ue^pF%=9@pHg08}|%(?u+IQ=Dx4}Xq<;x+3iNpr1Zu(&PYITK37YXd$f qd^zAb21>>40pBP1>jJ(Y{0{Q#xW4-tjsIvl9rl5S3Oz{S+s34Uu=HBG5e}4H5zze8l zu@5U5XsAeWL5hn~T+;Domg{9HRwe3+)ZUWfsuXWa+dDe0WigBu1J~vHu7URqyl>zG z10PDm4IQ>X#;J9xw%2f50>zb^_Q!UqX}2~?t6sa&+E@_CZ?x@N$M&4sYPIgVO}cDv zIn{>U^ga<74o~TSrLpMTZ^rpO!Y=TBqr3m+Y;r(izWXQug}#Qa9n{*1Ah8b2K*` zFER^^PE99OQY7l!U@_8lwO7wb4-=JSZudnWo7x>*mRhJdUfr!-vfK8i<2h{>Ql#hZ zFVYzQVhQ0-y$WBhixXt?qam%O= z*~RWy0NiB{BF3l>BgQOy;t``_M*9Lr<{^?kyhPKyXu^6$niXo zIBJLF{V?%3o-nZ=mWcyWJSN3BEP=WIGq)yQ#q%a6anM9bYR^jTIVq;3IEmK;_6^?1 zQ=LY$CK;Yc%y25Ae9^=jsvMKKiGijp^1{qbL~Y@AB*KJ^p-oJiSjIulbuWcr%-DTi zNT*d3m`}P3yRJu=^8%jYDn}U?=AGMThp}(?={>nyj9fFW;rhJmS5?8@how*0` zqYs;))B+>J0%oW`jc2$MvaOW;&Oagb0}oS}pbVTdiOysq!8twXoJ({jg9*;cpz~0o zGnr3tRtKH)iO$oQVR5qNGS`$Wa%T2tq>?+fH$Wihm~4ooL|~SFs^F%;&0KQG^rME9 z>_#CE_#x+$Ln@CNQVvQK@-aW;q2!S2qlT0-7lj=6L-Ixjy%e8u&9NtUXJ@{Hs@$3V z1KKxG(|2ZnhgO-J*@5nFsTddLD9XzGpU7FteT>|OId3UD$aE3evPwv{tXZnWX!lXP zjUh|5v=}H?)(Og$4NI3GBLwM|5d)d!3_)f&Yh@%T8-g-cwhL13Fza+|*j0aOwt{LR z-tXctjX)~Jej2PK`vqP zX>8&YPBT-LG@PN9Vq4d-#DdbKtU@9rNhc`J@mIw)zO(14X@2v+hw+dGh0Pa&4Tlg9 z>Db$+q+twd7tqBh{iYD6#b7<;pfv>R{oo!x;ealzk$-gpPH>ZT%6I?duNb~|5BXwY w2P2XiF2!P?bKFOYdjdTt_0d2#r9MWngS~^#XD}eapNx}Xj|E=$$LNiJ0m_04AOHXW literal 0 HcmV?d00001 diff --git a/target/classes/com/lz/modules/app/Dto/StaffOccupationInfoDto.class b/target/classes/com/lz/modules/app/Dto/StaffOccupationInfoDto.class new file mode 100644 index 0000000000000000000000000000000000000000..796bf7a7922b83f2b75f5adeced3decb446a023e GIT binary patch literal 7706 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 literal 0 HcmV?d00001 diff --git a/target/classes/com/lz/modules/app/Dto/StaffProjectExperienceDto.class b/target/classes/com/lz/modules/app/Dto/StaffProjectExperienceDto.class new file mode 100644 index 0000000000000000000000000000000000000000..799889e5b485ce0414017282502713b1579370a2 GIT binary patch literal 3017 zcmb7GTaQy!6#jO5Zf(!Zv@^^=VMJ8Gxl%5Q+F=lZ;iA)F1Vq6bXWGL|q0`n*#~9IA<@L>3nu<15x;fL>FH@XB$%{ouf5i{)?T;0+rR()^>+X-p_0aS zET&+fBxFg*1tH5O-cED9DCCl$E(`aLkSjvo71?_xuBI`FMGMztec!?d7CyA_k%f;% zaNUHXkZHCWH{Ei3$ys+5h8J%-pE`w_Q(rAyYPYKO)j5T106FQdR_m9mf*TA(3-wB` z;8dgDcI#~g<5;y`Z68-iPE1}=&`vcfv>RHi*4?Ge^%b{u*;%Q1CpOAX?TXW?%03Wk z?X~KL!r{eoW4%!Oys+M=Y}VY3g41jkPPZEj&AD-7*$;f-v!>gsy7jV44Wk`gb=!f; z&uQDlWL#DwU0fuwTvrJ0=L~3(;Dg8Mo;ca zyC-*L;mL;k$);1Io1POdtVk2*Ca)=|MsFVjm4e=AuemLTB-Py;bkMI+&QtZuMx(Gu zpkqDQh+-sa5azJ02Of%hz+rN|;7~lkhL>-ZoTfJ)9Di?gt+G>JkYXrUYtF`+KVqD> z^UQVm;`!17i$UIKxf`1`&ZOO&V6L-`|*|^*D*o6w>pTl!}ORy@ z9&8V(;S1>&umk>iyuh835|j2C|BS?sR3@;8)HhDW8nY`g#>sx;Osp}x8Dp&V8xO=9 za|&XN^?u`_SmQ}dF*(V($TcBJPEG%UM0~}@d<6W8NkOC~3e&XH6*pOKX5w8YpVp;x zH*~qvb2%IDQhQpLGANQR9|q-uqOAWr@n`--JSju z#%<`yyVHNbD9uc5!SuFdtfd)}qBi>%GI{L*a(7_Q=Cv)PI*4>pCnQ}o^15J*2N=GC zfxMnKBA`ssBq&p~@}_{S0A%K^2*@s`2(pXmd`dv+0F=t7J0R^YqfSPKUH7J@>1Px6 z{T>eCFw-B!cR0e^li=O?n*U=C({>79;bn3f&f*r1lG9Owi&w}QsNoD=C1;|=m+Lih z7QW#bMRF;8%ZGA~TpGt1$59NK);}0DG5-)_CXVxCsfXC%v#BSrooPJ8rfBkb`c2_s ziW~=3x*>T+FSVbiKi_(or_Sso&tSffcx~o`OA)V(`jRe8I%;O;j%o8=Gsm-YYiy;J zoxTHeb_)a7MV>BdqR4B3#*zm6s!UP$RP3#1Waaga$}Sq7$_Q2LIIYIxn{>{PB?vx= zb)3X0Myj(7r^zK))*D!0LP@r)#70Pyj+36{SI1Spv**YeUh#i`^@swE#aD_2hfNt*oq)?Rzx!{7h@`a6I*e3HZ6hSFPGXe#><#wS#$qz7Vr%m+H=5d(d}B4AK@VwTgRPAU-*@BcLqR z_vr0ktJLiE=HV`LTf0>+dA(#+cPytO&w*2M%aw*eZmm>5%vZn9AJ+GpRlAY5j*jv- z-8xxV`}_Cm&V%iMD4pcge_*?z$EQ9xITb~IpbZ%E?+Erv=x=nV8=5?yO;(pG+HSeN zw_!Qfq3zlZxev4jw|=6{x9zKBf7P_Agm+}VvwPnzx${$>35a^9{=t=iT6fE~!{3oo zO@z$|8s^<~IWKeoLrR04(9qqL)#IA(g!%>avK6HVMeE4x9EZ;vAfsf}mStrEM%ikV z{pNELR!MwgbG5k4%4lnj-Dp-_f!;2%{jGDzs14z=-dgNr7HFl=H(E~6M0$o`KJGx08_O&wNsKdc>58_c6}NJNrq0G$<;+61&DPG8Z+i=LR_7 zIFE5Y5rceK;)qF+XvL&X-cG5w_kjB1BG(sq%5xXo)#=9&KYOq-uA1+}i?q$aehDx0 zB&2d&JA)q~_ET4IA~Kj_M+C>agL@)_*`$bIr8~GcGI#>7QVU7Dz&*xYo6i1%Sai|D zJ_3HxQV^-8z-x?C`K2Sp!|Ty0WdDTv1Jw9Q_7AAVndwt#-jRmBKEtJ;2-6x_lJ-k_zT$S>t1GEU4ZU z`{D%|8P&TQi4lZzrTZ;M+-Qr@5TsLiZb@w!I;9fiwaicrCv19|Kdr761SM literal 0 HcmV?d00001 diff --git a/target/classes/com/lz/modules/app/controller/DepartmentsController.class b/target/classes/com/lz/modules/app/controller/DepartmentsController.class index 9529918c933285267e861493fb0bbc05b86d88c5..acdc117f812fb2a7d5c461e18dd9607b719c15a3 100644 GIT binary patch literal 2993 zcmbVOYj+b>6y1}g4WzLtkygMLplBb!Rgq^4(w2un3bloT)Ynbswz-hZ#FC}IGrN;VrGO>e-G>=7-ZPua=HFKZtYFp5?&t9!k2MQrTeYMYG?f$htIFHbHDy6m zYHm|Bo{Oeyw;ReAvegoP^i^CNaG14lc%|(Gx~bN*ud59;?>KHC1MND#g$ote+Z2Aw z)6V9GC!6Y->pc}!B^_UE$Xeif9U*%TV!j=?&$Op(!Vb@AM+a9dWGAOcHn-^7q*tnF zN8N2VtIE4C8I4&~+?s5xNl%+~yqOE?n&Ho;B~x>qz;hc7Ozh;;X?1yB++{nLM(|qTCYf#}w(^4|76DI?B!;$RqfG)sB9bVloekH*)MS)cLpqzH z;?i`gn;FZg={li=zE~kdM%z8n`t}w^`oi+)PIdj0b;wH9K_@BB^>Bx%V@oQiyY{j) zRTe0Z5Cvh#iJ!FnvxVb3tF&jgqg>CWmTQ_Y%QC2UYmU)#zTBcJHzr?;_1+o{i3sp~ zNJzG1t*(S$*Pbh6JE%Y3eMY=9{<89#+V{=HBcp?UAU8HH`GME2nVPv20iJ#34CA9; zaP1D^hTAP$223$8y0eMh5xO6SZPnlrSeTw%fAzA+YMW;evi?0zV$x^1tf zZfMgHjwISt|5~3mH+ip)ly<}`Ed0JZH7JD%i=L!KjAO#WiIj#pc!i5NfN~xWi+Bg` z=JBYAukpBub$nxCCIw-yQqSYtBEG}-Mf?C+#HXkhQA0Hky9kAiA~sRCa3%%uzxp2U zP}uCkJ9)4AMAg{bPNe|t{Tf&}nPP9cr!N-R^eN{SuO>_Mf!VV#Zo0^#+v?nR=lN{Z zl^6BYGs%9k*pR+IyQ_1u!3?zK{H6*PI=9$frelBY3chSwHuQ7zI&_^9De_#$W6m5B zor;aheahF3oi_D59kZ=ACAysCx*C|LE+(4{vp33k(m&FDcIq+PS9G7EgrcJf-=TTW zlO1X|Ed5BV6FaV17hzDI5l=PUEoA`demD*rVlJBZux1`@hQ=}euo&ZS4N73DmgAdT z4Rbsgk1Twy-r`Ddv^Wk;{|@U{PBJ(Y8v#dgnDb&}fFpRDE6ZE}WJBk5T4%U-pq!ch z4cTqvEWE@}W#$)dW<#JtXfRDiCquA_$RP$RarGYFC+Janm_X6aG0u*2CxZ_{?xS3P z$iEZouzY;P*~gefE+p}ok+QTsWGKvRV>pAqkY9RSQ%omw zhh&!iKbZ>&G8cD~xrEtRncJ~43r6x`J)7%a!;Hx=5U!Q#^TJSigP8w Y=Zl?uGPp{Y4CX^k%bYE6-Pd*TUo4dVqyPW_ literal 3148 zcmbVOYj+b>6y1|H4WuK5Xt7k3hazb~280%*yh?cprchfbT72DPZj%eiOq`jN6mUIGtO?q3ZCJk7Xn%lCP zPpy_~cbd|-M7wSI(W-Urr2`8F_N{iDK(*w$@>R7d7ahk9M4(*9H*l`vdUeZhd&;SA zdZHztxZY!{Duv@)o1zxDUe^-+1J+_EaGxko+Jqgupd1xkGB8q}SvN4c_WrO>0@S7iM~R)Tre;;ev0iYPM8Tv}kf-=m^2uqE4O%QqQh%?LOgsV(cCCq}%R! zGdGBNAsRM?Q@7RvE$u>L=5F)VnjLb=TaoluG z9R^{t_$$(DDc{!_N2KYxbfhPkTIUn_eLjLcJeaF}Wd@RVJ~e4y;YJ8U)1%7SbPdeJ zx`qL&xb!buvYfIRr$qR|{RYMp+zouv%bnz<~+d&|W&x8v314W(<_bfVyH7pN1uC}q{w z^fdK@?c>yAvhO@;v2sOkfQff7X<|3_6!4Xaudz|ULlfWNTNB^mdlNr^W{;)34_T>b zVjfi!HB<|*O-O8-sH0)vbPC9S)n(q3uo{QgDynk487V;7uNCVb>yFpeRoB4Dq579` zO_L>hGB(F1QU49(+{b(f%dg0cc83qj#bjm3EZx~Cg}Mx`c5ks{%*IH{wfJ-^(Ns_M z^G6qkHPYcunvLIwnGKeSDBB~%NZjzLTl759Wg?FWzY;!#M+PoI4rg^B!}ha7%k<#NI{br|>Ds#5^sU)S?gaJDuQnCgf*oeslaC^}|ri<7`awCc(696EVqR4iBiU zRyE1(GF4j)x$TX%_qk1kjQYx*N@a8|!RWJX#m;lHfrU&mlT79Rlev%}b8(o= zC0ve`xg9H03YB>d^99~Y=X0Ndd63{!>Wfpt70T8Z=Sr$LR}*}e2KnT0jYo309!9yu L-VKhoGx6rXpcp5p diff --git a/target/classes/com/lz/modules/app/controller/StaffController.class b/target/classes/com/lz/modules/app/controller/StaffController.class index 0f28e20983c5d0dbb7a564019f3d8812c980b0ce..299ed590c3926f4f2652277ae719c47f9c493b18 100644 GIT binary patch literal 6274 zcmbVQd3+Pc75-M1yh2_s8BCOL1lk1KgevjHX>Bh^T4i?yF}X;O zv?;xt(5Cl&q*v0W97&VXyGif+N-x@`=|R);-?rb(u2ySH#-Ts(>S^B0_r7`W&6~G+ z>OYS@0pL>nJB4L7#A<7(OnfPqg8act}VOx8YOxbPA8)GvaY1iK9szOX7GEMFH`scs!QEXYsg@o>1{Q z6(do6Fy?8(`*@bG+bakUr(OqAw4@9Q+D9H3z%bry-w^^<= zSTxs^%eH5DmR)ugEbq0QVco4bR(W{HF-qos+u5rRnnu~xhm5>uJEOW0F3{IhJ$t|9 zm<7VlmW(zOs(A?(QoDFkYU9@stV4or&F8C?v1pe}iq^1*aPuTwpJVSa^WKJAE2d+a z<-8ek%ub3r(OQDfm*Cs!sOud1X~=Z?&AjatLiCKJd#$p$rCJ&^o$CxnQ9-)b&Kt#ThGU8E!C>4Qu^3jp8H2oC_8hxdG#x)f)`j0` zHD0t_Pr;JT-aW=XLoXWTVa^h1(G%txQ?6u}^{QtTUA>=+QhQvx?9UQ>8dfT3%U2!8 zEPH*%FexiJ1&N|nvS>*wm=(kEN>t_wv|ncOalZ8J0Q0lTZL~)qb7jvQHXY$0t}{wh zPxsY=kG|Qc2tsmst~_K@JtLy-3ZP`;&zOU#b~7#kINz)NO47ELxFcABU=YWy7sIh;3biDg8PaZh3I)-@7aDNDach* z>A3t}+L75HOULI`e1YYU-q>t6;Nfl&(OlCQs zgk^>(SlrB^%tgx^^?kZQ%EEZT@C;(fg=-C0CIvk{K@kpv5}8Vran({Jmc+QQ8IKSn ztdzlg0*$YfAyU&bA0pMOWF2ab+)_iOV`ikKCR(L9xc-cCvH_M5B;4vbG?-d%2=>69$j6&E1=>Blu|F(6q9 ztKj+PX`kVZ)G9Es)PN9^#x?fwc&zSh7TzXlHgSzj=swhRiS6_BM=m?l@ME?fL1Q-NLJ98* zVf-f=eu|%I_&J_da9%JyTGt!%gC4DOyw-3>ScwJ7FEsoTztV6SE?4nu4Zp!j4Od{f zir;GZ9e%IjN@P_$qu~#DRznX~sQ9CXKjB#wf7b99oYL@DoZ`he7!)>o!>qM*qEaZB zW`|vw7|?LL@W*p_QpMji{2l+$@K5|p!O|u>nYiWP!K=3m{>3+DsMb~Z`<4|v=m3~W z^77d_#A4W)>x$%Ny+_ChGDguFGzJYevaTmO6@BBt)-CKY*gv>t&E^%+OQrEnURN|+ zmo3nEvdpPAu{*;myPM2W7WgPmaFciKWS=oC`i%3NX`6v2J-fE`S)Ea{0X2q7(&tvk z*$gIhvBz56BoxhF4j62*lZQ=&mIrrJXD%0^)##7Lk($#3vho-O?bggFdeC=eqn>C) zYa9vjxv|;7#`qEGL>0vBy?oE1znbb9tB$~Gon0=M6YX_NrAkMxJUyveI46WxxzV+w zqL1wkkSw-leCuEe9uVz$^9))ZH5(X-ct14TEct}R@XYo^fyP$oXkiJvf!a!OqbgW7 zS-OO6Ncf5~gXTrbtR3~Uhdbw8SLgXWIE0`A$0u^pWJKy+Ovt2zOzOiCK5Nd9PaULA zX!&G>8oHd2*BtT+wBsDLs0lIYxq5OcxN|{sgSWI(}nkjSc(>iHl?N zIZxx*b1f@pq*kS4**O0aEyvK3ZC#R%A4B2<;#oDLrdy9gjo|^b`*JddBbagwsg?ZR z7ST}-b*re;0^Lks_I24fzfFy3CwCY5f@v>n0h?U~d=+;SYN`P_*PK9@5_Sw?RK zrqHibscEOP=F?H#bX6AD;%elu4ZRq|W>nC}rsPF<6|Tc!T#pB_9gkxNJGEWx&35A? zZeXi(qjdcN-@SqB>1ZNd!w|%9il{k$CfFWrq|`#&&tMa^aWXhbTh~z6j;CpH3&S*@ z&EHm9R%z>ETJJ}a78hcGYp2leT(Y?yDXyGKrrXhm7jtJFwBWDY5w6_HmAj~0h{S)n zxulBSDsE5|KIH!!Ron!elgTW=&777{$Qd%Dr;)kAzrkHlT;x&UxGK`mq@Z93!+u^V zH_7b)_lwXhIgXAPPGHXF$8gq;qsVMonm(I@=d@sZpr1?s$0^U_@O;V%$_pr;OSzTu zLduIMtCU|r`Gu5|nbwSY1n2Q1c?9P#O)t*GebA-p&P<{vc8N3*rkE7z?xjos5&ae! z{Vb+Y9^uoXr}pr;?8OBrG9OBeeVN|28P5uLdJDAh>{yH`6WyGr|v1YR;yqdSLeB)-Xt;GDw;T(g88(;x>NVjywEFG09^52TZ4DMWmL* zq^E?BV$w$`slJo>bWrYDWE7`|d!8Y|4Wui9NNd3d4@J^~EGQJDyh;TGQ>ZNzExsnnG#N;CoohteUze`*1(WKc$>xg@;L*YS>}xWRsPn0b`U(dO42_N}chh6R#EP2G zls$SjTC9w!F+z#Jne$Y@u(oi#moLfUldQ3@8)fVbGpF&qqpdqXsoKve?nlgC-?J4F zHhOiWJqyGZ<8rO^nsi1xoOL3o9RZ3ypZl-cU-xQV5}fF?Ya%4YoYR|452rwHW1=RT zECdU4rANcck0w5*YOI`nJ8o!`J-{6%dmH&Ruj5zcO{Kfke$zC!Tg@rmUPkrD^t21Y z?d$Zu(0A1_d1GTgrflrRz8t=?@ijJbcx2-nd~4%7d~f3i(BQF@zP>ZHY|Nu#ql!un zH5(F}HtJ|t_$cN2=zhv9H(k^eMbw>`-6;@hFAF;sJB8oXebU0|p^i18ypm0IDmKI+ z(XlOLyeE9LO0S4|yTd2oaM*QR zNwaZBpWR@oN0}TUMzWg6Y0>vZmq|Jyg0gwKjtwMu4~*~PKQ)da^k2?sr(fa+1MY@gd+n z%y4c;2XFufxw7y!-a*z}Rv6fV_@(X^IXak3%@j(?@tdGOPEFa_@b9$y!_hAMiJWW5%h2oPEgc6vhqhjhOaKOgopsU)W`s@9r^=WQdrbrJnN%<}-cfGt}=ivGMM69mC=O+qffULyU4>97DkepOeb@PWXk`a%%udG%fn=@;A*VQomiQo zQRW5gmv|$c&jSYLVS-PwFHRBHC|h5gYpLQ~Pw-h9UP diff --git a/target/classes/com/lz/modules/app/dao/StaffDao.class b/target/classes/com/lz/modules/app/dao/StaffDao.class index 615ac7e3665b6895eeb7234b08d71df744e328df..06e87d38d3d29533c1516a82a84f75d12156cfdd 100644 GIT binary patch literal 1556 zcmb_cTTc@~6h1>~E0k)HA{Q?p3bsBtFFqKTkceoqv52vW@6+ydS+cvc*_|cUpXP%< zz#nD&W?I++C8F`+WX{Zf=k}d*_UEtfKZxihwX3vKrDs)YF>3l!ceNM{+<2h&hewHw zU5}B|>YRvE!9x-IysOh7_MLX8uOc3POOOSVr|eqZSRF{7n11Gx@D-U%}87<9#=k>Ol7 z@MEF#6w!AtLw9c&f6w}yLksqYA3+tP+1MWS$*v&Uhbis2+MtOSH`daZspGos(Q8o# zqXkbUBGnOkXL?<;HKBH$o5B*|%T5pln$bMIq}q)=`IS-p|8khh&w*B>F@oakp}C8b zB)nA^8%D4HH3`$anjuSiP}eB_4Wo(~p|XhoMadOLjAkGu{F17(n0zYZUcs#l zc5&Q-EEv=rWInT?8ZF>52GxmRcbo3O$M~rMn?=YB-MwPp0C;IKNOMY%CP2${Z|rfo zOe+8x;3{MdvJM$VxNjr8Di;~96l$|jR||EmP}dRY0X-a-TrXV+WJ=#E72s;;g{?Hqmbe&zd6u delta 70 zcmbQjbDvH4)W2Q(7#J8#7^K-5B-j}w*%_oZ3b!(D4rg{|WMrN^npF diff --git a/target/classes/com/lz/modules/app/dao/StaffEducationDao.class b/target/classes/com/lz/modules/app/dao/StaffEducationDao.class index 110033a70ee15e90c11f97368af6ccda71b5f18b..f2837161982ef7c272a2fcb7c42bb352b492fd04 100644 GIT binary patch delta 195 zcmbQoyo9Cx)W2Q(7#J8#7zEiF_}Cfv*%<^F83fW(OFZ+^@|`M!OA^!4JX07M95j5g z63Y_xa}x8?^?ma5(ycXplJj%*bE@=n^HWN5Qj7Hy3kvjIO7iu=dR$XVlM_oa^YcLF z07b2VruwFqWaOs=Bo-y+rk11@6*Drhvll}w*eIOCXvE0E$iTwD%D~9L26PfDP#Q=v ZGjIS&CI(IhE-=l_zyqY&fQon-7yze)E_eU{ delta 60 zcmZ3&GLKpK)W2Q(7#J8#7zin9Rt?GFhLwjg5toL6|{gvMIB?90N0h ZAkZEr22lnvFfGm?0i@X&7#SoP7ytrQAhrMi delta 85 zcmcc0ahYB2)W2Q(7#J8#7^K-5B-j}w*%_o58Kl!wOM*)h)6yniWE9Z4 jBlF}Q<~BJ7W(Gl^4kiX+1`#kV${+@$*%%lZ#2FX>fV2;x diff --git a/target/classes/com/lz/modules/app/dao/StaffProjectExperienceDao.class b/target/classes/com/lz/modules/app/dao/StaffProjectExperienceDao.class index c6b08bb050c7442bfb00caef13177fcbfd74c9da..c60128aa1f75d44863d5278c5c3125bce62fd010 100644 GIT binary patch delta 257 zcmdnS+{jvg>ff$?3=9k=3_|P-{Ok+@>_eGS*gh-o_T5cPL;tWiD_w` zDU1wC8a`QxWr_MZiFxVzKKXg+)|wE3(vr*^eV@$Y5^F{V0pHY;jQo^<#G=I9)RNSq zVnzn0OrU1Y;LP;A#FEmYR7Qp{h(X49OtSGw&d=4)snXBQPbtkwE!IygDA0E)$)8v+ z&IY8c?W{M-S1?*JvM@5RFt9Q(F|YwW!pg|N4x~7Mn2CXtff>r;V&Ddg@G$TKX*LE% I20jJ`06gnI*#H0l delta 72 zcmZo<-Nr0`>ff$?3=9k=47}_NT3NAIrA4V5&sQ+YGcYhSumBY? VF|abQfoXOI4j|3O094Ar001=x3m*Ug diff --git a/target/classes/com/lz/modules/app/dao/StaffWorkTransferRecordDao.class b/target/classes/com/lz/modules/app/dao/StaffWorkTransferRecordDao.class index 9b450afe37847bf51f46889ae3ba55a1bbe75b97..b49e5ec073890821e92ae9199076a890cdcd41e1 100644 GIT binary patch delta 358 zcmaJ-Jxc>Y5S{gMIirb2O2JI6W#x^@ehoubCc?OC9b!ZG#VK7uqGB}&N z&HlAJ5F=Z1ea}mqRa$zElLl4$O}i~$B%AnA)?uMin@B*eqe&t7}Ow!2qKt=d;w$2UxWYv delta 72 zcmaFCx|3P%)W2Q(7#J8#7Eoas2@RRs%79Xq}DUwEPY3tm;v+1xE zA|HW_IUScUuVO^SWgUIE!o%BqvcSVTIt}mgkkzq>C0;FS=+|&n$9s66_c>O)reQ$C zbzZJ$7}W3qFF#bVDj=6l+Y)#=o3E5J_7|CQrO>dgTE^Vi$XHIJT+3XsoPt%Ir}dP8 zvTk_>O2fJ9RPK`l$1IbBc=nEY&&=4SQ_SS*)sj;rZ8={l&{-mIw&2vQqE)3sb#&!I z_WFEI;FX&PjegIx8&*vqnM@tjMxJvqbY)A9wbUrDS=DRi8mFwf&X(5&&L#r@eekIR zLW*ZAdDC7ot0ng8yN)he_1l%gRkKRm)U7HZR;Ei%sXikx)h5`&|KkTFP0CU$#Ay9? ziM;8fT$@pk`VMbXsTN9(X$wShrJ`fj8&yg&*(TZxTz9UQoC1?|@$)6Oq+@MtQ*DeX zxuV-60v)-!nZLVeZZtVAT6ND^cQRDf0sDk#ht*4XA%1N}Hc z@;@JJ85rQD^4E7iJ^TKFfkEDN?%zsIQy`qTD-I!Vt;h1(9V=g_0H=ct&e>+IHWgrM z?{2huCA${peYFK9I=Zjwi3y?gS;Mrci(5+WLrC2ai0#|>MdSbr!3Js;clIQ`WPS8x zDzp7e1wb?L;LgMVorIWHcP3_m=n<|F?IZLjnn8~r?M7(kpS}sPjnGp_4{1kl6OD>{ zCX@aclH`x|CuwF2Juatr5q=7p^+PTCDUukTmX9G#lCZ$gm#j+VgXB89MRS;r;_30h z9VqFEM^MxK@*`+Jlhkt>r$m7c0@H~@=t2xpaDZX5B}+`W$?}TR^<loZK&OLr-tx(6@;2 z+IaYtB!2wo55b8`ZsNVJaRLc+Q-~gNnV>BDT%5h+Izi|r2`6VV;Zt&&)}4@^BcehQ zV&HG`(WHrv1m6N08C`~E<~*GK1u91k(mm)#@#qfwYzVxGvwmtbG>6DWNskk|`@HI| zbeN(Z+r!BvZ}O?QI7KTax{PfwY5&DE+7{C^&bPx9sI`YFNtjYEz{Hi^!^G9pFoU;z zO!o;s|8l=VUX6E1@lJUcT|0Wwwg<1 zniEhC0%cpT8v=>aUHzV3uyngtD7%hn*T_q*G^(^W)Umg0yGG4$IK}k(rP7Th!jZpu zw8JC!bgN}F1q$iR5kuug579u$w2jqPeampJ>suCKRJ@#Pw*?l`9dLtEGDicLC^ag& zwNAWo^5BH{is9aARIlj{5#|~W;g8Ilw&@lH=6amD{5*^fOPj~cI??RjF)5om&3aAy zdi42=hEp|d-6E~aX3Zu69jZ0m`!jA@v_q=s{NUBM?BHn6GT4ZKP0|NZ^XPk#DN!A%ak#bId;NxVc`Pxf|b zOT%$q^&j3_u2~>lu^Kkv?-plm>#k98sm2SPbS_$YvpLs6+rfS5&Ps7zG6ZhR%zFIL z)i)DDB}A3(@#3Je~`1d8$j%bnfSR(jzqeeXu-YZ_iias2>|R5@8fOrtjv zlR*3gOGE1z{fSlxoTAmsH1bc~f!IapF{Jyn5@ZJ=-kwbUQ<$cF?0=p{j!+YFb|2x# zkl8=f<^Kv+5AH&*_8Yc(O<~wCrwa+ zoGyYs978__F#tYbl42JfgC+4T8`3lnw}8yRMi<2XvS52 zLn8yp?;}>qJ-R3r$H#uaWN!T2telc}p=Nh+>|4ZmuHFAy5;WcLGm2Tv1(-GoKL2KahrE&KlM?;XJ_hy>e}F;H yl#mlca@#Z<{)6149SoK??#U3Q-^vaKCTnagppH6#oOEG1OH6 literal 0 HcmV?d00001 diff --git a/target/classes/com/lz/modules/app/service/StaffEducationService.class b/target/classes/com/lz/modules/app/service/StaffEducationService.class index 77b7ef685e5df6dd4d4618984a8873e22e1cbe17..dd5cfe60326f4031616570c82f8f4123c8df96d2 100644 GIT binary patch delta 192 zcmdnMvY1u))W2Q(7#J8#7=+mw1lSn_*%^c;3LlCSNKY;C%uCC6sthhkOiS}jVPtU7 z@X1OnOVrOv%uCnz$CSz{0@Fz{J1?RKm*0 Wzz(E1fS8Ga6Nn)!E(UI}2oC@c`v^n; diff --git a/target/classes/com/lz/modules/app/service/StaffOccupationService.class b/target/classes/com/lz/modules/app/service/StaffOccupationService.class index 9f8101820e5115143980f68c145109702615cfe8..49721262bee4643a83cb0987d32cc03659c8e01e 100644 GIT binary patch delta 140 zcmdnQzMMn&)W2Q(7#J8#7-ZQQq}Umx*%@Ru3jbl05=&1l@lQ@JEl4cM%+GVG3@%Ab zOY=-&WN@7LMNPq_Bwrsaf>7d_mzEC{wq|5t%1qhJ%VfmJ$U519IYE_$kwJt(l!1|f X4QLN5BZC-_Vq)L`li~~#U|JFY98n-V delta 58 zcmZ3^v58&y)W2Q(7#J8#7^K)4#Mv1n*cl`@3jbl;T*zd=$jCBz5p#kN0}}%WPze)* K2!kk?76SmEFA94A diff --git a/target/classes/com/lz/modules/app/service/StaffProjectExperienceService.class b/target/classes/com/lz/modules/app/service/StaffProjectExperienceService.class index 22e9bc67e393f45e8e5e34fd866c2fe5998b12e9..77770da0b6482f91882d16cc5d05a708e6d7806d 100644 GIT binary patch delta 239 zcmX@X(!eHs>ff$?3=9k=3?l3dg6s@J>r>B+#6y;~7CYN~TrR6(S2A3qJ zrFo_>GAL>IWF?j*>gOcprR)3T=cQX~LIg@nGIR8OGK)*B85x)|fhxlYsHx-5(g iTnyX{Obl#5FR(H)@Bk?eAZB9V1!4$`kAWX7A^-rJc|Yv{ delta 79 zcmZo*JHaA+>ff$?3=9k=33jVMUc){Fw ztRp{CjNdm$!J4Vx;U)2tL@49<1lt^C?F!{uEr0kxwR+0_8;f@kj3nLD2UUrT;b+FV z&GK5zf{^Ebmm`z_Zj~{QOwy|4P+_IYwZO$PYFv|C87%VX5|)46#fk9|mR3;z2d^fM Lk#7x+ff$?3=9k=3?l3dg6s@J>q^FjI=NDyr=B4F3RR)(NrlonN zFfu4<_+%xPCFAfA?q_9W-~mz`K+MFz3&ao>9|J#FL;wJpM?Sd# delta 79 zcmZo*JIx||>ff$?3=9k=3CmF?IwTS+u!9a*g-!T#X6Nyp zEXacAM_D!VRcYC$ND~_$7j2@-yV0k_0L73xBk`xS8Kar7W@g;#uN9JGE=fd}1tCjT sqFC}98&b9}ZRf4djsklD9q>5H$%!6kLB%q@NHG!jY7*yedFJ8hKcA5p1ONa4 delta 152 zcmWNKI|{-;00n13K?PwoftW%}jG{rsFPQk(!hf_8QhKO8hah+YZ;(Py;U!$AoZ-F1 zPyFXc3QK)uoOj6LV&Gs=Q(@sr+xTRlwg52+p)B>(^b diff --git a/target/classes/com/lz/modules/app/service/impl/StaffEducationServiceImpl.class b/target/classes/com/lz/modules/app/service/impl/StaffEducationServiceImpl.class index 697b23a87f39fb0fbcde71c3688718ab99a9926b..2a5b9a910f213c9530bdedaffe3b812d65f86c38 100644 GIT binary patch delta 700 zcmZ8dO-~b16g_XI?a0i4Eu}^12dzRWMSY<7L92odE{JT@rK?G4YfYI+=#+>XHSrHL zqwy!Wm1tsgVOVQo;tz1)A2FUcB_(lj@3|l6+n;6H6fmIV4 zR+PJ9;HrtJN^GndxMt!Eu8%RfVc{m$4O9)(4BQe(^n9n)y0_bJIDW@-w;WHPGI%u= z{M6FHfu7H1cAh#1&NJz_uIGmw`LNmZ`umM$?WkJUO7V8n-*#JG{qT_*wY@8_Sq??A z>$q*X=KuWtH>wsSb+#uyF`X(4bVr1fv*nlBg4T41J23Br0CC@)_cYfrd1_ zB7>x9dV5H~Im|E#|Qo+mE>I=o4M1($rF=RP7Lro#n703ePp-x3v4tvE>?>uW4Sd9uwfO(pR1-AKiM(XYjqJ}4cRrv&S`3o!!A41;g`3vD0!v)sp g3=3r}an{L#GDZ5yiVBv)5f{S`vq-u`yWE5P2lc~kp8x;= delta 389 zcmX|6yG{Z@6g{)M!@%-JLEfxS6d#CUp`G?NCfZ9vv578;thK*joIkL#B^D+YKyBwI z_#ei228_kM_uO;Ny>n-pou*Dce%{9bx;SzXM^jboMzW%6|A!L1~Hn+8Rp20 z%pyyim>ZD80y}|496a(SLsgmz4dN;Z$D2j0A{goVhA~b6%!hA3abKn6G0^g zQ4m-&5kk>mu^z?-HWjuMN&?#gWr3YX@3t>$oi_YRy?%9G^UvC?Lg&D*HJhaqLSB{w zsd&+Er+e0aPpQ>xv+WW-WL1mGjF|2wgBj9y;SpTG+D^n|h3k6}avs@+#T zu8}UkLJp0}h;cL!gMkT*AO;(g^4hqer2ICH$&rUnB(zm9y<%-3ef05 x5o1i9J@p~uOzSU2ly6i^gM%5)lUxUh1rR{07tCX!cP{etK$x3c-by4H@k$5T^W`{kk~>ce%Iex{|u`^r%{Wz0gX=gb{f~fb_y3j zqHzPNV=EdsT2-4v>P36W!WiBx>Tym2Uh6#KfKdLBpMyS`#-c-u*oHocr#JkzdJ;uYW#%2C#^`8seB& zv7mutJ}_5QENX}aiGiysu4x#;^w3QJH$2zea#~)yx#L*9r7hl>tULa_rnl?t_?vFcTif6E?OJW~ z5ksLE&YF9+TQ{qoTes$-Lfdcbnbk(iw;0scUwGnwG{b`v8J1~RzV3@3JU!%l)(SEH z6r;-2!5hw)_#$m9V@T2WL|0D5@3)=izJV32GFYM)%ZlGIUDV~2l*MiFOfDqGaL2$1 z5-QdV%;LhqEBQN<7%Ji$uXK>7)5XDXiXH+S`B91#@=5X%dD0_0PMJwQz{N_3U_A;r zCddY0P&7%_hyXZ^G-V7^$Ph^|{2VexK(6!&{NW*_@_TWlWI6#ul6t@lhLI(?8Dh$Z zY`JKn&qlMDrY@sifILI`IhvawANBHsUV&<7sTyN60-U4Aah}?AgZ@IRRN;6G=%shi y${(O}ybW>xJ~bPz5eevnHFOj)M_he@;y|E8)R9yf7elH`;W>2zU#4faP&o#1m2^V@ delta 399 zcmX|6yH3ME5S(*zzQl3JJH&=O2#-K`gg|IO;?Yt@3M~RDg(Ywbhng1A-j_raNECbk z4SWFW|Jn{X}_+sph{6K%l2WA>G z0*)53qCS_(>|#gYKpz`5eJ|@~1-k-Os#R$tjo!n%d=mpK@bMG`Y+h-watU*WU58b$ z%Jw6~WGZKw%_*5fj@XV2$fLkcpokJ;$mr8V_crwA5oazTi837}%)*_{HRu8we{&%! xQxl9NDsXs+OTEk*X>`aDJTOqhJiZQMX165giI6JMS}2SON`|JE5D>2EUy3n 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 a662c8d0e6996d34ba15bfcb5508bc96584fb726..4b45aeaed59dc99d30bc9ac9302d7d8d6e215772 100644 GIT binary patch delta 2574 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 diff --git a/target/classes/com/lz/modules/app/service/impl/StaffWorkTransferRecordServiceImpl.class b/target/classes/com/lz/modules/app/service/impl/StaffWorkTransferRecordServiceImpl.class index 82436aa2d6feca8775faec2b8350e7e64a4041e5..0da63d3a52232f8caaf8335ad6f205d02575723c 100644 GIT binary patch delta 722 zcmah`%}x_h7(Mq++mX&7P+F_>4=740>M(+T41yLCLeh=e#GT0m+onopOgk7|5fgXD zMRV7_feQ&HMi)K+i3{JrCy+NFo|y_JZd}~&=iGC?^Ua<9$gkAq;qljR0G6^h|T7K=-!@zB|ww?$~ zS0bUc<9cnY?t5)#ZUF2CogJ&*=>?8}-aDa>{>v7)|KABK^=-fZW^7_3@U6%=+@sNT zyiNToU#i`w0aO9EXl0 z$MMtqB%03R%-r2~{a0?1FSBT9`$yaGSJvf6oER?rtLgb$+mBnE`Ug9R%Z#TVc4k_v zX>19@g7!zM>Q}D#S|J@)#pQK_nhx>=Y^k%PYG}|TmiMwSx(VJoIprorQaPF|)A{Yo z*4~cvRCTVc{A*ott75H@3_V3eU*qN|)AIu}pt>#){;{Fhyk_eM Dv?n2m diff --git a/target/classes/com/lz/modules/app/utils/BeanConversionUtils.class b/target/classes/com/lz/modules/app/utils/BeanConversionUtils.class new file mode 100644 index 0000000000000000000000000000000000000000..fe9bf349fda779e32f97606f91470751faa47c87 GIT binary patch literal 2004 zcmb7FYf~IW6g|BUhTR>W2_*Q4#)z=IMiYz%2m&i8x;)Hoh>6c;cGw*<%xujJN${WO zAIR4js}j&Ezgp!_qDtfG*$2zQ7w5xF_w7D?&%O8Dp1=S7{Z9bX*iEAkx6+uwtcJNX z;<%N;ZOmuz2^Q3AF^whU()bk1YGFmgXDRgH^E5J8&EN}ssUe@n8rC&z2y{4Jxor6Y z{dvzX8-cSky=&wn+bmb-Y}XFw1>&RGErCSND_H_PdE2$t_xH9fzbLmIS_n3!vn737 z&FjWQSg`|vsl4g!8O~3}o>$s;tiX`fs<9v1PGBrq(#?79Bg+qL&%LW`bUNVJL74NZ z2Ssnu^}>qf=V=hQF`D0%kEG#9w`}Ab83eO6gF4JmduFrk1_807=$!yJws$Qvq#Hrr z11$^7PfV*Cl80KOyL2f1vK7{R_ntktqqZ*4*K$aW7QunHZ<$sNJa{@g2h~P~;>8s@ zix-P3>NXE^T$`tTu>JJL!dXBu0(2EZX+B(&)u;>_HZ^>u;SQ@!DG2ngSz*O1ZAxG6 zSs^nokSf?^SBCpOGvdq@XIebgv$b-LZT?I-YRt~Wp=h-irV&KvoaxjhmM(bvzGG>2k;arNqK=Cg&`{7(#9e_4QDGwiEc(7YPzh(qI<|0+aqIXR_jNqLH_U*JZ`JoZ z9pB>z9X~=g@R6dL_1Dpl3p%!8YAETjKm|?w9}R0L>!`qHvfFhh(0#(VrjGs-!z$|` zLyz6qa{`PcB`~boQ&y!}v5cT%`(D&TM$U5_>bcQA0-7Bx?^VMCfuVYVqU@aPo6SBD z=(L-z21i?q)1W}*X%!i)TTj>u?0#YrZZx^r*dJxB*-jbPdc5iep>$2w?^<-3RDIhm z?DAKDg`IMS-A`q5|AsIH>8ES1Nh(`?)| zD+pwnTuu`%go+fy>uta91d^8TtL&dTwhmBEFSSEfq{(tI*C};V)Nj(^R#LSKA$#_6 z#Z}(QeZ14jRtb)yILA~s--DbP{0e@PV=p0ob>v)5Q z5G)GZ-9g*d_#tAyVDk^e@4rN1ZTtvHf%VBFbO`*6n;d8YGl{Vm=$uIoC5DoRNKFhS zkC2Yx-c$6?B%ebcO1?nX5xQe|`s%NVXW|+Cj_~KQz<)|2Vs)Kdz<@OLMq!OGph*TZ z&2Vm$>jGIVapwlP-XYr}nW_lp$#RmIH*p0??&!i>c$=dUj50x2czO?(@eZyr9!7(A zG0d+Ty+@m3p?-?V`Wd55WVVSMYa+*+$O$4RIh#cC9}H@k(qOzo7D)~7M>A#6@BxH| z>&NImM(mi78-%1{=Gi*}XU)RXG(IYjSo&{g3m9KLIXQziR|vlu@9 E4>N`7P5=M^ literal 0 HcmV?d00001 diff --git a/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class b/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class index 94e5604ea6f4eb7c83a3d0312aab60f471b9c2c4..5c5c781bbc9ce29db959822ce4076a6eadad6166 100644 GIT binary patch delta 1352 zcmaKs-E$LV6vls>&F0f92Q;-!v7k17 z;kP2LqD8&#gmEw;makNF@L%b4%; zLC_UT)jst2NQZsw@d=+AG*_m}+5A+#Fj~xxR;yFlePRZy`Rc6jJmYar2Y=>qp3e<# zC{#{n%auy`L@`?y;@Lhi9syr?e8~mHR~}z8Z?I)Ne=46Ht7P~0*L8a=aMAYohKmNf zg9R&fWv^N^HZ{%^t38#;YH_kUbb6{7{BBPK8K)5R#eWXYIlYHdGEM!9VIaK_+a|ZH zoQ9lMdKu%gI1zSj1R-PJExxxNKs&d}Ey``AF=-3h+>Eg+7;u}8>8P|kftHOZ?RAg| zGh4WwPN^FwDR6g4?wt~8V_YMt*u!06RYNweOT2hQ5|I=Qbq{+bu`T%3P1iK7MoC6W zY?TsCl5ic^uLJvaV1EM`e7d=J1K7l93XvMjI#PFtmg7DxO#CB)s^z%pjx{37n1`aZ zOLAXtjw2`JM9|~^Vc^yoxOE0@U3z3g`u~W%p9i#9FxrJiTp&t*bPYFW`Bu`ataD$NGI zy+q3*RxV~ZO^7 zc|;-yWlbcdiunM^Ca8_9rUYBht%0`LyWOND#fo9>u;M z#r_G!6Gk|%M6@QwkTTQ<7eQX<^{z1^r!Lykk!)RMdxV3T6`~7x;r(WP|3MzFD@=y- yEr^zqC@jl{jEA#Kt(U0tZ;=ih68_=xwu`*T_3icb_UfIr42hDt(JwZ_;eP=XxxkSC delta 1541 zcmaJ>TT@$A6#jP3WhaLdBvDEa5gN)RHUto?EyPx(h_y;fwH2*a5o5pvOpv6MYBjb} z?^f|xwO(2sA9yI^*l~tSopJi&IOC(g!2h5RK6E;M`y>-)eDKVieLHJ?>s#Mi`u1A@QUI1IKFM!&3n~jpG)FXDmF6ak(^DKPoY0 zA*8%s^dn;-i)po=sX+~1vXDbwfzA5yvO1ZwP(abb3Cv5J^rKhdE~w#@#48f7UcE3U zLZ=0+;e}LswwTH13KFlmTYZ1IS-oEh=-EO(=LWRDMZ#^?5^k@)J0S6##Onlfujp6I zHna=0yFsHpXyYIbNtA57fiv!TBOYzTSsQO+QR1A9xA3-&chu&zjd$^$KnLBTW?`0L z({7uY*zrC-5Qq$>Qt3jWYbc*9&gEyi24`mSC%Z=HGEvp#0`WcyYp`DbXxAhZmt48Ix42>upa|-RLti%yWiKedK_wr0b#0MNCaZe?_2GQUJ3~JSYNiXOg>{S_a{U>LW^H{v|I(%!;4t15* zp}|;ot^pHE?;$I_kXj&j=k`LpUUs!nduXeid7ihNEwwLBKIqu~l1% zcP3WhtPooB3eZ7uKym@ntHT~_A%zy)OJet95c}Be4`3AgnP>?-Hfb=x`94ZCh*}!; z@h+2RHT$t@_G4A`5B^tu-tqrcUq$xR7cufw3@4qEt}-_qBiy)wh>reC!1Qka z4KlIJm&>F{F&uLhP1GYPD*`!EN#l2nvNV25vkW6?YAfu97{>8Dnkxcz^B)6@K)M6L zSV`6UI0^OBYKYR97)B%C2O)8U9jx^5E4o!ZCYk$wuNx=v5DqXc^;LDK>ZD0eBc0yk zo~nk|p&{ru&?oWmki;X?5+lOvmyli}7zl%E - + @@ -92,5 +92,43 @@ + + + + + + + + + diff --git a/target/classes/mapper/generator/StaffEducationDao.xml b/target/classes/mapper/generator/StaffEducationDao.xml index c3f145e2..5ac21b47 100644 --- a/target/classes/mapper/generator/StaffEducationDao.xml +++ b/target/classes/mapper/generator/StaffEducationDao.xml @@ -16,5 +16,9 @@ + + diff --git a/target/classes/mapper/generator/StaffOccupationDao.xml b/target/classes/mapper/generator/StaffOccupationDao.xml index 2ebfa2b6..3b5ff56c 100644 --- a/target/classes/mapper/generator/StaffOccupationDao.xml +++ b/target/classes/mapper/generator/StaffOccupationDao.xml @@ -3,7 +3,7 @@ - + @@ -31,6 +31,10 @@ + update lz_staff_occupation set status=#{status} where is_delete=0 and staff_id = #{staffId} diff --git a/target/classes/mapper/generator/StaffProjectExperienceDao.xml b/target/classes/mapper/generator/StaffProjectExperienceDao.xml index 3ca5b209..2c30021c 100644 --- a/target/classes/mapper/generator/StaffProjectExperienceDao.xml +++ b/target/classes/mapper/generator/StaffProjectExperienceDao.xml @@ -16,5 +16,9 @@ + + diff --git a/target/classes/mapper/generator/StaffWorkTransferRecordDao.xml b/target/classes/mapper/generator/StaffWorkTransferRecordDao.xml index 59f32d9a..f5dccb94 100644 --- a/target/classes/mapper/generator/StaffWorkTransferRecordDao.xml +++ b/target/classes/mapper/generator/StaffWorkTransferRecordDao.xml @@ -14,6 +14,9 @@ + diff --git a/target/classes/static/swagger/index.yaml b/target/classes/static/swagger/index.yaml index b5751db0..54f2c4a0 100644 --- a/target/classes/static/swagger/index.yaml +++ b/target/classes/static/swagger/index.yaml @@ -1,8 +1,8 @@ swagger: '2.0' info: - description: lz_management是一个轻量级的Java快速开发平台，能快速开发项目并交付【接私活利器】 + description: 霖梓控股用于对员工进行数字化管理的平台 version: 1.0.0 - title: 人人快速开发平台 + title: 企业员工数字化管理平台 basePath: /lz_management diff --git a/target/test-classes/com/lz/FumeiaiTest$1.class b/target/test-classes/com/lz/FumeiaiTest$1.class index 3eeed2ff4d9a34bfbe81e2267b7649dfc68df45c..22c712e8843dbba9d2d9d8ca701643fc9f6d6fee 100644 GIT binary patch delta 13 Vcmey#`jd6TRwl+LleaNB0{|@O1=j!o delta 13 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 delta 3041 zcmaJ@31F1P75?7tW@q=`*<`b@AwM}0V@?cINYV{*6i~24P%H?v$QC1noIrx$(XEQM zRa&uIk)*X++8U*{9BG%VP)My}mDbwB*0%Q09%_}^!>UA@_|0zEfVSP_pLz4moA=(# zeDD4L-Ahl_MxPpb{PhNgIyLJ=(f;>xX(!U`|uU)HqBRk z_!_>h@PGx4oo3K$VJ05*;UVlX%{LStw(w1S%ZKsUYnpvVVZWI>;6oq2ZJO^y72*~S zqF*6l`bQKFDIE6VyEtMYA4e?=;CmJdjZ}oA3XfVSG5z-~l;Wrdk9jd0kNa>8PgwW? zo;1=^J{-pnJ@}CsJnh4e@r;Eae&WGTJ@}ace{SJf{6eAfmmWN4p%&c+{gsh^ZKU5A z{pU^dTZP{#{9fS?vBi!D`yO)ba#R@P9)%YaUR3y_!k@Sc?pI*V+p?yyqqC{KZIi;E z75)-yRx4f3)<{QRkN223@KWCf-+YJjV$6>{>Axs?FD<`VwpQUk8bcV?0;vY0GQ_P#iAUfc^+O*@ zyjm>r2})wwR*6S*wO>%pK~b#53dGiBP03Y~sU=GSTCydmWQ>-vcv(=BRC>)b&MBx( z%5~Yfa|O^6k{l)DwB(AdWW1I<1|<1XprlYskpy|FTluSQt-iW`mX>0fpyV7a6D6qS zTnxtcXXpD$gDNeP%x2D)YAur`*q0S7mA;$DJS}~%=Nysn znTNA=Q)gqVz}eo_DF`i0?!2kJdNI$elPA|0X{{G{I@?pH7~31N3&;EyC4uTNOIq6c zcIO=v+ugXKE7G!w7qPanb8e)waZY1P%hE_oS8RJ;ZtVJk9>3bmQRAX(=(TJ`?0y}J zO)B)1&SW+M!bF^dx$Nh0ndl!2$i0y*dKw(bwl94$u%RWq5a|X!3LNu@!TuNOh z768r$t_>2Jc?gc>LFYlZ7FPBnqoFDRw_rv;RM=&j4AZ!sH7cYEc8j+vq!REr5cb%f z1iS**>Kd=@aVB69j9Rw!1l+xN-nJ4TJ!*Vrxpvn0L;jF=Hy*P+A%99Y^APm%gYbv5 zoHc<^AmrPPITdzhD3Cy=194=9vqSzK1Z-_*ClGL8SugVKEL$6mYzK=$upeX0+*l`; zZ3{^6@ZqSPl|V>Xq?U%%9`5)uKIZ4-Q^2Q!Pc5Ihw#%rdtX7;kD6lg|X9Bi+bl}|P zr;qw=N_vOhGHWtycN{tUY0d?6@H-JLVK)(`E@iPM<)9pS^jVBbBIon38g-b$d%S@6 zF%_3%8a~2!RuNr;Fj`TMEtrm*a3Su%3|8G)xQ{jMVXkSBFV*K$&2E0DZvscLs;lerecN6z{(^Q;=Jx22C@i?k&SIMa~T5&(BVET!4=4) z+g^sVl%Ze4^0|z&eg^g?uEcV97{aSqLCnk0U!ct^xXo2~1|KEnWBAAMF+^99ab==$ z6+va#HNregreQTAWMGy|#>c7dK#r8-YU(+W$LwvSF&B!Zh|X7$u_ZDdYbm+0j%PZR zNGiN0hL>`-p1x8mn@_KdqB*^^nM+%^bUiYMQ3j7ft3sPXyC`&|{+Sy?s8ZNKXyXt9 zW=4ikz>&fxIfYV%&Ozi3BBM-eeG+<@=KqH!Dk0iMhi>j|GpS`+U9IvqV z5t{d&95X{@8c$^c;{;)^?M)z8(2d)TWD7YzK5UVBRzLEB`TZzJQJ73jB8AaW$en_U z(#Qc6kFFa)ejF3xI46x3QgHx} zy_IfF3QdQ57!zP6Q)nc2(n)k$xD6P*5<5;oDcm-QS!n^Eq6xo~hXEb~c>chr`8eY0ix)C5SP0)`TS}8k(+U3EzgZSX3lZc0nrF!BW{8zQ9_$6Zc{lYic+4@Qq|%#}(Y* zoxH>C)HkoBy{EZC>2sXnM+b}j4pwMK^5Fe&pTcAoq0Blxu3jfkGDE0p-e`BRb>Q>K aI+H~y#^pQK(DU7#_z)k9z-;yic-{p+Gg2J@