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 14:42:05 +08:00
parent d3146a8cf1
commit c388f6bbc4
7 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.idea/workspace.xml generated
View File

@ -4,10 +4,8 @@
<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$/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$/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>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -160,7 +158,7 @@
<workItem from="1588161274115" duration="1691000" />
<workItem from="1588163384182" duration="74761000" />
<workItem from="1588936950753" duration="95758000" />
<workItem from="1590038091791" duration="30308000" />
<workItem from="1590038091791" duration="31643000" />
</task>
<servers />
</component>
@ -248,16 +246,6 @@
<line>34</line>
<option name="timeStamp" value="84" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java</url>
<line>88</line>
<option name="timeStamp" value="89" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java</url>
<line>97</line>
<option name="timeStamp" value="90" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java</url>
<line>225</line>
@ -283,6 +271,11 @@
<line>180</line>
<option name="timeStamp" value="95" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java</url>
<line>95</line>
<option name="timeStamp" value="97" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>

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

@ -227,16 +227,16 @@
from (
select staff_id,
case
when TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S')) <![CDATA[ > ]]> 0 and
TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S'))<![CDATA[ <= ]]>3
when TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S')) <![CDATA[ >= ]]> 0 and
TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S'))<![CDATA[ < ]]>3
then '0-3年'
when TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S')) <![CDATA[ > ]]> 3 and
TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S'))<![CDATA[ <= ]]>5
when TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S')) <![CDATA[ >= ]]> 3 and
TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S'))<![CDATA[ < ]]>5
then '3-5年'
when TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S')) <![CDATA[ > ]]> 5 and
TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S'))<![CDATA[ <= ]]>10
when TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S')) <![CDATA[ >= ]]> 5 and
TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S'))<![CDATA[ < ]]>10
then '5-10年'
when TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S')) <![CDATA[ > ]]> 10
when TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S')) <![CDATA[ >= ]]> 10
then '10年以上' else '未知' end jobYear from lz_staff_occupation ls
where ls.is_delete=0 and ls.staff_id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)<![CDATA[ >= ]]>#{endDate}
or so.resignation_time is null)

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

@ -193,7 +193,7 @@
end category,
count(gender) number
from lz_staff
where id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)<![CDATA[ >= ]]>#{endDate} or
where is_delete=0 and id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)<![CDATA[ >= ]]>#{endDate} or
so.resignation_time is null)
<if test="departmentId != null and departmentId != ''">
and id in (select dsr.staff_id from lz_departments_staff_relate dsr,lz_departments ld where
@ -210,7 +210,7 @@
select
id,ifnull(CONCAT(left(date_format(birthday,'%y'),1),'0'),0) birthday
from lz_staff
where id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)<![CDATA[ >= ]]>#{endDate} or
where is_delete=0 and id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)<![CDATA[ >= ]]>#{endDate} or
so.resignation_time is null)
<if test="departmentId != null and departmentId != ''">
and id in (select dsr.staff_id from lz_departments_staff_relate dsr,lz_departments ld where
@ -238,7 +238,7 @@
then '5-10年'
when TIMESTAMPDIFF(YEAR,job_begin_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S')) <![CDATA[ > ]]> 10
then '10年以上' else '未知' end jobYear from lz_staff_occupation ls
where ls.staff_id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)<![CDATA[ >= ]]>#{endDate}
where ls.is_delete=0 and ls.staff_id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)<![CDATA[ >= ]]>#{endDate}
or so.resignation_time is null)
<if test="departmentId != null and departmentId != ''">
and ls.staff_id in (select dsr.staff_id from lz_departments_staff_relate dsr,lz_departments ld where
@ -255,7 +255,7 @@
from (
select t.id,ifnull(se.education,'未知') education from
(select ls.id from lz_staff ls
where ls.id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)<![CDATA[ >= ]]>#{endDate} or
where ls.is_delete=0 and ls.id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)<![CDATA[ >= ]]>#{endDate} or
so.resignation_time is null)
<if test="departmentId != null and departmentId != ''">
and ls.id in (select dsr.staff_id from lz_departments_staff_relate dsr,lz_departments ld where

2
target/classes/mapper/generator/StaffEducationDao.xml
View File

@ -17,7 +17,7 @@
</resultMap>
<select id="getInfoByStaffId" resultType="com.lz.modules.app.Dto.StaffEducationInfoDto">
select education,graduated_school,specialty,graduation_time from lz_staff_education where staff_id=#{staffId}
select education,graduated_school,specialty,graduation_time from lz_staff_education where is_delete=0 and staff_id=#{staffId}
</select>

2
target/classes/mapper/generator/StaffOccupationDao.xml
View File

@ -33,7 +33,7 @@
</select>
<select id="getOccupationByStaffId" resultType="com.lz.modules.app.Dto.StaffOccupationInfoDto">
select employee_no staff_no,position,entry_time,staff_status,resignation_time,resignation_reasons,company_seniority,signing_company,job_begin_time,work_experience,resume_url
from lz_staff_occupation where staff_id=#{staffId}
from lz_staff_occupation where is_delete=0 and staff_id=#{staffId}
</select>
<update id="updateStatusByStaffId">

2
target/classes/mapper/generator/StaffProjectExperienceDao.xml
View File

@ -17,7 +17,7 @@
</resultMap>
<select id="getProjectInfoByStaffId" resultType="com.lz.modules.app.Dto.StaffProjectExperienceDto">
SELECT project_name,project_begin_time,project_end_time,project_content from lz_staff_project_experience where staff_id=#{staffId}
SELECT project_name,project_begin_time,project_end_time,project_content from lz_staff_project_experience where is_delete=0 and staff_id=#{staffId}
</select>

2
target/classes/mapper/generator/StaffWorkTransferRecordDao.xml
View File

@ -15,7 +15,7 @@
<result property="transferType" column="transfer_type"/>
</resultMap>
<select id="getWorkInfoByStaffId" resultType="com.lz.modules.app.Dto.StaffWorkTransferDto">
select transfer_time,transfer_record,transfer_type from lz_staff_work_transfer_record where staff_id=#{staffId}
select transfer_time,transfer_record,transfer_type from lz_staff_work_transfer_record where is_delete=0 and staff_id=#{staffId}
</select>