From 98ce36f75e08f2b4e356299904e13e80fc7bd696 Mon Sep 17 00:00:00 2001
From: fumeiai <fumeiai@linzikg.com>
Date: Tue, 19 May 2020 14:17:42 +0800
Subject: [PATCH] add statistical

---
 .idea/workspace.xml                           |  43 ++++++++++--------
 .../modules/app/Dto/StaffStatisticalDto.java  |  24 ++++++++++
 .../app/controller/StaffController.java       |  33 ++++++++++----
 .../java/com/lz/modules/app/dao/StaffDao.java |   3 ++
 .../lz/modules/app/service/StaffService.java  |   3 ++
 .../app/service/impl/StaffServiceImpl.java    |   6 +++
 .../resources/mapper/generator/StaffDao.xml   |  27 +++++++++++
 .../modules/app/Dto/StaffStatisticalDto.class | Bin 0 -> 3306 bytes
 .../app/controller/StaffController.class      | Bin 6662 -> 8064 bytes
 .../com/lz/modules/app/dao/StaffDao.class     | Bin 1556 -> 1769 bytes
 .../lz/modules/app/service/StaffService.class | Bin 1402 -> 1575 bytes
 .../app/service/impl/StaffServiceImpl.class   | Bin 6413 -> 6687 bytes
 target/classes/mapper/generator/StaffDao.xml  |  27 +++++++++++
 13 files changed, 138 insertions(+), 28 deletions(-)
 create mode 100644 src/main/java/com/lz/modules/app/Dto/StaffStatisticalDto.java
 create mode 100644 target/classes/com/lz/modules/app/Dto/StaffStatisticalDto.class

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 466096f2..dd2254b4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,26 +2,19 @@
 <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/StaffStatisticalDto.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/dao/DepartmentsStaffRelateDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/dao/DepartmentsStaffRelateDao.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/service/DepartmentsStaffRelateService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/DepartmentsStaffRelateService.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/impl/DepartmentsStaffRelateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.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/job/business/FeishuBusiness.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/job/business/FeishuBusiness.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/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/DepartmentsStaffRelateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/DepartmentsStaffRelateDao.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/com/lz/modules/app/dao/DepartmentsStaffRelateDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/dao/DepartmentsStaffRelateDao.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/dao/StaffOccupationDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/dao/StaffOccupationDao.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/DepartmentsStaffRelateService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/DepartmentsStaffRelateService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/StaffOccupationService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/StaffOccupationService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffOccupationServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/job/business/FeishuBusiness.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/job/business/FeishuBusiness.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/generator/DepartmentsStaffRelateDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/DepartmentsStaffRelateDao.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" />
+      <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" />
+      <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/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/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -169,7 +162,7 @@
       <workItem from="1588159936850" duration="1226000" />
       <workItem from="1588161274115" duration="1691000" />
       <workItem from="1588163384182" duration="74761000" />
-      <workItem from="1588936950753" duration="69525000" />
+      <workItem from="1588936950753" duration="75394000" />
     </task>
     <servers />
   </component>
@@ -224,7 +217,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>79</line>
+          <line>80</line>
           <option name="timeStamp" value="62" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -237,6 +230,16 @@
           <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>156</line>
+          <option name="timeStamp" value="73" />
+        </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>157</line>
+          <option name="timeStamp" value="74" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/src/main/java/com/lz/modules/app/Dto/StaffStatisticalDto.java b/src/main/java/com/lz/modules/app/Dto/StaffStatisticalDto.java
new file mode 100644
index 00000000..1f457741
--- /dev/null
+++ b/src/main/java/com/lz/modules/app/Dto/StaffStatisticalDto.java
@@ -0,0 +1,24 @@
+package com.lz.modules.app.Dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class StaffStatisticalDto {
+
+    //总人数
+    private int totalStaffCount;
+    //管理人员人数
+    private int managementCount;
+    //管理人员占比
+    private BigDecimal managementRate;
+    //新入职员工人数
+    private int newStaffCount;
+    //离职人员人数
+    private int leaveStaffCount;
+    //离职率
+    private BigDecimal leaveRate;
+
+
+}
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 00018107..8e346a7d 100644
--- a/src/main/java/com/lz/modules/app/controller/StaffController.java
+++ b/src/main/java/com/lz/modules/app/controller/StaffController.java
@@ -6,8 +6,12 @@ import java.util.List;
 import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lz.common.utils.DateUtils;
 import com.lz.modules.app.Dto.*;
