update code
This commit is contained in:
fumeiai
parent
e8c61568eb
commit
a2510f90c7
63
.idea/workspace.xml
generated
63
.idea/workspace.xml
generated
@ -2,55 +2,13 @@
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/DepartmentsDto.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffBaseInfoDto.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffDto.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffEducationInfoDto.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffProjectExperienceDto.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffWorkTransferDto.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/enums/GenderEnum.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/enums/MaritalStatusEnum.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/utils/BeanConversionUtils.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/DepartmentsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/DepartmentsController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffDto.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffDao.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffEducationDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffEducationDao.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffOccupationDao.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffProjectExperienceDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffProjectExperienceDao.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffWorkTransferRecordDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/StaffWorkTransferRecordDao.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffEducationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffEducationService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffOccupationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffOccupationService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffProjectExperienceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffProjectExperienceService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffWorkTransferRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/StaffWorkTransferRecordService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffEducationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffEducationServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffProjectExperienceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffProjectExperienceServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffWorkTransferRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffWorkTransferRecordServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffDao.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffEducationDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffEducationDao.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffOccupationDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffOccupationDao.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/static/swagger/index.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/swagger/index.yaml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/test/java/com/lz/FumeiaiTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/lz/FumeiaiTest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/DepartmentsController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/DepartmentsController.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/StaffDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/StaffDto.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/StaffController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/StaffController.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/dao/StaffDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/dao/StaffDao.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/StaffService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/StaffService.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/DepartmentsServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/DepartmentsServiceImpl.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/classes/static/swagger/index.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/swagger/index.yaml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/test-classes/com/lz/FumeiaiTest$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/lz/FumeiaiTest$1.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/target/test-classes/com/lz/FumeiaiTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/lz/FumeiaiTest.class" afterDir="false" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
@ -114,7 +72,7 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="JUnit.FumeiaiTest.contextLoads">
|
||||
<component name="RunManager" selected="Spring Boot.LinziApplication">
|
||||
<configuration name="FeishuBusiness.getFeishuDepartmentsIntoData" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
||||
<module name="lz_management" />
|
||||
<extension name="coverage">
|
||||
@ -178,8 +136,8 @@
|
||||
</configuration>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="JUnit.FumeiaiTest.contextLoads" />
|
||||
<item itemvalue="Spring Boot.LinziApplication" />
|
||||
<item itemvalue="JUnit.FumeiaiTest.contextLoads" />
|
||||
<item itemvalue="JUnit.RedisTest.contextLoads" />
|
||||
<item itemvalue="JUnit.FeishuBusiness.getFeishuDepartmentsIntoData" />
|
||||
</list>
|
||||
@ -198,7 +156,7 @@
|
||||
<workItem from="1588159936850" duration="1226000" />
|
||||
<workItem from="1588161274115" duration="1691000" />
|
||||
<workItem from="1588163384182" duration="74761000" />
|
||||
<workItem from="1588936950753" duration="52262000" />
|
||||
<workItem from="1588936950753" duration="54299000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
@ -231,11 +189,6 @@
|
||||
<line>190</line>
|
||||
<option name="timeStamp" value="43" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/src/test/java/com/lz/FumeiaiTest.java</url>
|
||||
<line>168</line>
|
||||
<option name="timeStamp" value="46" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/DepartmentsController.java</url>
|
||||
<line>53</line>
|
||||
@ -252,9 +205,9 @@
|
||||
<option name="timeStamp" value="51" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/src/test/java/com/lz/FumeiaiTest.java</url>
|
||||
<line>85</line>
|
||||
<option name="timeStamp" value="54" />
|
||||
<url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java</url>
|
||||
<line>102</line>
|
||||
<option name="timeStamp" value="55" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
|
||||
@ -35,7 +35,7 @@ public class StaffDto implements Serializable {
|
||||
/**
|
||||
* 人员状态【1：离职；0：在职】
|
||||
*/
|
||||
private Integer staffStatus;
|
||||
private String staffStatus;
|
||||
/**
|
||||
* 是否是部门负责人
|
||||
*/
|
||||
|
||||
@ -51,7 +51,7 @@ public class StaffController {
|
||||
*/
|
||||
@RequestMapping("/list")
|
||||
// @RequiresPermissions("staff:info:list")
|
||||
public R list(@RequestParam String jsonString) {
|
||||
public R list(@RequestParam Map<String, Object> params) {
|
||||
//当前页
|
||||
int currentPage = 0;
|
||||
//默认每页返回数量
|
||||
@ -63,8 +63,6 @@ public class StaffController {
|
||||
//人员状态【1：离职；0：在职】
|
||||
Integer staffStatus = 0;
|
||||
|
||||
Map<String, Object> params = JSON.parseObject(jsonString, Map.class);
|
||||
|
||||
if (params.containsKey("page")) {
|
||||
currentPage = Integer.parseInt(params.get("page").toString());
|
||||
}
|
||||
@ -99,18 +97,24 @@ public class StaffController {
|
||||
* 信息
|
||||
*/
|
||||
@RequestMapping("/query/{staffId}")
|
||||
@RequiresPermissions("staff:info:query")
|
||||
// @RequiresPermissions("staff:info:query")
|
||||
public R info(@PathVariable("staffId") Long id) {
|
||||
StaffEntity staff = staffService.getById(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<StaffProjectExperienceDto> staffProjectExperiences = staffProjectExperienceService.getProjectInfoByStaffId(id);
|
||||
List<StaffWorkTransferDto> staffWorkTransfers = staffWorkTransferRecordService.getWorkInfoByStaffId(id);
|
||||
staffOccupationInfoDto.setProjectExperiences(staffProjectExperiences);
|
||||
staffOccupationInfoDto.setWorkTransfers(staffWorkTransfers);
|
||||
if (staffOccupationInfoDto != null) {
|
||||
List<StaffProjectExperienceDto> staffProjectExperiences = staffProjectExperienceService.getProjectInfoByStaffId(id);
|
||||
if (staffProjectExperiences.size() > 0) {
|
||||
staffOccupationInfoDto.setProjectExperiences(staffProjectExperiences);
|
||||
}
|
||||
List<StaffWorkTransferDto> staffWorkTransfers = staffWorkTransferRecordService.getWorkInfoByStaffId(id);
|
||||
if (staffWorkTransfers.size() > 0) {
|
||||
staffOccupationInfoDto.setWorkTransfers(staffWorkTransfers);
|
||||
}
|
||||
}
|
||||
data.put("baseInfo", staffBaseInfoDto);
|
||||
data.put("educationInfo", staffEducationInfoDto);
|
||||
data.put("occupationInfo", staffOccupationInfoDto);
|
||||
|
||||
@ -99,8 +99,8 @@
|
||||
|
||||
<select id="getStaffInfos" resultType="com.lz.modules.app.Dto.StaffDto">
|
||||
select ls.id staffId,lso.employee_no staff_no,ls.name,lso.position,
|
||||
case lso.staff_status when 0 then '在职' else '离职' end staffStatus,
|
||||
if(ls.employee_id=ld.leader_employee_id,1,0) departmentLeader
|
||||
case lso.staff_status when 0 then '在职' else '离职' end staff_status,
|
||||
if(ls.employee_id=ld.leader_employee_id,1,0) department_leader
|
||||
from lz_staff ls,lz_staff_occupation lso,lz_departments_staff_relate dsr,lz_departments ld
|
||||
where lso.staff_id=ls.id and ls.is_delete=0 and dsr.staff_id = ls.id and ld.department_id=dsr.department_id
|
||||
and lso.staff_status=#{staffStatus}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -99,8 +99,8 @@
|
||||
|
||||
<select id="getStaffInfos" resultType="com.lz.modules.app.Dto.StaffDto">
|
||||
select ls.id staffId,lso.employee_no staff_no,ls.name,lso.position,
|
||||
case lso.staff_status when 0 then '在职' else '离职' end staffStatus,
|
||||
if(ls.employee_id=ld.leader_employee_id,1,0) departmentLeader
|
||||
case lso.staff_status when 0 then '在职' else '离职' end staff_status,
|
||||
if(ls.employee_id=ld.leader_employee_id,1,0) department_leader
|
||||
from lz_staff ls,lz_staff_occupation lso,lz_departments_staff_relate dsr,lz_departments ld
|
||||
where lso.staff_id=ls.id and ls.is_delete=0 and dsr.staff_id = ls.id and ld.department_id=dsr.department_id
|
||||
and lso.staff_status=#{staffStatus}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user