From 521cecc989fc01e5db50dfee6f6da8688960aad1 Mon Sep 17 00:00:00 2001
From: fumeiai <fumeiai@linzikg.com>
Date: Wed, 20 May 2020 10:51:42 +0800
Subject: [PATCH] add graphics statistical

---
 .idea/workspace.xml                           |  14 +--
 .../app/controller/StaffController.java       |  17 +++-
 .../java/com/lz/modules/app/dao/StaffDao.java |   8 +-
 .../lz/modules/app/service/StaffService.java  |   7 ++
 .../app/service/impl/StaffServiceImpl.java    |  46 ++++++++-
 .../resources/mapper/generator/StaffDao.xml   |  89 ++++++++++++++++--
 .../app/controller/StaffController.class      | Bin 8531 -> 9008 bytes
 .../com/lz/modules/app/dao/StaffDao.class     | Bin 2019 -> 2338 bytes
 .../lz/modules/app/service/StaffService.class | Bin 1825 -> 1984 bytes
 .../app/service/impl/StaffServiceImpl.class   | Bin 7644 -> 9048 bytes
 target/classes/mapper/generator/StaffDao.xml  |  89 ++++++++++++++++--
 11 files changed, 234 insertions(+), 36 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 40ab6262..3c563aa3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,11 @@
 <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/GraphicsDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/GraphicsStatisticalDto.java" 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/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/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/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/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$/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" />
@@ -163,7 +160,7 @@
       <workItem from="1588159936850" duration="1226000" />
       <workItem from="1588161274115" duration="1691000" />
       <workItem from="1588163384182" duration="74761000" />
-      <workItem from="1588936950753" duration="82741000" />
+      <workItem from="1588936950753" duration="88892000" />
     </task>
     <servers />
   </component>
@@ -218,7 +215,7 @@
         </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>82</line>
+          <line>83</line>
           <option name="timeStamp" value="62" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -233,14 +230,9 @@
         </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>176</line>
+          <line>191</line>
           <option name="timeStamp" value="75" />
         </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>118</line>
