From dee8f67a093c8b3f33d70575d589a1c7fe40f0eb Mon Sep 17 00:00:00 2001
From: fumeiai <fumeiai@linzikg.com>
Date: Thu, 21 May 2020 23:59:21 +0800
Subject: [PATCH] update BUG

---
 .idea/workspace.xml                           |  51 +++++++---
 .../app/Dto/StaffOccupationInfoDto.java       |   5 +
 ...ob.java => SynchronizeFlybookDataJob.java} |  11 ++-
 src/main/resources/application-dev.yml        |   2 +-
 .../resources/mapper/generator/StaffDao.xml   |  90 ++++++++++++------
 .../mapper/generator/StaffOccupationDao.xml   |   2 +-
 target/classes/application-dev.yml            |   2 +-
 .../app/Dto/StaffOccupationInfoDto.class      | Bin 7706 -> 8257 bytes
 .../app/controller/StaffController.class      | Bin 13304 -> 13304 bytes
 .../job/task/SynchronizeFlybookDataJob.class  | Bin 0 -> 1412 bytes
 .../job/task/SyncnizeFlybookDataJob.class     | Bin 1263 -> 0 bytes
 .../lz/modules/sys/oauth2/OAuth2Filter.class  | Bin 3694 -> 3898 bytes
 target/classes/mapper/generator/StaffDao.xml  |  90 ++++++++++++------
 .../mapper/generator/StaffOccupationDao.xml   |   2 +-
 14 files changed, 170 insertions(+), 85 deletions(-)
 rename src/main/java/com/lz/modules/job/task/{SyncnizeFlybookDataJob.java => SynchronizeFlybookDataJob.java} (68%)
 create mode 100644 target/classes/com/lz/modules/job/task/SynchronizeFlybookDataJob.class
 delete mode 100644 target/classes/com/lz/modules/job/task/SyncnizeFlybookDataJob.class

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 80e2a87f..652d89a7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,18 @@
   <component name="ChangeListManager">
     <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/java/com/lz/common/utils/ExcelUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/common/utils/ExcelUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/common/utils/ExcelUtil$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/common/utils/ExcelUtil$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/common/utils/ExcelUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/common/utils/ExcelUtil.class" 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/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/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" />
@@ -158,7 +166,7 @@
       <workItem from="1588161274115" duration="1691000" />
       <workItem from="1588163384182" duration="74761000" />
       <workItem from="1588936950753" duration="95758000" />
-      <workItem from="1590038091791" duration="10974000" />
+      <workItem from="1590038091791" duration="22362000" />
     </task>
     <servers />
   </component>
@@ -206,21 +214,11 @@
           <line>42</line>
           <option name="timeStamp" value="66" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/job/business/FeishuBusiness.java</url>
-          <line>80</line>
-          <option name="timeStamp" value="67" />
-        </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>106</line>
           <option name="timeStamp" value="69" />
         </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>133</line>
-          <option name="timeStamp" value="70" />
-        </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>212</line>
@@ -241,6 +239,31 @@
           <line>205</line>
           <option name="timeStamp" value="81" />
         </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>167</line>
