wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

Browse Source
This commit is contained in:
fumeiai 2020-05-22 00:13:13 +08:00
parent dee8f67a09
commit 6b93cb7d29
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/workspace.xml generated
View File

@ -3,18 +3,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment=""> <list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/job/task/SyncnizeFlybookDataJob.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/job/task/SynchronizeFlybookDataJob.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" 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/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/StaffOccupationDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffOccupationDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-dev.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/StaffOccupationInfoDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/StaffOccupationInfoDto.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/job/task/SyncnizeFlybookDataJob.class" beforeDir="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/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/generator/StaffOccupationDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/StaffOccupationDao.xml" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -166,7 +156,7 @@
<workItem from="1588161274115" duration="1691000" /> <workItem from="1588161274115" duration="1691000" />
<workItem from="1588163384182" duration="74761000" /> <workItem from="1588163384182" duration="74761000" />
<workItem from="1588936950753" duration="95758000" /> <workItem from="1588936950753" duration="95758000" />
<workItem from="1590038091791" duration="22362000" /> <workItem from="1590038091791" duration="23054000" />
</task> </task>
<servers /> <servers />
</component> </component>

8
src/main/resources/mapper/generator/StaffDao.xml
View File

@ -100,7 +100,11 @@
<select id="getStaffInfos" resultType="com.lz.modules.app.Dto.StaffDto"> <select id="getStaffInfos" resultType="com.lz.modules.app.Dto.StaffDto">
select ls.id staffId,lso.employee_no staff_no,ls.name,lso.position, select ls.id staffId,lso.employee_no staff_no,ls.name,lso.position,
case lso.staff_status when 0 then '在职' else '离职' end staff_status, case lso.staff_status when 0 then '在职' else '离职' end staff_status,
if(ls.employee_id in (select leader_employee_id from lz_departments where is_delete=0),1,0) department_leader if(ls.employee_id in (select leader_employee_id from lz_departments where is_delete=0
<if test="departmentId != null and departmentId != ''">
and department_id=#{departmentId}
</if>
),1,0) department_leader
from lz_staff ls,lz_staff_occupation lso from lz_staff ls,lz_staff_occupation lso
where lso.staff_id=ls.id and ls.is_delete=0 where lso.staff_id=ls.id and ls.is_delete=0
and lso.staff_status=#{staffStatus} and lso.staff_status=#{staffStatus}
@ -118,7 +122,7 @@
<if test="departmentId != null and departmentId != ''"> <if test="departmentId != null and departmentId != ''">
and sr.department_id=#{departmentId} and sr.department_id=#{departmentId}
</if> </if>
)) )) order by department_leader desc
limit #{startIndex}, #{pageLimit} limit #{startIndex}, #{pageLimit}
</select> </select>

8
target/classes/mapper/generator/StaffDao.xml
View File

@ -100,7 +100,11 @@
<select id="getStaffInfos" resultType="com.lz.modules.app.Dto.StaffDto"> <select id="getStaffInfos" resultType="com.lz.modules.app.Dto.StaffDto">
select ls.id staffId,lso.employee_no staff_no,ls.name,lso.position, select ls.id staffId,lso.employee_no staff_no,ls.name,lso.position,
case lso.staff_status when 0 then '在职' else '离职' end staff_status, case lso.staff_status when 0 then '在职' else '离职' end staff_status,
if(ls.employee_id in (select leader_employee_id from lz_departments where is_delete=0),1,0) department_leader if(ls.employee_id in (select leader_employee_id from lz_departments where is_delete=0
<if test="departmentId != null and departmentId != ''">
and department_id=#{departmentId}
</if>
),1,0) department_leader
from lz_staff ls,lz_staff_occupation lso from lz_staff ls,lz_staff_occupation lso
where lso.staff_id=ls.id and ls.is_delete=0 where lso.staff_id=ls.id and ls.is_delete=0
and lso.staff_status=#{staffStatus} and lso.staff_status=#{staffStatus}
@ -118,7 +122,7 @@
<if test="departmentId != null and departmentId != ''"> <if test="departmentId != null and departmentId != ''">
and sr.department_id=#{departmentId} and sr.department_id=#{departmentId}
</if> </if>
)) )) order by department_leader desc
limit #{startIndex}, #{pageLimit} limit #{startIndex}, #{pageLimit}
</select> </select>