+import com.lz.modules.app.entity.DepartmentsEntity;
 import com.lz.modules.app.service.*;
+import com.lz.modules.sys.entity.SysCaptchaEntity;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -34,6 +38,9 @@ public class StaffController {
     @Autowired
     private StaffService staffService;
 
+    @Autowired
+    private DepartmentsService departmentsService;
+
     @Autowired
     private StaffEducationService staffEducationService;
 
@@ -127,13 +134,13 @@ public class StaffController {
     @RequestMapping("/statistical")
 //    @RequiresPermissions("staff:info:statistical")
     public R statistical(@RequestParam Map<String, Object> params) {
-
+        Map data = new HashMap();
         //部门Id
         String departmentId = "";
         //统计时间起
-        String beginDate = "";
+        String beginDate = "2017-01-01";
         //统计时间止
-        String endDate = "";
+        String endDate = DateUtils.format(DateUtils.getCurrentDate(), DateUtils.DATE_PATTERN);
 
         if (params.containsKey("departmentId")) {
             departmentId = params.get("departmentId").toString();
@@ -146,14 +153,24 @@ public class StaffController {
         if (params.containsKey("endDate")) {
             endDate = params.get("endDate").toString();
         }
-//
-//        List<StaffDto> staffInfos = staffService.getStaffInfos(currentPage, limit, departmentId, name, staffStatus);
+
+        StaffStatisticalDto staffStatisticals = staffService.getStatisticalData(departmentId, beginDate, endDate);
+        data = JSON.parseObject(JSON.toJSONString(staffStatisticals), Map.class);
+
+        data.put("beginDate", beginDate);
+        data.put("endDate", endDate);
+        if (departmentId != "") {
+            DepartmentsEntity department = departmentsService.getOne(new QueryWrapper<DepartmentsEntity>().eq("department_id", departmentId));
+            if (department != null) {
+                data.put("departmentName", department.getDepartmentName());
+            }
+        }
+
 //        //总页码
 //        int maxCount = staffService.getStaffInfoCount(departmentId, name, staffStatus);
-//
+
         R ret = R.ok();
-//        PageUtils pageInfo = new PageUtils(staffInfos, maxCount, limit, currentPage);
-//        ret.put("page", pageInfo);
+        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 9760f2a0..0adeea53 100644
--- a/src/main/java/com/lz/modules/app/dao/StaffDao.java
+++ b/src/main/java/com/lz/modules/app/dao/StaffDao.java
@@ -2,6 +2,7 @@ package com.lz.modules.app.dao;
 
 import com.lz.modules.app.Dto.StaffBaseInfoDto;
 import com.lz.modules.app.Dto.StaffDto;
+import com.lz.modules.app.Dto.StaffStatisticalDto;
 import com.lz.modules.app.entity.StaffEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -33,5 +34,7 @@ public interface StaffDao extends BaseMapper<StaffEntity> {
 
     StaffBaseInfoDto getBaseInfo(@Param("staffId") Long staffId);
 
+    StaffStatisticalDto getStatisticalData(@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 f0d98636..a643004f 100644
--- a/src/main/java/com/lz/modules/app/service/StaffService.java
+++ b/src/main/java/com/lz/modules/app/service/StaffService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.lz.common.utils.PageUtils;
 import com.lz.modules.app.Dto.StaffBaseInfoDto;
 import com.lz.modules.app.Dto.StaffDto;
+import com.lz.modules.app.Dto.StaffStatisticalDto;
 import com.lz.modules.app.entity.StaffEntity;
 import com.lz.modules.job.model.responseBo.DepartmentStaffBo;
 
@@ -33,5 +34,7 @@ public interface StaffService extends IService<StaffEntity> {
 
     StaffBaseInfoDto getBaseInfo(Long staffId);
 
+    StaffStatisticalDto getStatisticalData(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 fe0657e0..5ed8e906 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
@@ -8,6 +8,7 @@ import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.Query;
 import com.lz.modules.app.Dto.StaffBaseInfoDto;
 import com.lz.modules.app.Dto.StaffDto;
+import com.lz.modules.app.Dto.StaffStatisticalDto;
 import com.lz.modules.app.dao.StaffDao;
 import com.lz.modules.app.entity.StaffEntity;
 import com.lz.modules.app.service.StaffService;
@@ -100,6 +101,11 @@ public class StaffServiceImpl extends ServiceImpl<StaffDao, StaffEntity> impleme
         return staffDao.getBaseInfo(staffId);
     }
 
+    @Override
+    public StaffStatisticalDto getStatisticalData(String departmentId, String beginDate, String endDate) {
+        return staffDao.getStatisticalData(departmentId, beginDate, endDate);
+    }
+
     private StaffEntity convertStaffEntity(DepartmentStaffBo staffBo) {
         StaffEntity staffEntity = new StaffEntity();
         staffEntity.setName(staffBo.getName());//员工姓名
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index 33c85b8d..99e38f11 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -130,5 +130,32 @@
         select name staffName,gender,birthday,marital_status,national,political_landscape,mobile,current_address from lz_staff where id=#{staffId}
     </select>
 
+    <select id="getStatisticalData" resultType="com.lz.modules.app.Dto.StaffStatisticalDto">
+        select
+        count(DISTINCT(ls.id)) 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,
+        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
+        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
+        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
+        on so2.leave_staff=ll.id) ls,
+        lz_departments_staff_relate dsr,lz_staff_occupation so,
+        (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
+        and dsr.department_id=td.department_id
+        and (date(so.resignation_time)>=#{endDate} or so.resignation_time is null )
+    </select>
+
 
 </mapper>
diff --git a/target/classes/com/lz/modules/app/Dto/StaffStatisticalDto.class b/target/classes/com/lz/modules/app/Dto/StaffStatisticalDto.class
new file mode 100644
index 0000000000000000000000000000000000000000..0560af53736c6a5c24972ecf7ed30252ef873fb8
GIT binary patch
literal 3306
zcma)7TXR!Y6#jN{PIB6wHff-x5tLhjUQ&XJ7g~y13Q}kbQmh5#a+)5RKrSUc0Y{(o
z#sA<i<D0zjpfeI?bjHyaobflQ_^o}CG&w!Ybf#T<t##J=_S$QGd*|=}e*GQ5NqpIj
z{aEgTh0jE+h`27|hKSEad=baZZmzdP+!k?1gd>@&qUA)aiEzbtH;(mgq_AuuFKa=>
zJq!0O6h$prC|jsl*s$<G9Mw2B6%t;>bBarzbNBAqO0DcEs5yE|PT5&^OK#a~c>A_I
zR~^q)7@WW7Jan=p$IEAD3hT3Ou26D{QwqIh_fb1uqUbsg-F8ox_V_Td(}i-uJEIUC
z8C_N|&Q{h4o|rF`-NjmI)vaE0R*Uqc<|{d;xa?F5VmF+ImoM-PnfY9$lr4UhEmhWP
zMRzmnY;0s_y-HSZO5qhYy#mweV}Yr4*Si)xHMi%v<<mm&==~i|zwDur(N~>6$?(O_
z76|NounTt6=_95#L#i@H=A<jh1=q`0)~+~Jr{sEWm1mal?Ui;oecbd&c%d4X@xfB*
z+FokY*_fI8pym`=#6SbP=#<y9msjt(Id5w81}RjLfoXoUe^M|jUf!)L?2^F^2Pw5%
zf8FNp)4^?=N%(PXo?Z?)cYndz(8S=)(cHFjPWhaas$k`v&AiVo^UBq^g>wqAs=HY$
zlJJRbJ9ZDZVOw5h$*UI1>k7M@Q`e{Ry(CokQl(bSx#tT))S(d49hX+v7{REG12|~o
zkch(=wsAzXqau!BSYd4EOtvwPk8EUd!p55--oo29J`~?cG2apKuJ{&kLSfI=IQ+tA
zYK7vO3}ZN?;*r3!Fm1y_O~gZvHgjNWbozamR_Jec3Qu&(Ba%0BpyNegECF<b^~OyA
zyW!Ni<Pdvx6-&(DD%__SN5>29me&*}+6ma0N8@6)ji_-_PHG?TQyVWk8o|#Ua7{kH
zG9Cx{_U`9<9z#UNN-ZLj)hmaqSI$?j9I;+GWv=~D!UoDQT3N1&t2y=@>SrA`P8rkA
zI5O02KL8UrPD{zuDLa#YLF8#5xhFK4Yzaw@29tY3lgYA>WaFp6&WX@u5;G*(4DQ??
znoL56B*%iuyF!zB5kivV!LkQJli$Pp9IbSFl52!(Y;5l{M8an^=tneWC36&VD4b%R
zsc0l=Ool^7cM2&yYe62;kW)Clt;+FdFm?(llx;yC){xWTRhm166!y0uk7&p<;gGSN
zLdr#IK_1nRAA}z~zEeoKlP$<&8j{bb-%FL@8t3F5kB|Kb(|9`mC#>&bMxT!V0c#;M
zR!5gMsdQ)f|ATy^(L<xBY1oUj>`7zdFZ8617wCTidm?Sr(c8@JV?bXsJV7JTG?J4h
z&E#Y(ZAy0R1yWDYn>N$2X1XC)Ad29dalx;<#ly##!C4-30N-Jj???n^a0}<?i_%`f
zd1?l}W`94XX5t&{#RY0H%n^SWy>aUw^u=+}w*SRo9GCcKDKUn8qpQ`#88*?7-=_v4
zPjOqhHl}nhcwzk)&c8Kgt6GyaNwtkzGponKUoyIQ5tTtalZdOysnf>vzT{M125_gT
z_1u}JZ7<3PHr+~&KS6w=j{a6eUrS5q*yN-k!D*urZOM2fJiNIl{oNboMsXX9nwTbT
z;xe@e-rxbQ@CZ>{!XA7=&Crd!2;(JZWw4P-v2jr9C4;u?h&V=JHUpY5MyHEm>;-=!
z{f^*U?kT?_E59Li{W*4}cGoc=O{rrrwa3?cL?7~XyN-0~HDB)&|6X5Dh`!I)lM?ef
X^*Y`NK9%i1Oe>8(C|qL&5q$bTdrDHb

literal 0
HcmV?d00001

diff --git a/target/classes/com/lz/modules/app/controller/StaffController.class b/target/classes/com/lz/modules/app/controller/StaffController.class
index 8756a764556efd696071a949b292e769c0ea54a6..3c51edde90c402bd3b554c398f66d2f9e288fdc2 100644
GIT binary patch
delta 3266
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

delta 2094
zcma)+dwh;%7{|ZQv%P!Xz3;Pw7h4n`>#rCVS!rpcn!`*Pa+nTN&eSxg3NMjFQ9THu
zvvfogCM_M6S|XKnJ{OfrMJoE;&pR{2=hJ7~{ap9;T-WdV-M{<yY)bnXZK7KaZKwd+
z@NbAL76iE`#6lJYSsdnGmY8L!d9%!<?+el;NY^0Uf)pgulKaCvz=LLaD8$1&;;=kK
z9Ue8C6%LPusAn)I8komT*%PMg$uLjxw24;s3bTsUCVVDL8Ee8k%i0j@SZ{LWVK(rb
z*=`K-e2|JDF9aDGWO9(Gf!k!37el<n%O-lo;Z=v%ye8H>yMC$H%C1*d$DR}yQgXAy
z>ke;}Eess6leRd#>F}0ArNi6a(%@jPLt<LllEhQ&ymp*#fht|L@{UD(N%4?DYIoVj
zc9(bA;qo5uyL`Y-mosVQ@S)2tK63e(PaHmV`HauK{o&Jt?fAmwOTO|l-1>zIzIOSB
zZ(V7f?eLw;_x#{;Hs?6(cG<&^E^Rs2;U|}$*(+i$zwoO#y8OmImmJP>_}%3X_PYGZ
zK5wSmyrIifLu)_V9S*qs#X*<9`NyJ#x2<knuW@o#a?<ePam86<#|#^pRZv{w<tOhb
z>z1-R-s_PzG1^i$3ju6%5-eJ4m!RiadfJBQaXIllE+^W@<;1pD&e2}#YRwgTmY!C&
z8QyFi)@pxVd#z?VG@*l5*N+2SKu7H?F61I{&GqJ|?}?h)%c!rlt(fL0-;P8fC#kcp
z>Km)N1$lbgNk3gFB%dqk&TuYaymmL!llk;!1$`)|9~Jbck|JH}0DpD~VPWs8nr)(s
zg=T5iPT_TqDhS93UFb}l25-}deBw2}l5UCuBC(kQ4NTC8)*5=LOjS+>J=7s5bDBu>
zRA;4ndWlF#$AL8A#)kFLuvlkbb@o%XF@eK6ljG3e=|PcYISlZBFNX%{>5aHTMFC4h
z(NWC>UgckCvXF}PH?Rn+l&iT$?;NSmAO#kK86x7j-qr>yeN{V>s{9a<97=>?G?Hdb
z86hu>l+L51!nHcgb<%CLz^+%OlrfBBvUI(T3C!aLU%^5l<mn?Gs_Fz)))AHw0hU#(
zx=h$3#39H6q30P@8_Ch5G$Kwz$7)Q8$YrZ_v_=K0HHrb3Rs)Zz(kKJ_u$cK8G1j5T
zVVuKwhY5~oaZs{XsWe<fjNNOhlU>S<zC5mx=O+CPEM=k|lVZ-3T=AlqptimdyC7nB
zkJvf!-lkL2q6L|eGs+3rEF#4Z6KvMvbkB@5txBi*VJw{!zn;{bK!d<4LB(Ut+|oDP
zbe(&K2F#QnX35^O<(N4%XReHVw=C^R!o_mSQeWcS7!}DG?I;Mbs&Z+ZN{k^5*FxP)
zzF<Q#W7IckZ|#ivVsgg5GSg`+XN;Cg+#xcKxNAUK`Vq}e?yRV>)|A@TnySxC))HhV
zQ8CU=X|{%>%yOF9^pOPS__lxikpFtQL|EY;E%qU#R68YwX-pTts@t2UMss@&)n>dM
zjhXuviFd^4w;p9PQ<av?c``PcCuXx+Y|8#0o9MB0Vr*vBU^BZmo7=ggN}H}agV849
zYqOr_<+M04p^b8DMGZocYI%wyvdP?|`pl`NPmIu=H3;2xEFoL=GI!zmvPKlm)Bfnc
HjrsopJjPE;

diff --git a/target/classes/com/lz/modules/app/dao/StaffDao.class b/target/classes/com/lz/modules/app/dao/StaffDao.class
index 06e87d38d3d29533c1516a82a84f75d12156cfdd..41f7ecfb3953c55ed4acd1dac8e1b13822c9418d 100644
GIT binary patch
delta 189
zcmbQj^O9Hi)W2Q(7#J8#7<AbgwAdN6*%@>;3cE0i38kl&1eYY1WEPiXCMV{&B$gyH
zGNep)U^18-$HYF-L3HwbCQemk6(#xBj0~Jfsp*+{K-H;?4D6|SDInJ7P-a&~Mvl$1
zS)v&wSr{1<8I%~97}$We@-j1s11V)7R++q<RZdHp0cZpea}_hFFfcO+0wtIjR2kI3
Qv^s+ZkY)o)YcenZ05hK^M*si-

delta 71
zcmaFKJB3I1)W2Q(7#J8#7&O@#)Yuu+*%>r83cE0Ge#z|2$jH7~mo=JEj)9p$5U7TU
VL6JcTOe-^}0BJS`Mg~;|1^_cP3iJQ~

diff --git a/target/classes/com/lz/modules/app/service/StaffService.class b/target/classes/com/lz/modules/app/service/StaffService.class
index 04d1de4d60e2d1f8512ae33dc3fa8b15927e01d9..60239145b246a5c3df9a2b1e2c15a90b2e8bb8f8 100644
GIT binary patch
delta 163
zcmeyxwVX%z)W2Q(7#J8#7&O@#)Yuu+*%>r83imRL3#F%)1eYY1WEPiXCMV{&B$gyH
zGNfosR%Di)tivocc@?9~<a%aKRb(|K`PPgKoJpzanR!6<sf-Nlsd*_N*5-N4B8-e2
rlQ*+$)n#F1kY`X}U}RteTFcAKAP%GyfmjKMnHV_0q%wmFm{tV<Z8;=<

delta 58
zcmZ3^^NUOP)W2Q(7#J8#7*yFAl-L=R*%?$e3imQ^HewNCWMrT0%DPpEfr)_wsDz0@
Ko<RXjD*^zYUJ6VA

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 8440cc57222a0f94d2282ea99a835a2b6836ae46..ff1528092199281d1b5ac2269e6b4b49c9b48f5e 100644
GIT binary patch
delta 2210
zcmZ`(37m{&9Dd%Joq1=zd3UW{yLLmnZDBFkUF&EicBxdBB1(=d*0y4W={`nObm;I^
zI%pM%q-Zp*Qc9E(I&_y#9g<X%w$=0hW(?(Le)GNm=X>A(@%)ePomo^{9Nt{NW*vZH
z<+pGuW@*?KT$m-xeH!;$@W@MNJfJb#f)5W`cnA*%@CfDvFc*)?QmZk~Po2jsq~P%Y
z=3{}FJRxYIg)BTN`io>)EC)|%EYWycOu|bwp0UsbvwV0~<T6>7%ko?R5v&j&&s&IM
zr7WxDb+s&OWLYcA3lf1GQ}Cjob%I_J^s=D!f?g5ys-O+Bye6+31#QX__`1M1G&Wm!
z6K`p3(Re%3P)$v0v{hpplXLiPCS`^3`F34WuD#dSGP1|BRH^NeIl7(7tf~wR2vvlt
zCx@y>RgCLZ5vouaoo}!AHnVr8rt#5s4{wHDul>!B)(cJOs^A}4Syf#_n@R;;Su<Kt
zWRtH}c}r2IkZo_X8rf4U?R^LDDs;8mr<`anv2xsf@SeTJ%F8Xq`x-k8KEQ_>TMa(K
z$E0oW2|hLW44>N#0wsmraJs=4*s1ZQ!8nXJxDB@(e1)$KzQMN!-(i=*_xQo!NBpGF
z+@5IC?OacqT^q=9cg1P;nn1VkZv1Sp8+#0X5m$Q+e#Jh6%Q0SKyTNbx-QW-LF$wz(
z!kA)k6Q&y6f?Ey##7=_)qW>2T8vKnqgMVbNUiJ<VDG(_oi%VYJf|3Mzuuq|YoQnKj
zqqOqH3XyGB`ST*XOm9zNXO6Ez3Fo#cNS8AWFlp{}C-PGEpbSv5s$6^8BhoTk_KKeY
z**JsP@C2OsGjSHBLT{W6H+AQx6^2DO4M|+{;K#{Gr)-QCj$JObfZVv9pmT68?Hg0G
z56a1^FV8b6V`u#mXXkP6eC~P_O@RJ<To}OP3ouYZlf`~YAMEn<9S(=Sj0^<Hq%F7G
zkwJTOLIHCvq<Rthp#z4aBdYj)jYStsW@WBnO=hzy^I4OH)Lg`>EM`SEuo{y0Q1a|V
z`$4#nwK^TGa1oKF?@|oL#jMC|)@D$cn;r&UfFU$-G5kCXBXZMOGX}lHNpNGL3>z_m
zr^-oQN))rKNLY^K9w1tys5P3n1ipHtYE(M^G4&|dsM5HU{{!%q9E2;S4q9W(L7Z}k
zHZF~7szPbz8n5FB`ia%?GHP(x8Ly{3B%`TQJ{bkDy^?mUA%O(n0BSIS=W$0hR8cbB
z;()k2rF1aRdIcJ^S&cjwmhshvBV*L(IDRLJ-;BeKCpwNNu{APWfy{0WvrN_&RPmC1
z1I|D?C!iH8E=>Eg*3$IYU<wN13MZ2wt|Ss#L0rWsQqdqJo{VY`SF`yZ`fPz~iM;ga
z#&zt9cDf=1&z(|kUC%9Pfe)$<=^8gUY%@HJ1jYcpgMLAehwFPIt@)KRdQaQexZtQy
zWGEvI<J~$O4cT4EpxDVSCy_yp!&Z8c<FJ(savZj9+Gaa!la3H-c$iSK`#(gK+%Q6b
z=HdT0sO7N@syt4Err~BL6L0)9I#Y6M#T^f1Ev1^tPUC}ZS0g{^nAVR)Sn_Ng(@f-<
zoX9g7)7cftGZ{0SPD!|UKGO+j@Nvn-91lB>QrcOz7FmN=qE&gYO%$!8Xd^NhMO%^W
zqG&I&Ac}CIfYd08M0SXxSY*d2It7o+X$yYp;GFx&AeF<N#p>ts!p`S37O>Y{I88m+
zZ^<Qgt(7HmDRV9ZMcWeRsz_X2gQ@I8zdK@AD_>4x{p9CQ>%0nGA~<0=U(`__N)u)l
Z`$+G^OrE)Lmvd9g4ShGCdnV)Fe*q3ZYxn>F

delta 2003
zcmZ{kd7O=96vw~sy>sWCx%V}esWC(|d?Lm$Lt{vmF_lF26d{BxnUFSZw<xXC;;pnO
zM3zd?=-Nt~6xtV+_Dw0RN|L62=e=C|!{>AFIp;a=Ip;a&cg}g{mQ=QhZ?0au9w>3b
zQQA}Ka%+?jl}2uJxjjn64yD}TGAl|3ev~`8E5_Z-j&Tq78oAHq{!H1-iIT+wF&<>D
zxy&<Zew17uGW!Ka7TSl0T^6}4HkbGkm!(mTqB4U=j6Z7RF(b=jJkApqV|kPnJZYrL
zjw_8kWh7z2m0lLBOj>Qy8k5$Vw9cfbO?t+p^+ukx<8vlGZ_*3dCcfyhA<9c^ba~n3
zm8u+PdfE}2TsEt&Ak_`Z)}f-A??m$b5oyO(?TRdOoGn%J-BwQ3$jmuTxQwo|Vn>Hx
z<u$)itSr4JuRApKmxUWP@hIaBmp47$;%%2r9`Eq3Vtc&DR*(1jz@e?*FRg8{M@Kq&
ze8@JJk37y}qQ|vd=kYP0cznud9-s4t$CrHN@ipK0SzcMV11I?XyiW1$eCx5D?>u&x
z|Mwn0u+w7_6J54={K!upKbzwee(|`9xX0C8<MAuoJbp9NUHtCx2fID~G~FK4{bkZ#
zlm0fc&yN3?RBh6~>~ts|HL0R#qMzes`S~^S((xR}2?>M-esyN!su?x9N8+WLEQjMY
zQVmeP8aJ#|={ieF7w;k-6&H-6<vJCKJK~XoRX8gogg8;uj8V%@67`Y>oJ=>J98RG-
z;lOz&X_6qnU>%{sevj<@xH;F68XA#FW3t8T(j*9!pETYdNN$`;4+X3%%buL3t9!{W
zM?Cqhcj{Xo>H10=apVI1^bgTrp9gSyG8bpJxYlMz_SPVW-ntoDD3d~|Thf$PT7x1X
zQLF-6(}y;kO$lSAoj^OL3cG1SZMJY*Ak-EKw<WS(D$F(rF9Twz@+_6_K+X_AooUXQ
zl3c~^${+@7g=Y(_fpIA#x_BXHF+_Q0Fi);Sl;2VsGECQ6fg4jWY-G5;IzjOUQPOin
z%5$W2W<Q*BWHm~12QsRu<uW?>jj5)W%egLN_1i;6d@rG_eYh@T_HxX>@(H<&lPQkN
z_yaf&SDYk{6J((!(0w)#UBoTFSiwqawpc^$5X*HubS%0BXe9d-OO+9$g7X!suK}+{
zRfsvZ7#7&?lhdH1%|>#tdLAai<Ya_ofXP9CDO{lX%l*YUor1>Z2wPM{y0WjS8OYWI
zG#BF5p#H)dH9R?~CQao+C1KJ<lB}*mF4iT6Xd!l;jcOs6aH-;^tCiCvr7L2X%hVM&
z=!$KCG+m{-Tq<ip2F^aRU9Jf5JTju2&>bi`ii;v1!1qdd>mdkWSXj6CkQEuCn}+In
z97b(**D5Fps>@4NkQZcY732lkS_OGQwqg0!3$jf+m{9El3DpSyFA)blLY9Es{Q<f4
zf*g{q7=4&lOlOAj-oJFy<rlI?a(|3@;s#;)I&ufEqFJxP773asC@`*Hq4AapS{W}&
zP;9(bg4V{{B#0kpLP>(Qg$IYLsn!d|3EJ`0(o*JXD)Tiy%`{5I>Qs9TQ<+dOoRUvT
zc?zfUU;!QZb_mup^;`^+aRxI}?_DDmWkXJ8ozm5`tD?R=dd?w_UVT-TT#W0vLEl2$
Q7`&e`S>2@n%~QGMKl_9~vj6}9

diff --git a/target/classes/mapper/generator/StaffDao.xml b/target/classes/mapper/generator/StaffDao.xml
index 33c85b8d..99e38f11 100644
--- a/target/classes/mapper/generator/StaffDao.xml
+++ b/target/classes/mapper/generator/StaffDao.xml
@@ -130,5 +130,32 @@
         select name staffName,gender,birthday,marital_status,national,political_landscape,mobile,current_address from lz_staff where id=#{staffId}
     </select>
 
+    <select id="getStatisticalData" resultType="com.lz.modules.app.Dto.StaffStatisticalDto">
+        select
+        count(DISTINCT(ls.id)) 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,
+        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
+        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
+        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
+        on so2.leave_staff=ll.id) ls,
+        lz_departments_staff_relate dsr,lz_staff_occupation so,
+        (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
+        and dsr.department_id=td.department_id
+        and (date(so.resignation_time)>=#{endDate} or so.resignation_time is null )
+    </select>
+
 
 </mapper>