+          <option name="timeStamp" value="82" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/job/business/FeishuBusiness.java</url>
+          <line>51</line>
+          <option name="timeStamp" value="83" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/job/task/SynchronizeFlybookDataJob.java</url>
+          <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>93</line>
+          <option name="timeStamp" value="90" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java b/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java
index 9974741f..4ef88504 100644
--- a/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java
+++ b/src/main/java/com/lz/modules/app/Dto/StaffOccupationInfoDto.java
@@ -56,6 +56,11 @@ public class StaffOccupationInfoDto implements Serializable {
      */
     private String jobBeginTime;
 
+    /**
+     * 司龄
+     */
+    private String companySeniority;
+
     /**
      * 工作经历
      */
diff --git a/src/main/java/com/lz/modules/job/task/SyncnizeFlybookDataJob.java b/src/main/java/com/lz/modules/job/task/SynchronizeFlybookDataJob.java
similarity index 68%
rename from src/main/java/com/lz/modules/job/task/SyncnizeFlybookDataJob.java
rename to src/main/java/com/lz/modules/job/task/SynchronizeFlybookDataJob.java
index 9c9ca8e4..071b6e82 100644
--- a/src/main/java/com/lz/modules/job/task/SyncnizeFlybookDataJob.java
+++ b/src/main/java/com/lz/modules/job/task/SynchronizeFlybookDataJob.java
@@ -22,18 +22,19 @@ import org.springframework.stereotype.Component;
  *
  * @author fumeiai 20200429
  */
-@Component("syncnizeFlybookDataJob")
-public class SyncnizeFlybookDataJob {
+@Component("synchronizeFlybookDataJob")
+public class SynchronizeFlybookDataJob implements ITask {
 	private Logger logger = LoggerFactory.getLogger(getClass());
 
 	@Autowired
 	FeishuBusiness feishuBusiness;
 
-	public void run() {
+	@Override
+	public void run(String params) {
 
-		logger.info("syncnizeFlybookDataJob start date == {}", DateUtils.getCurrentDate());
+		logger.info("synchronizeFlybookDataJob start date == {}", DateUtils.getCurrentDate());
 		feishuBusiness.getFeishuDepartmentsIntoData();
-		logger.info("syncnizeFlybookDataJob end date == {}", DateUtils.getCurrentDate());
+		logger.info("synchronizeFlybookDataJob end date == {}", DateUtils.getCurrentDate());
 
 	}
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 8cdfb375..c499bc7e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,7 +3,7 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://101.37.106.150:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+            url: jdbc:mysql://172.16.157.238:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
             username: ldd_biz
             password: Hello1234
             initial-size: 10
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index f6b01a2b..a27798e0 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -100,30 +100,48 @@
     <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 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
+        if(ls.employee_id in (select leader_employee_id from lz_departments where is_delete=0),1,0) department_leader
+        from lz_staff ls,lz_staff_occupation lso
+        where lso.staff_id=ls.id and ls.is_delete=0
         and lso.staff_status=#{staffStatus}
+        <if test="name != null and name != ''">
+            and ls.name like concat('%',#{name},'%')
+        </if>
+        and (ls.id in (
+        select dsr.staff_id from lz_departments_staff_relate dsr where dsr.is_delete=0
         <if test="departmentId != null and departmentId != ''">
             and dsr.department_id=#{departmentId}
         </if>
-        <if test="name != null and name != ''">
-            and ls.name=#{name}
+        )
+        or ls.employee_id in (
+        select sr.leader_employee_id from lz_departments sr where sr.is_delete=0
+        <if test="departmentId != null and departmentId != ''">
+            and sr.department_id=#{departmentId}
         </if>
+        ))
         limit #{startIndex}, #{pageLimit}
     </select>
 
     <select id="getStaffInfoCount" resultType="java.lang.Integer">
-        select count(1)
-        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
+        select count(ls.id) count
+        from lz_staff ls,lz_staff_occupation lso
+        where lso.staff_id=ls.id and ls.is_delete=0
         and lso.staff_status=#{staffStatus}
+        <if test="name != null and name != ''">
+            and ls.name like concat('%',#{name},'%')
+        </if>
+        and (ls.id in (
+        select dsr.staff_id from lz_departments_staff_relate dsr where dsr.is_delete=0
         <if test="departmentId != null and departmentId != ''">
             and dsr.department_id=#{departmentId}
         </if>
-        <if test="name != null and name != ''">
-            and ls.name=#{name}
+        )
+        or ls.employee_id in (
+        select sr.leader_employee_id from lz_departments sr where sr.is_delete=0
+        <if test="departmentId != null and departmentId != ''">
+            and sr.department_id=#{departmentId}
         </if>
+        ))
     </select>
 
     <select id="getBaseInfo" resultType="com.lz.modules.app.Dto.StaffBaseInfoDto">
@@ -132,7 +150,7 @@
 
     <select id="getStatisticalData" resultType="com.lz.modules.app.Dto.StaffStatisticalDto">
         select
-        count(DISTINCT(ls.id)) totalStaffCount,
+        count(DISTINCT(ls.nowin_staff)) totalStaffCount,
         count(DISTINCT(td.leader_employee_id)) managementCount,
         ifnull(round(count(DISTINCT(td.leader_employee_id))/count(DISTINCT(ls.id))*100,2),0) managementRate,
         count(DISTINCT(ls.new_staff)) newStaffCount,
@@ -148,16 +166,19 @@
         left join
         (select staff_id as leave_staff from lz_staff_occupation where date(resignation_time) between #{beginDate} and
         #{endDate}) so2
-        on so2.leave_staff=ll.id) ls,
-        lz_departments_staff_relate dsr,lz_staff_occupation so,
+        on so2.leave_staff=ll.id
+        left join
+        (select staff_id as nowin_staff from lz_staff_occupation where date(resignation_time)>=#{endDate} or
+        resignation_time is null) so3
+        on so3.nowin_staff=ll.id) ls,
+        lz_departments_staff_relate dsr,
         (select * from lz_departments
         <if test="departmentId != null and departmentId != ''">
             where find_in_set(department_id, getChildList(#{departmentId}))
         </if>
         ) td
-        where ls.is_delete=0 and ls.id=dsr.staff_id and so.staff_id=ls.id
+        where ls.is_delete=0 and ls.id=dsr.staff_id
         and dsr.department_id=td.department_id
-        and (date(so.resignation_time)>=#{endDate} or so.resignation_time is null )
     </select>
 
     <select id="getGenderData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
@@ -168,7 +189,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)>=#{endDate} or
+        where 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
@@ -181,19 +202,23 @@
         select
         if(birthday=0,'未知',concat(birthday,'后')) category,
         count(birthday) number
-        from (select id,ifnull(CONCAT(left(date_format(birthday,'%y'),1),'0'),0) birthday from lz_staff) ls
-        where ls.id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)>=#{endDate} or
+        from (
+        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
         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
+            and id in (select dsr.staff_id from lz_departments_staff_relate dsr,lz_departments ld where
             dsr.department_id=ld.department_id and find_in_set(ld.department_id, getChildList(#{departmentId})))
         </if>
-        group by ls.birthday
+        ) t
+        group by t.birthday
     </select>
 
     <select id="getJobSeniorityData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
         select
-        ls.jobYear category,
+        t.jobYear category,
         count(jobYear) number
         from (
         select staff_id,
@@ -208,31 +233,34 @@
         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
-        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)>=#{endDate}
+        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}
         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
             dsr.department_id=ld.department_id and find_in_set(ld.department_id, getChildList(#{departmentId})))
         </if>
-        group by ls.jobYear
+        ) t
+        group by t.jobYear
     </select>
 
     <select id="getEducationData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
         select
-        ls.education category,
+        y.education category,
         count(education) number
         from (
-        select ss.id,ifnull(se.education,'未知') education from lz_staff ss left join lz_staff_education se on
-        se.staff_id=ss.id
-        ) ls
-        where ls.id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)>=#{endDate} or
+        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
         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
             dsr.department_id=ld.department_id and find_in_set(ld.department_id, getChildList(#{departmentId})))
-        </if>group by ls.education
+        </if>) t
+        left join lz_staff_education se on
+        se.staff_id=t.id
+        ) y
+        group by y.education
 
     </select>
 
diff --git a/src/main/resources/mapper/generator/StaffOccupationDao.xml b/src/main/resources/mapper/generator/StaffOccupationDao.xml
index 39209b41..35f59537 100644
--- a/src/main/resources/mapper/generator/StaffOccupationDao.xml
+++ b/src/main/resources/mapper/generator/StaffOccupationDao.xml
@@ -32,7 +32,7 @@
         select * from lz_staff_occupation where is_delete=0 and staff_id = #{staffId}
     </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,signing_company,job_begin_time,work_experience,resume_url
+    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}
     </select>
 
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
index 8cdfb375..c499bc7e 100644
--- a/target/classes/application-dev.yml
+++ b/target/classes/application-dev.yml
@@ -3,7 +3,7 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://101.37.106.150:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+            url: jdbc:mysql://172.16.157.238:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
             username: ldd_biz
             password: Hello1234
             initial-size: 10
diff --git a/target/classes/com/lz/modules/app/Dto/StaffOccupationInfoDto.class b/target/classes/com/lz/modules/app/Dto/StaffOccupationInfoDto.class
index 796bf7a7922b83f2b75f5adeced3decb446a023e..ccb65b5bff3af80b64ab0acaf60f61841f1bd55d 100644
GIT binary patch
literal 8257
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

literal 7706
zcmcgx`F~Vb6+btb<;~2SB{P{MFQGKC!2$_QtN2k~AQVE_Odzt=)~!RBkb%ieI!h_I
z)m^Ktt*y3Vt+;_!v{XxwwsujWio4>5zvy4!&wjMx_uRM4n>Q~o^auNa^Ugcxd%pL+
zd(J)g4!!W-XI~(qmGsvz-Au<r6r&R?zQy9(ES_ZX9Tq29e3!-dSUknz6pN=>d_PD(
z2;=z-i_^?D&)OLlKV)&1#j`A)WAQwTAF+6W#fvOnV(~J^{y0cK3DaUauFy~Uc}}78
z3caGx&lLK(LKhVJg+jkn=vNB;TA|-C<hKg_PNCnk`iCH04ALJ3CCb@SE|cGrEtPY{
z!tN~_1c|MJqNBw^xsoYV_GI$atRD-&{|P}sSf{7A6$K^74`lAn4COP0{X;t|rCeeE
zupniwSk6_zBq)?ER7!_;<z};jA~I@cB~z)E1;tC*a&CVi!#KmAbXay|Gi3}eD8?Yr
zjuvO<GKIr})C0x6>$CfFW>D-<v2<|ko;iF#wlIZJLSU)RW_OqJnB82dcpy7fsrkW}
zFs59s<nlw~xpD;)4(*gPsg@AG!R1~(K2@9@${!h;E$*x4v*n@8+}zNHN)exnHJEe{
z0MGCUD5E^DU8PK+JdITqwDy{4Z*v4&jDgj;Las6*sCDVGJ%W6r#eJA=d^}gkZmZ7j
z&6aj$_U2(pju)qp%M3D#chl&r%;YeOp(}pO_Nl4roJ`1;!gP_x6%^i|t;jFsY_~66
z=9TXVFq3x5RlJSWvL3Stti&f_*x}B7y54A~zm20^6%dDQYh4jAikGaGXVi(oXq5sF
z(2y*wNYeTwXFY6eFuukrNSG6I6vDb|<n}6saM_WR^wP$haDgNyvXz<QzR64}Gn=i*
zB8(u;ktn=56J?RwiGraqQT4`JqBz=}DA-(yf~6r*2BV!Qym}=nWqxKYPyCS`^~HX8
z&MNp#Zuo1;pj=0D&W;?ezc%v56f$ohdsj7+M+w#?aQj|vSi{TiKnr&DSJNfPU#!ez
zODJ*P)cs|v7e}Sp@h;u9UK}(04ub?ZI&|DXI4p_U5LQ{VIfk)p?Gonb-$qAI8_))O
zryFjUQCCBR?MfL_an)G6IUAR`O@ix>ilhOpHyW&mT+PE|b(>?>ysct27YrY0S&UDc
za~}&xv-xRWuB7DU(HupVGN$XYMzQ2m2PZOfva#bbfioN@?o_5Q#^nTcCR3g<&ITM5
zTTm^NJGM-Wp`4%xc&7OZP_;4%_17vQ-0#S}YGAA!C;A)mm~xuzM8*5vXLhu|e$nIo
z?v)KQleLDaey>G}$sor9DV3se<-jSmvsf)nWjE&d0PMkxr>7eZvzz#)qS9vCqSBk`
zEh?>Ip|cofv6{si79%XyvbdGSIu`3`RHcnHDrm)(?gI^@s`L<*RN79HD&57}+gRJd
zVke7TEOxWl!{Rm;Z)b5ki#zBYD!q%v=jdTUo$kxl`f4t}k6Xd@-ru~mY&3^8D*cK6
zj4Rk+ua)dI=pTc<cDnHz8|;;EP~nCKLvpa!m2w!<bw)Gku(u()ZWF>5AMAA|-ayr-
z9yUzFPCi~SKx6vl2mA$x+F)<ph5%kHQ|aq8314k>j8=&Yi!|kMS(6vs+!5o76u=!W
zTiAzOdYzpO$Emr>xDD0etyaAtp89Z4znKKxLQ(3bH_#iQuf!F)h2Dg}C_<^D4&@W2
zD4(cC`9wj=Cu&kYQI_(F%9KwOr+lJ5<r5_e{tZ$e13#+Oe&0mbK}YRFZUtfpPl2a@
z`56*V%aFH12Ba}g<Iq(DKohhLZ-Pr0vOf43YB}W!?(hso)q4cDx`TT>gRxsYf_?7b
zUe93cGLK-tJ9vp_Fm|U$aKIhB+%p)v+9NpV4j%FhMmO*XR@}iWJ%iCjJc2{+;8mW%
z=sq67VR!I|XE3^!M{vX)Jn9*YZiljUSD5M!-s}-<RQ)?KHoBz;Nz_d;u^`F2LGm8D
z(<IUHY~h`;eBd;-c<+=B17YqI-bK8%1!WND7kEkFWv@47YqONxC2Y!7l5)zM($_2{
zHyoQ%mz4XwDgDh-a__P!hb3j!n=;TWCAUGFa<!zK_NELrOUWJ8rd%T__j^++%~Eo6
zwkby><%~CFs98$x^ETyLNtyGe3^z;3M}|##tE4>OO&MvHl20F-a-F0+NO@|N`*_^B
zdsL=uCHFbgxO<F)Y!+za3<}`(HC7vBJq9uMdjZCx_h8Xx2QyAd=U^LYQ*E$~_F!``
z;s%E=LWgR79M2vci<btLA1A-><iN`mJ4*i6lLIeNY+`WvJjLZJl*G0{2;H~h6^dxS
z^VD{N)D@a<p4u!#QuhOr)B~EIF@f`xJV8;-uLT^SlpX{qr7K#HL5c|qYKjBYu7?0>
z*TY(fL17aV(!vf<T8{vf)>SRSAk_pxbAUSZC_o*0Op7uoW`d$x%mM1u;{bK)2`$c`
zgb9jk2?wZ4Zv&`HPik!pN}8ZHE$IMhdI}&-Z`V=`YBxbCt=$3Y*3$rW>m6E}K^-P2
zt#vp+J$ffVJ$jec$)GM1)TwnjK#Oz@phbGOrZK471Zi5g1@fKrs#cLOvTpTyaf!-Q
zL1m=HIjZ8O)I$AYp6-UNm6nTBbO@S{Hi?Jn9%z1=5cktzXaUNL0v&-Cq>`AS_d-+X
zA+d$t2Q5U8icxw$v@p$!e)<5k2t6+r(+8oc^f$Up_d<)(Kj>fdA!sq&<}T5Pp~Xdj
zF49M!CBzasO&^8UCI;v!`WUpN*h&x5$DyUfB;7}!fYvUGbdWv?EiI~)rB6ZY5Rc#j
zc^|Y+aTLFUJ`Jr)oW+&)Gte~gBG%!4Xx;Px*69JdF{u29VnO=stJD#s2k}P{uTqzx
zhW^j0b@G<6d42o?%-FQ}#V4TQQ0Cpr`E6OC8zE2f)(a@I%K0_V@~Uib_%Q|(+JJvC
zDB@@Xn-jyUeQV@qUz8Z0!B$ri11BiBVxF$MlkG{}#}3VBdK7K|hAXA}r3-ss1}U1~
za<%IL=?d5`bOa+Rtp}wG&A^NbTCNUVkuJq{p+y)`oq9;R&>hUEkmc&q!_pPDUFaD`
zl%_|d3+=*;ide30U6n4?cBz)DM~_Mu`iB`6wOotzm~_Q#7rF|@TI9Lu=rLoB&7`!7
zF?xhPj|}*+NxlHBg~DQl9z~*B=>`=2W6*pwBEs}VXny>b{wE!U7Qo+&^d(3XDxIar
zp(*qvJwacF7NT?5Hcvnc)8A=^z5*>m|Hi1tpsAt*zu>+KEh=uIPWl?O7#DwQH+5Zx
z!3RzuQ1JLaB$qLf+ItHd(&V=Q7RFa^GGPG+tcG-3O>nRtT*G@f%n+p^q!#7vGXq0j
zfwkBL-DY@rf$$o`l@KOLWMPsT&s9Jsm3l?08r#)zCSmkygf-5lpe8LhRasXEzrr6`
zbw1gGn?al8@#e^DGrxua41qn0f0{9RC0)Qi<$rTH_8cv~{R~~7?474RZkc!_UuWpJ
z67(f+F!U7b{f3TPKwol+p{H4Yy`kga?@Qij=$))DHFTWyeaU5puCb1Bcq|<6eaQhs
k@0q8;BpNi^7qNa5^m!U`|5SATbI38X2MPLyJU+hpKcP@HkpKVy

diff --git a/target/classes/com/lz/modules/app/controller/StaffController.class b/target/classes/com/lz/modules/app/controller/StaffController.class
index 1df36fe5007bad17579911e687d4d3f48ab7e5c9..e1cab5d089c43f5a29001fc43f3032f80c0a55ea 100644
GIT binary patch
delta 100
zcmey7{v&<E9s^TehCW7qhUts~4D%QT8I~~$F|214Vc5Ya%CMhNjNv$=IKu@-Nrumi
zG7R4sr5JuNN;CXrl->N%AfJ&{je(m{V{)od2dg2FWej9lP1Z3EWVK=7W3-#xWLyRS
DNl+Pz

delta 100
zcmey7{v&<E9s^T8hCW6ChUtug4D%R;7?v>#GpuJ6W!S+e#;~7JoZ&d51j7YJDTdFC
zvJBrCr5S!O$}s$8l-vB#AfJ&{oq?NCb8@Ot2dfc~WddYbP1Z3EWVL1BW3->#WLyRS
DO=20I

diff --git a/target/classes/com/lz/modules/job/task/SynchronizeFlybookDataJob.class b/target/classes/com/lz/modules/job/task/SynchronizeFlybookDataJob.class
new file mode 100644
index 0000000000000000000000000000000000000000..411a3a071d149d0c2c180e176d9582832b870b7d
GIT binary patch
literal 1412
zcmaJ>YflqF6g@*r3uP6o0wNEqfRu`i2r9}$0YieRkBIVp+D^;DcBa{#g@Ex#nJ7L!
z_yhb=#yi_06<gDE9(V4Xd+ywG_vf$gKL9LXBLxSOcDR+o6tdmu!E_gLDcr_P5AI;r
zT6hX~G1rBANz5m)ki>n4gr_SN=`*DB+OP1yD=+Nvd}Lc<xLB5Mup6$2fvaQ?FwEqO
zy2`y{Ue%@0lL6n;1zu<z^Uc4!>Hg50P#L!>cig}&cydiCZG>^PBB;fBz?$!>O4%1x
zd8qw;UXVfsyex`F`$t^-xxm*#qYqtQmIyYn>?+r+GQ_geI}Gs+U6KsFc_R5TtQMsI
zR#3Dkr=sw7gzwsY!x%TaE`^_Om5C9-KHol4#a&-3_gHRvM+L3-p9v$L>jFiN`JrOy
z&*t~Uf#9A{6~1k321}Mmq9!O20#E;Y&d~Qlnq6IbZGEJXKKZ4#b?6u6rfb=bwGBLL
zqcP-KzF0s|Qk$ci<QuwL(@H8sOgj&R7ZU1F&@LSZSJ3a^0Ujo?=-?3^JGh8miqrN=
zCNRP`nUXLvv$B$T{~?Jb2g_JVV%5PDJay2AOG&IbSVuoYwmp(mr6wGPxfa6ue>vzy
z&#LgMuqTU#VYD60)?2DALsvzb4Nq7tU(QZ9l_@gPyA7UigUz}Y8M^6ey)zgln-x&M
zI^C*)PU#S<s#ZKSt`~5UlYD1a)L@oQ==)SNYbE8JlCrLmCvoaK&xthes<LL7YUa^U
zVpCG}SBbQlYw<8`8kb>&Xw{qfnIuh{D)9@pl+m^maD%=j4j3+=gMK6#`Ub%ko@{Aa
zC1}1(a|g{NF&YPGw;JuqFZTs3mpehnSHwOe{xR|#q%lPvz%|4%jH|S=F)Z#7*+A=I
zjF5-LDj^p6PUJozp6>jL#5W{kpk3Dqx+7!i)Od!UCS+io7*7zZNm@-saR%yGjX0pw
eQH)W%>*U=@lA@^tnP|KbCD=oUH|akfVB$Br0(p!8

literal 0
HcmV?d00001

diff --git a/target/classes/com/lz/modules/job/task/SyncnizeFlybookDataJob.class b/target/classes/com/lz/modules/job/task/SyncnizeFlybookDataJob.class
deleted file mode 100644
index 9a1315f44fd94875ac8a1bb4cde7e020180eeada..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1263
zcmaJ>T~8B16g@*r3uT2`5JW(We3gm}Dk@qqK}Zu#qlqXFzRkANvap?Lc4r~Q_@hh|
z(FcEkKgxJ_Tclz!P3O+sx%ZwkbI<J0U*CTKSj9#P7P8?mox*L*^kV?CeV9vO9t#7=
zVKMaNQ@DerKHN=WISI~?aCNOFJ%&t4do}L6)zy7oihKoz!K!rpz2JG^J4*UK!&0fN
z>)bu&bzKQu>GOSUbGyCGi+@E^{`i|f8K*9H9pABCxv7*k!Z=z{skIhh!*f)v>WR8M
z(%u2LrBFVvin7sOlZ!tId^0fm$nj)_$|lww<(Ov-vE1S=LwrkDB*RdNNWKc{w)EZ#
zLW|B+7VfU_oN(QC#?78X@GIR;VuXLdcbclKoMTyZo3_>m+ro&K+9ueT7bu3*jt;!C
zEIJ{=MEBt3eQ_ul@?DSU8|g`HnhnXfbiJXKREDbe9tt<0lB0fCd<(-Ev9N-BN!+*a
z0IL?RV31*<dwkY6!ZX>5FfzNbk^S&7iH8;*;c*gc7M|d#g(0MqC|Fp>2*cbZWu&Tf
z6k%BIB7px~8$&w03+@V4<FD;~SvCxPHEFh75ejNJw^%w4h@5m6V;8kpYzcy)pHf@$
zB+9veQWv|ac&bgAOkFD;7{~QFwN<_gXQc9wPT+aehtNy9IU^N@Mv=rReUTFh&rwxP
z9q8n-V?sd}I+(RiT?mz$?{ayUydH*0qSbm)+p<ButP?-~g)%x+B&O*#TlDgK=tnxB
z8N!Bw;VR7%WHV%Y$dYboyhf{M(HcnSzk=oSC+Imv><i+bqR3GiQxpN*KpYboqnSmS
z6p!l|C(CH(tk!$PqP^MtXT&qTr$~H5G6q`pouEH*rp}z_^)pl%^m!V@3^AIealQj*
XwvE$6=ppyX=qv+-Ge!TKK5qR6Z_G{0

diff --git a/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class b/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class
index 3632a31756bb1b9b9a89658e9f66d0b7a903fa53..64186ed4fb978473a9cd193d1304d8a77578ddf1 100644
GIT binary patch
delta 1522
zcmaJ>TXR!Y6#jP3WhbX6rHPhu8ZPNw(zLY|p^c!HS}qC{1*<4pYfUk2O==TLQ8a+{
zu4vt&;stbk=mQ-`#+hDl#^J?r#z%jFzrYuL@PT3c_GwIKeDKViz1G@iUB310wa*_L
zuW#=8_15*D0BplI4jOPo;;4gqJnCQ&k4Zf4z{0T#1n@)%PvW@4<tYbGV@S^RRu4#=
za1hZ^&j*olFotn$PgI}+FF42|r;|+v@uJ?Da*#*C!AVR@oC=~-=bh2ZX^EF4UcPp5
zN<_{GIQ=st>B&MSm(5GOqBaEnRAXkh6fno~xvUBqe~F~pY$R2uxg#X;jKr%<sIHn<
z?M5^SG^w!F6n1eCha`$F&f=W9U?t*>IPc;$%u2lO;tjm%;w^2Qaq%|Z5ol&u+|Ez3
zY+5zi$*u3=J%L#7$VfV$Z|lot3sbp?w%&<}+^M#KsmzH?R^ojZ7ci^7vuo5jdsBx%
zIFp?op2$2GFXYD4boju<hnREm5tNIMaZ%zE7oTb%pJA7}Wi@QSg!2-gyZ8cMvJn?w
zVOHR_vEk|Aj!dp&|3H}x7ngCx#n-r^vCdiXA8O^iP`?E;>T>AkIyXI&9ywV^AIK4z
zKxIB%(3sQN!qL-{X@PdN#b{EKMo5i?wy6=P|8PA|Tt7AhNF3K@S{;;v(n>5rT%!^|
zOUVg{;|}WXsspwnLCZudk}!zrZzoyQzESRh2}6vmVnmc4IxgYw$4YTP3~gxlbH!Np
zPF4!hw-a5=b{GAF5H}H(oX)#xne^O_9n?Yr25O{wvl~4O)X1kO)wdN5K88x>0CQF|
zUkx*?)%VKvy>fl8R3Gq=!ab$>21JctFl>|yru?Eiu}gPM{dY>6axl?)1A!$NhuVtE
zFfU<u@&+nWre{XoXm|yc2B@xEMwPGsh{&-eL?dD@diye}7qLENdFBdg1UzdI8;pfS
zYjP3Z0#h6Q0W^~w5L}4xs<0F5384=664?Fd#codf0~o*_Hd+L?Z94Q&-badhQAwvR
z-euw}cRyI}ez45`!T++)JO01y>&ia+qJ=m$!cnhi>dr0Ciq@_m7GOhb6j*B%u)U4H
zKqlw;Qcc+;!?PE$iF~AFi6BpEYJ#4%N==Z|%)?6A#sa6I1w(iin@a?>^B)7!AXR<1
zrKr#QI01FjtB=&!=tnKzJ&-uU3D$fBHQX{EqwIaJKaHc<hy83zf7KJJCu!8@$Yk`8
z&#L85Xawd>bV)qeC-Km@!~x;YOT^sEWMCSU2PdHaN2N*4Q|hF#*65ZM#Q7=d&y4Ha
yb=v-(pLy_VU1iNa-AjBmpo})g!#+&3|K6Cu+Kut_ndy6C2|9sJ4|5IRk$(VpQQ&_7

delta 1307
zcmaKrTXR!Y6vu!2Bq#gi<g}0=)YAe6Y^kP^C|IfSZmk8iLTSCA)e=gYUZAOMiUqat
zepke!Xi=a0AP+Lklon?kUK|}igTD9ye9%|MaqZJg;K|Hn?X_lI{_DTiI+wTpwYmD+
zzn6ak?&MpSZS-pnx}+I!8RRL=(=Im8B(Qik&LN(2MLh2^#0#1i9flJmIP6exIAYWh
zhode<MqNsbX~tb9m~=VDam|!V6a7Y%P3*MGOU!K2%sS)@LdA$V%?ZuR7rvWO$$5p_
zGe1(Cu8fzbW;G{+wDnIg82Q_YPRy346xm=%?F{Ckok22^k4s0IQ&KOu82vu7otuM#
zok={-6Pi~%Ugfpmtex4iodu67uWR1$c$2q0-ZsX($2+_m{9$(lS7O^D@39cXV%f<1
zd=PZT($x<=J~Ck+dwjyDistf6DOZ>-jEog?W0lHuZm)=eN})0*eV+0-ZGu1ZIK$_P
z8%D~<bER^*bgY;wN#nU*5gq|wcznrO%~u{@v!K{8Q8-b^jhA!#_SboPEOO5A_=a<e
z9l@fVzPLv(sdbIB#Y%U1s#2V)44#}W2ERL#LDn4!dgDI_r`?_dY1yXv#ZbsBM7D~R
zlUK=WXD*>Gh+@%J3qsbuLv(K~fOc*XE6S~8h|n6eCbFt6=ub2qHc=VzKuaykXdPt3
z%oc8Ar__y;61dwX_YR44P*+K5cCkCGs^sE2MT=XKh@=>(yVxU%t--H}Ox3j2D9K2P
zjZ&gX60QOJbzr{^?AL(7r;EF5z!6kah}00NBXxyndG0a9M1N2kH%M0Wypd)k)o^go
z8-k|S+;vdX^cq{M2Kqm&?&Uti3RJt4i3`H0AH6~%Z~J!2TcyE5l*ZJ$Rn|w0np`1u
zFf_8uZ1@G8U6Q}3`B+k&@ng$uTwzmQ|47rJOWf$|W&FJ3+p9Dyd}o=KCG31Ga$ab)
zGt3b-3vgTTXT$EQ8R3vL(IuYyc|ch9&@2OZ2+e@({$UxnV_K|p9hEJ1hnpSc5s9`!
zui<Y-HX8DeO7<|1%Czio+exBV*`?Xrt=TuJc}#^XNJgtt3@Jl>7Z&n`uFZ#8c}>xl
zj?|V_wp#RMSBNg+h4xLx{z2TrMPw?xz@x&Y#CpbL>66#(>iWy<<4Ng1yvKH-XI(o;
T-yEblLtD`&k7B<_iv#}wSERfY

diff --git a/target/classes/mapper/generator/StaffDao.xml b/target/classes/mapper/generator/StaffDao.xml
index f6b01a2b..a27798e0 100644
--- a/target/classes/mapper/generator/StaffDao.xml
+++ b/target/classes/mapper/generator/StaffDao.xml
@@ -100,30 +100,48 @@
     <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 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
+        if(ls.employee_id in (select leader_employee_id from lz_departments where is_delete=0),1,0) department_leader
+        from lz_staff ls,lz_staff_occupation lso
+        where lso.staff_id=ls.id and ls.is_delete=0
         and lso.staff_status=#{staffStatus}
+        <if test="name != null and name != ''">
+            and ls.name like concat('%',#{name},'%')
+        </if>
+        and (ls.id in (
+        select dsr.staff_id from lz_departments_staff_relate dsr where dsr.is_delete=0
         <if test="departmentId != null and departmentId != ''">
             and dsr.department_id=#{departmentId}
         </if>
-        <if test="name != null and name != ''">
-            and ls.name=#{name}
+        )
+        or ls.employee_id in (
+        select sr.leader_employee_id from lz_departments sr where sr.is_delete=0
+        <if test="departmentId != null and departmentId != ''">
+            and sr.department_id=#{departmentId}
         </if>
+        ))
         limit #{startIndex}, #{pageLimit}
     </select>
 
     <select id="getStaffInfoCount" resultType="java.lang.Integer">
-        select count(1)
-        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
+        select count(ls.id) count
+        from lz_staff ls,lz_staff_occupation lso
+        where lso.staff_id=ls.id and ls.is_delete=0
         and lso.staff_status=#{staffStatus}
+        <if test="name != null and name != ''">
+            and ls.name like concat('%',#{name},'%')
+        </if>
+        and (ls.id in (
+        select dsr.staff_id from lz_departments_staff_relate dsr where dsr.is_delete=0
         <if test="departmentId != null and departmentId != ''">
             and dsr.department_id=#{departmentId}
         </if>
-        <if test="name != null and name != ''">
-            and ls.name=#{name}
+        )
+        or ls.employee_id in (
+        select sr.leader_employee_id from lz_departments sr where sr.is_delete=0
+        <if test="departmentId != null and departmentId != ''">
+            and sr.department_id=#{departmentId}
         </if>
+        ))
     </select>
 
     <select id="getBaseInfo" resultType="com.lz.modules.app.Dto.StaffBaseInfoDto">
@@ -132,7 +150,7 @@
 
     <select id="getStatisticalData" resultType="com.lz.modules.app.Dto.StaffStatisticalDto">
         select
-        count(DISTINCT(ls.id)) totalStaffCount,
+        count(DISTINCT(ls.nowin_staff)) totalStaffCount,
         count(DISTINCT(td.leader_employee_id)) managementCount,
         ifnull(round(count(DISTINCT(td.leader_employee_id))/count(DISTINCT(ls.id))*100,2),0) managementRate,
         count(DISTINCT(ls.new_staff)) newStaffCount,
@@ -148,16 +166,19 @@
         left join
         (select staff_id as leave_staff from lz_staff_occupation where date(resignation_time) between #{beginDate} and
         #{endDate}) so2
-        on so2.leave_staff=ll.id) ls,
-        lz_departments_staff_relate dsr,lz_staff_occupation so,
+        on so2.leave_staff=ll.id
+        left join
+        (select staff_id as nowin_staff from lz_staff_occupation where date(resignation_time)>=#{endDate} or
+        resignation_time is null) so3
+        on so3.nowin_staff=ll.id) ls,
+        lz_departments_staff_relate dsr,
         (select * from lz_departments
         <if test="departmentId != null and departmentId != ''">
             where find_in_set(department_id, getChildList(#{departmentId}))
         </if>
         ) td
-        where ls.is_delete=0 and ls.id=dsr.staff_id and so.staff_id=ls.id
+        where ls.is_delete=0 and ls.id=dsr.staff_id
         and dsr.department_id=td.department_id
-        and (date(so.resignation_time)>=#{endDate} or so.resignation_time is null )
     </select>
 
     <select id="getGenderData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
@@ -168,7 +189,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)>=#{endDate} or
+        where 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
@@ -181,19 +202,23 @@
         select
         if(birthday=0,'未知',concat(birthday,'后')) category,
         count(birthday) number
-        from (select id,ifnull(CONCAT(left(date_format(birthday,'%y'),1),'0'),0) birthday from lz_staff) ls
-        where ls.id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)>=#{endDate} or
+        from (
+        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
         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
+            and id in (select dsr.staff_id from lz_departments_staff_relate dsr,lz_departments ld where
             dsr.department_id=ld.department_id and find_in_set(ld.department_id, getChildList(#{departmentId})))
         </if>
-        group by ls.birthday
+        ) t
+        group by t.birthday
     </select>
 
     <select id="getJobSeniorityData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
         select
-        ls.jobYear category,
+        t.jobYear category,
         count(jobYear) number
         from (
         select staff_id,
@@ -208,31 +233,34 @@
         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
-        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)>=#{endDate}
+        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}
         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
             dsr.department_id=ld.department_id and find_in_set(ld.department_id, getChildList(#{departmentId})))
         </if>
-        group by ls.jobYear
+        ) t
+        group by t.jobYear
     </select>
 
     <select id="getEducationData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
         select
-        ls.education category,
+        y.education category,
         count(education) number
         from (
-        select ss.id,ifnull(se.education,'未知') education from lz_staff ss left join lz_staff_education se on
-        se.staff_id=ss.id
-        ) ls
-        where ls.id in (select so.staff_id from lz_staff_occupation so where date(so.resignation_time)>=#{endDate} or
+        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
         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
             dsr.department_id=ld.department_id and find_in_set(ld.department_id, getChildList(#{departmentId})))
-        </if>group by ls.education
+        </if>) t
+        left join lz_staff_education se on
+        se.staff_id=t.id
+        ) y
+        group by y.education
 
     </select>
 
diff --git a/target/classes/mapper/generator/StaffOccupationDao.xml b/target/classes/mapper/generator/StaffOccupationDao.xml
index 39209b41..35f59537 100644
--- a/target/classes/mapper/generator/StaffOccupationDao.xml
+++ b/target/classes/mapper/generator/StaffOccupationDao.xml
@@ -32,7 +32,7 @@
         select * from lz_staff_occupation where is_delete=0 and staff_id = #{staffId}
     </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,signing_company,job_begin_time,work_experience,resume_url
+    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}
     </select>