-          <option name="timeStamp" value="77" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
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 ffd7860d..b85648e3 100644
--- a/src/main/java/com/lz/modules/app/controller/StaffController.java
+++ b/src/main/java/com/lz/modules/app/controller/StaffController.java
@@ -169,11 +169,26 @@ public class StaffController {
         data.put("departmentName", departmentName);
 
         List<GraphicsStatisticalDto> genderRows = staffService.getGenderData(departmentId, beginDate, endDate);
-
         GraphicsDto genderDistribution = new GraphicsDto();
         genderDistribution.setRows(genderRows);
         data.put("genderDistribution", genderDistribution);
 
+        List<GraphicsStatisticalDto> ageRows = staffService.getAgeData(departmentId, beginDate, endDate);
+        GraphicsDto ageDistribution = new GraphicsDto();
+        ageDistribution.setRows(ageRows);
+        data.put("ageDistribution", ageDistribution);
+
+        List<GraphicsStatisticalDto> jobSeniorityRows = staffService.getJobSeniorityData(departmentId, beginDate, endDate);
+        GraphicsDto jobSeniorityDistribution = new GraphicsDto();
+        jobSeniorityDistribution.setRows(jobSeniorityRows);
+        data.put("jobSeniorityDistribution", jobSeniorityDistribution);
+
+        List<GraphicsStatisticalDto> educationRows = staffService.getEducationData(departmentId, beginDate, endDate);
+        GraphicsDto educationDistribution = new GraphicsDto();
+        educationDistribution.setRows(educationRows);
+        data.put("educationDistribution", educationDistribution);
+
+
         R ret = R.ok();
         ret.put("data", data);
         return ret;
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 9d9bbbb6..e3571850 100644
--- a/src/main/java/com/lz/modules/app/dao/StaffDao.java
+++ b/src/main/java/com/lz/modules/app/dao/StaffDao.java
@@ -37,6 +37,12 @@ public interface StaffDao extends BaseMapper<StaffEntity> {
 
     StaffStatisticalDto getStatisticalData(@Param("departmentId") String departmentId, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
 
-    List<GraphicsStatisticalDto> getGenderData(String departmentId, String beginDate, String endDate);
+    List<GraphicsStatisticalDto> getGenderData(@Param("departmentId") String departmentId, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
+
+    List<GraphicsStatisticalDto> getAgeData(@Param("departmentId") String departmentId, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
+
+    List<GraphicsStatisticalDto> getJobSeniorityData(@Param("departmentId") String departmentId, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
+
+    List<GraphicsStatisticalDto> getEducationData(@Param("departmentId") String departmentId, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
 
 }
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 909e083c..5f03d655 100644
--- a/src/main/java/com/lz/modules/app/service/StaffService.java
+++ b/src/main/java/com/lz/modules/app/service/StaffService.java
@@ -40,5 +40,12 @@ public interface StaffService extends IService<StaffEntity> {
     List<GraphicsStatisticalDto> getGenderData(String departmentId, String beginDate, String endDate);
 
 
+    List<GraphicsStatisticalDto> getAgeData(String departmentId, String beginDate, String endDate);
+
+    List<GraphicsStatisticalDto> getJobSeniorityData(String departmentId, String beginDate, String endDate);
+
+    List<GraphicsStatisticalDto> getEducationData(String departmentId, String beginDate, String endDate);
+
+
 }
 
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 f0c164c7..eabb0cd2 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
@@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -111,12 +112,51 @@ public class StaffServiceImpl extends ServiceImpl<StaffDao, StaffEntity> impleme
     @Override
     public List<GraphicsStatisticalDto> getGenderData(String departmentId, String beginDate, String endDate) {
         List<GraphicsStatisticalDto> graphicsStatisticals = staffDao.getGenderData(departmentId, beginDate, endDate);
-        int totalCount = 0;
+        BigDecimal totalCount = BigDecimal.ZERO;
         for (GraphicsStatisticalDto graphicsStatisticalDto : graphicsStatisticals) {
-            totalCount = totalCount + graphicsStatisticalDto.getNumber();
+            totalCount = totalCount.add(new BigDecimal(graphicsStatisticalDto.getNumber()));
         }
         for (GraphicsStatisticalDto graphicsStatisticalDto : graphicsStatisticals) {
-            graphicsStatisticalDto.setRate(NumberUtil.round(graphicsStatisticalDto.getNumber() / totalCount * 100, 2) + "%");
+            graphicsStatisticalDto.setRate(new BigDecimal(graphicsStatisticalDto.getNumber() * 100).divide(totalCount, 2, BigDecimal.ROUND_HALF_UP) + "%");
+        }
+        return graphicsStatisticals;
+    }
+
+    @Override
+    public List<GraphicsStatisticalDto> getAgeData(String departmentId, String beginDate, String endDate) {
+        List<GraphicsStatisticalDto> graphicsStatisticals = staffDao.getAgeData(departmentId, beginDate, endDate);
+        BigDecimal totalCount = BigDecimal.ZERO;
+        for (GraphicsStatisticalDto graphicsStatisticalDto : graphicsStatisticals) {
+            totalCount = totalCount.add(new BigDecimal(graphicsStatisticalDto.getNumber()));
+        }
+        for (GraphicsStatisticalDto graphicsStatisticalDto : graphicsStatisticals) {
+            graphicsStatisticalDto.setRate(new BigDecimal(graphicsStatisticalDto.getNumber() * 100).divide(totalCount, 2, BigDecimal.ROUND_HALF_UP) + "%");
+        }
+        return graphicsStatisticals;
+    }
+
+    @Override
+    public List<GraphicsStatisticalDto> getJobSeniorityData(String departmentId, String beginDate, String endDate) {
+        List<GraphicsStatisticalDto> graphicsStatisticals = staffDao.getJobSeniorityData(departmentId, beginDate, endDate);
+        BigDecimal totalCount = BigDecimal.ZERO;
+        for (GraphicsStatisticalDto graphicsStatisticalDto : graphicsStatisticals) {
+            totalCount = totalCount.add(new BigDecimal(graphicsStatisticalDto.getNumber()));
+        }
+        for (GraphicsStatisticalDto graphicsStatisticalDto : graphicsStatisticals) {
+            graphicsStatisticalDto.setRate(new BigDecimal(graphicsStatisticalDto.getNumber() * 100).divide(totalCount, 2, BigDecimal.ROUND_HALF_UP) + "%");
+        }
+        return graphicsStatisticals;
+    }
+
+    @Override
+    public List<GraphicsStatisticalDto> getEducationData(String departmentId, String beginDate, String endDate) {
+        List<GraphicsStatisticalDto> graphicsStatisticals = staffDao.getEducationData(departmentId, beginDate, endDate);
+        BigDecimal totalCount = BigDecimal.ZERO;
+        for (GraphicsStatisticalDto graphicsStatisticalDto : graphicsStatisticals) {
+            totalCount = totalCount.add(new BigDecimal(graphicsStatisticalDto.getNumber()));
+        }
+        for (GraphicsStatisticalDto graphicsStatisticalDto : graphicsStatisticals) {
+            graphicsStatisticalDto.setRate(new BigDecimal(graphicsStatisticalDto.getNumber() * 100).divide(totalCount, 2, BigDecimal.ROUND_HALF_UP) + "%");
         }
         return graphicsStatisticals;
     }
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index 95be5a81..f6b01a2b 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -110,7 +110,7 @@
         <if test="name != null and name != ''">
             and ls.name=#{name}
         </if>
-        limit  #{startIndex}, #{pageLimit}
+        limit #{startIndex}, #{pageLimit}
     </select>
 
     <select id="getStaffInfoCount" resultType="java.lang.Integer">
@@ -137,14 +137,17 @@
         ifnull(round(count(DISTINCT(td.leader_employee_id))/count(DISTINCT(ls.id))*100,2),0) managementRate,
         count(DISTINCT(ls.new_staff)) newStaffCount,
         count(DISTINCT(ls.leave_staff)) leaveStaffCount,
-        ifnull(round(count(DISTINCT(ls.leave_staff))/(count(DISTINCT(ls.leave_staff))+count(DISTINCT(ls.id)))*100,2),0) leaveRate
+        ifnull(round(count(DISTINCT(ls.leave_staff))/(count(DISTINCT(ls.leave_staff))+count(DISTINCT(ls.id)))*100,2),0)
+        leaveRate
         from
         (select * from lz_staff ll
         left join
-        (select staff_id as new_staff from lz_staff_occupation where date(entry_time) between #{beginDate} and #{endDate}) so1
+        (select staff_id as new_staff from lz_staff_occupation where date(entry_time) between #{beginDate} and
+        #{endDate}) so1
         on so1.new_staff=ll.id
         left join
-        (select staff_id as leave_staff from lz_staff_occupation where date(resignation_time) between #{beginDate} and #{endDate}) so2
+        (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,
         (select * from lz_departments
@@ -159,12 +162,78 @@
 
     <select id="getGenderData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
         select
-            case gender when 1 then '男'
-            when 2 then '女'
-            else '未知'
-            end category,
-            count(gender) number
-        from lz_staff group by gender
+        case gender when 1 then '男'
+        when 2 then '女'
+        else '未知'
+        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
+        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
+            dsr.department_id=ld.department_id and find_in_set(ld.department_id, getChildList(#{departmentId})))
+        </if>
+        group by gender
+    </select>
+
+    <select id="getAgeData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
+        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
+        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.birthday
+    </select>
+
+    <select id="getJobSeniorityData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
+        select
+        ls.jobYear category,
+        count(jobYear) number
+        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
+        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
+        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
+        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}
+        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
+    </select>
+
+    <select id="getEducationData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
+        select
+        ls.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
+        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
+
     </select>
 
 
diff --git a/target/classes/com/lz/modules/app/controller/StaffController.class b/target/classes/com/lz/modules/app/controller/StaffController.class
index 9a04d1bf2ff6dd3fdb16be7a2839a22d0786898c..0a35ac0a24f18065ccfed6775fd2dddea1aa7e95 100644
GIT binary patch
delta 2692
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
WXIlI4q_;lhks0CnX`UMieda%MLi8p8

delta 2172
zcma)62Xs_b5WVxayqEvqX2}NA$Pxoc2~{K(P>_~T1Ob&8f=ZAWnn;Zb;)06UuzdxQ
zq9|fSkg|vbFk+)=G*T2}Z&*;Vfrv<)_jgku@f^?D|K7a$Z)Wb?xqsJY?d=iTeR6Xt
zfKJrkL?3LC*lOZsluEo}p(D2G<yHOWHSK;~Vw6OIM4`m!7-ZuO3vXh(UUrz+iCqG_
zO~m0XeRx}-%tS+-bAe9tj=uJ;jw-kC9`<N!Z^*(v?APY|7CyiM3m>Aw#7Fp8`#!Po
zDL&K3&n3Q)_)_94iMbMAOMGLZH4X}VEAgE+zn54nu|ya7!Nei_DDacsf7Xc(3;bdt
zQ)Bs6@4pHBZs89c=`3*6L>K%iu}Fs=6Zp$SH*C?%afxNx`L|w9nD_@LwN)tyf+#$Q
zCb&&-89|01S9quAnBj8^@(A(@5`tv7Ob#XLZii$`dxT%w+s$~230IgYMph24Bybv+
zB9knFdt!cJfg(jdMX}^p)PUj?1t?yjFZu~;sOStzP?ShXf|3=bP$NRno)l<k5A<0w
zhf);<sj;2!OBfuaG(~4py27OxB&dm^rqoPfFop;^OHp%bp>P>47t~TwE6QM?ids_}
z#;m9<wNtnPLj|>0)PXV-olWiRoxb7Tj&x2{#jdeQ8J#Fo(YbV<pz{@7K%EJ`vH3;$
z?Wav0Grs+R{E3RX(1i*EFwmYAJIHkrrP+I9Gre6Eb)$>zSbqnryY8?D^&~X0<NWb<
zxo|T}zF;p6VTC55H~9o*DaxikiuzJNLR)<^yvn~&+B1@7gtA$gfER`)355R6iEs(;
zhOS-5$BfkRF)?*~%ugL3({id$@$?BiN?vpA*~tklhD8AY&5*~o;x~W?!*LbwgsX84
zpK|Te<U=&fUYU{?(zhnU;<X}rOIst5&$kU6z(`!ny9fI*iY*sn_}eMKb#TLnG8D4q
zK|FR~G{!Iy#r&a-#W==Qf^>}M2#Hdp;(AQr$TE((fvcIA#Pt$5FG5bS$y_WFI)y{0
z^2^5XRH7|}z%+p(B7qy7-%UVrVqy?C^BoT{PGCAe24*<q$8w@u_?ejpnu1$7y%sq;
zX0bt-joTP_E}QeX70Eu^mAagnC{E3Gm>9y&EVRSz+=G|V$KejA8(?WQJ4-PKcXBd`
z`IyT*83=OXyKpzBY=vpK2lsN3Oy=W0%wu+{dX410zdG*&(N@!8RPqo<MtXga+ZA|7
z;9&t<;1S?B^A~M*4kOkYJGIS6oi>$jb3Q*ar(gkZk3~k!+zewlJYWih%Y#J0O=!^B
zOf~~8+H6F8PO`a{6S|?5GXah4$!R&E)i{h7a1?8Zu#UV~Pkw|QJxymtZR2DM@wlds
z0#&TA714|&Gs=p^LtDi9aKTTmsAl3(iN%g)f;fUDY<W?{o~3w#**J(ccoO46ocb`D
zVi}%743}4qd}@itDW)|O33!_CYt1x=yOMd2YR2I)A{xB{iHRprAh5iO%n=+?uXb1o
zES_gh7tabj8xarxp&MGe@Mmm*uXPD}8pvT*HIarxr0Klg%0!hqv^i3Tzltojit!xd
zkB+sN1NB%_IE>XBipqB-p4a1a(5$LKvzl)b&*#6;^r|1t4o0)<f1%MIO)WT41Z!%c
zS$jH~byy$erXTm9xd}MjY(no6WYrI756gI8EkM;;8i@eQZ9@$|;d%kRSPRg`Qvn%x
Ui9-x*a{36cRl?_*KZec!0_!?rMF0Q*

diff --git a/target/classes/com/lz/modules/app/dao/StaffDao.class b/target/classes/com/lz/modules/app/dao/StaffDao.class
index 25eb32e631b1f7c5a1f7e9745f75dcb1e9f9126f..527d48f56bf202b16bcdb782b1bced0b710c2a41 100644
GIT binary patch
delta 176
zcmaFNzeq^<)W2Q(7#J8#7>wB&4A>bA*%^#B3a@1`;Yv>}aZFEjNi0cZWDo{&yz-NR
zQ}Z(Oi!w_pA)*36QP-5x<iwK9{5+7*=6x)#jEp>+S=g2`GBQtI#V#|snq7-kgF%e}
m!P7+HX(92{<rtV51c8oWV$f#L0n@q+dO(_ufssL<fdK$1_$g!n

delta 76
zcmZ1^^q61x)W2Q(7#J8#7!24MblDm7*ctRU3a@3^{Efw#k&$z=728rqMyAOJIb>v+
b83cg}nHV$}G{LkMgEo+6V_;;^VPF6N$4m{6

diff --git a/target/classes/com/lz/modules/app/service/StaffService.class b/target/classes/com/lz/modules/app/service/StaffService.class
index eb5b3a7c8bd17cb4fda3618196113b5628554a0b..d18d69880fd275f933af48e57b9591afec6bb045 100644
GIT binary patch
delta 129
zcmZ3;cYt5`)W2Q(7#J8#81&g0bl4em*%|aU3V&lU;Yv>}aZFEjNi0cZWDo{&yz-NR
zQ}Z(Oi!w_pA)*36QP-5x<iwK9{5+7*W_DH)Mn;~=GHjn&SQr`9CVya)2Qk!P3=JSd
OgHw}13uq$~gEj!2jv`F}

delta 53
zcmX@WzmQM()W2Q(7#J8#7<AYfG}#%n*cr4p3V&nSY|kph$jCW4i0$*_b?ls+Y7FW?
IRZI*T0Em$cMgRZ+

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 c33eb5f13aee0e5c7661abbe1e0d4896f66cf147..e0eabbdb993aa7b59716051bf244fd5944155139 100644
GIT binary patch
literal 9048
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
EUl(;MYXATM

delta 2596
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
Q`-|tJ)Ghqo+JxKw0houS7ytkO

diff --git a/target/classes/mapper/generator/StaffDao.xml b/target/classes/mapper/generator/StaffDao.xml
index 95be5a81..f6b01a2b 100644
--- a/target/classes/mapper/generator/StaffDao.xml
+++ b/target/classes/mapper/generator/StaffDao.xml
@@ -110,7 +110,7 @@
         <if test="name != null and name != ''">
             and ls.name=#{name}
         </if>
-        limit  #{startIndex}, #{pageLimit}
+        limit #{startIndex}, #{pageLimit}
     </select>
 
     <select id="getStaffInfoCount" resultType="java.lang.Integer">
@@ -137,14 +137,17 @@
         ifnull(round(count(DISTINCT(td.leader_employee_id))/count(DISTINCT(ls.id))*100,2),0) managementRate,
         count(DISTINCT(ls.new_staff)) newStaffCount,
         count(DISTINCT(ls.leave_staff)) leaveStaffCount,
-        ifnull(round(count(DISTINCT(ls.leave_staff))/(count(DISTINCT(ls.leave_staff))+count(DISTINCT(ls.id)))*100,2),0) leaveRate
+        ifnull(round(count(DISTINCT(ls.leave_staff))/(count(DISTINCT(ls.leave_staff))+count(DISTINCT(ls.id)))*100,2),0)
+        leaveRate
         from
         (select * from lz_staff ll
         left join
-        (select staff_id as new_staff from lz_staff_occupation where date(entry_time) between #{beginDate} and #{endDate}) so1
+        (select staff_id as new_staff from lz_staff_occupation where date(entry_time) between #{beginDate} and
+        #{endDate}) so1
         on so1.new_staff=ll.id
         left join
-        (select staff_id as leave_staff from lz_staff_occupation where date(resignation_time) between #{beginDate} and #{endDate}) so2
+        (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,
         (select * from lz_departments
@@ -159,12 +162,78 @@
 
     <select id="getGenderData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
         select
-            case gender when 1 then '男'
-            when 2 then '女'
-            else '未知'
-            end category,
-            count(gender) number
-        from lz_staff group by gender
+        case gender when 1 then '男'
+        when 2 then '女'
+        else '未知'
+        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
+        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
+            dsr.department_id=ld.department_id and find_in_set(ld.department_id, getChildList(#{departmentId})))
+        </if>
+        group by gender
+    </select>
+
+    <select id="getAgeData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
+        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
+        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.birthday
+    </select>
+
+    <select id="getJobSeniorityData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
+        select
+        ls.jobYear category,
+        count(jobYear) number
+        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
+        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
+        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
+        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}
+        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
+    </select>
+
+    <select id="getEducationData" resultType="com.lz.modules.app.Dto.GraphicsStatisticalDto">
+        select
+        ls.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
+        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
+
     </select>