From d43c0f42bece03a0d2e81c4c135e803eda75cbcf Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期五, 19 二月 2021 17:03:03 +0800
Subject: [PATCH] 首页的查询,以及性别字段的不必填

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java            |   86 ++
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java         |   37 +
 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java        |    1 
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java                  |   67 +
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/StatisticsController.java     |  326 ++++++++++
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml             | 1027 +++++++++++++++++++++++++++++++++
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java |  300 +++++++++
 7 files changed, 1,828 insertions(+), 16 deletions(-)

diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
index 3214a7f..88fde0a 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
@@ -135,7 +135,6 @@
      * 性别 0男 1女 2 保密
      */
     @TableField("SSEX")
-    @NotBlank(message = "{required}")
     @ExcelField(value = "性别", writeConverterExp = "0=男,1=女,2=保密")
     private String sex;
 
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/StatisticsController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/StatisticsController.java
new file mode 100644
index 0000000..30db2e8
--- /dev/null
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/StatisticsController.java
@@ -0,0 +1,326 @@
+package cc.mrbird.febs.server.hr.controller;
+
+import cc.mrbird.febs.common.core.entity.FebsResponse;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
+import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Api(tags = "員工統計")
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/statistics")
+@RequiredArgsConstructor
+public class StatisticsController {
+    private final IEmpBaseInfoService empBaseInfoService;
+    @ApiOperation(value = "统计")
+    @GetMapping("/list")
+    public FebsResponse empBaseInfoTotalList(@RequestParam(name="index",required = false) String index,
+                                        @RequestParam(name="btime",required = false) String btime,
+                                        @RequestParam(name="etime",required = false) String etime) {
+        Map<String, Object> dataTable = empBaseInfoService.countBaseInfoList(index,btime,etime);
+        return new FebsResponse().data(dataTable);
+    }
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息翻页列表")
+    @GetMapping("/empBaseInfoList")
+    public FebsResponse empBaseInfoList(@RequestParam(name="index",required = false) String index,
+                                        @RequestParam(name="btime",required = false) String btime,
+                                        @RequestParam(name="etime",required = false) String etime,
+                                        @RequestParam(name="pageSize",required = false) String pageSize,
+                                        @RequestParam(name="pageNum",required = false) String pageNum,
+                                        @RequestParam(name="number",required = false) String number,
+                                        @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.baseInfoList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息合同翻页列表")
+    @GetMapping("/empBaseInfoHtList")
+    public FebsResponse empBaseInfoHtList(@RequestParam(name="index",required = false) String index,
+                                        @RequestParam(name="btime",required = false) String btime,
+                                        @RequestParam(name="etime",required = false) String etime,
+                                        @RequestParam(name="pageSize",required = false) String pageSize,
+                                        @RequestParam(name="pageNum",required = false) String pageNum,
+                                        @RequestParam(name="number",required = false) String number,
+                                        @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.baseInfoHeList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+
+
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息出勤翻页列表")
+    @GetMapping("/empBaseInfoCqList")
+    public FebsResponse empBaseInfoCqList(@RequestParam(name="index",required = false) String index,
+                                          @RequestParam(name="btime",required = false) String btime,
+                                          @RequestParam(name="etime",required = false) String etime,
+                                          @RequestParam(name="pageSize",required = false) String pageSize,
+                                          @RequestParam(name="pageNum",required = false) String pageNum,
+                                          @RequestParam(name="number",required = false) String number,
+                                          @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.empBaseInfoCqList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息请假翻页列表")
+    @GetMapping("/empBaseInfoQjList")
+    public FebsResponse empBaseInfoQjList(@RequestParam(name="index",required = false) String index,
+                                          @RequestParam(name="btime",required = false) String btime,
+                                          @RequestParam(name="etime",required = false) String etime,
+                                          @RequestParam(name="pageSize",required = false) String pageSize,
+                                          @RequestParam(name="pageNum",required = false) String pageNum,
+                                          @RequestParam(name="number",required = false) String number,
+                                          @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.empBaseInfoQjList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息体检翻页列表")
+    @GetMapping("/empBaseInfoTjList")
+    public FebsResponse empBaseInfoTjList(@RequestParam(name="index",required = false) String index,
+                                          @RequestParam(name="btime",required = false) String btime,
+                                          @RequestParam(name="etime",required = false) String etime,
+                                          @RequestParam(name="pageSize",required = false) String pageSize,
+                                          @RequestParam(name="pageNum",required = false) String pageNum,
+                                          @RequestParam(name="number",required = false) String number,
+                                          @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.empBaseInfoTjList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息劳资翻页列表")
+    @GetMapping("/empBaseInfoLzList")
+    public FebsResponse empBaseInfoLzList(@RequestParam(name="index",required = false) String index,
+                                          @RequestParam(name="btime",required = false) String btime,
+                                          @RequestParam(name="etime",required = false) String etime,
+                                          @RequestParam(name="pageSize",required = false) String pageSize,
+                                          @RequestParam(name="pageNum",required = false) String pageNum,
+                                          @RequestParam(name="number",required = false) String number,
+                                          @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.empBaseInfoLzList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+
+
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息工伤翻页列表")
+    @GetMapping("/empBaseInfoGsList")
+    public FebsResponse empBaseInfoGsList(@RequestParam(name="index",required = false) String index,
+                                          @RequestParam(name="btime",required = false) String btime,
+                                          @RequestParam(name="etime",required = false) String etime,
+                                          @RequestParam(name="pageSize",required = false) String pageSize,
+                                          @RequestParam(name="pageNum",required = false) String pageNum,
+                                          @RequestParam(name="number",required = false) String number,
+                                          @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.empBaseInfoGsList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息意外险翻页列表")
+    @GetMapping("/empBaseInfoYwList")
+    public FebsResponse empBaseInfoYwList(@RequestParam(name="index",required = false) String index,
+                                          @RequestParam(name="btime",required = false) String btime,
+                                          @RequestParam(name="etime",required = false) String etime,
+                                          @RequestParam(name="pageSize",required = false) String pageSize,
+                                          @RequestParam(name="pageNum",required = false) String pageNum,
+                                          @RequestParam(name="number",required = false) String number,
+                                          @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.empBaseInfoYwList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息社保翻页列表")
+    @GetMapping("/empBaseInfoSbList")
+    public FebsResponse empBaseInfoSbList(@RequestParam(name="index",required = false) String index,
+                                          @RequestParam(name="btime",required = false) String btime,
+                                          @RequestParam(name="etime",required = false) String etime,
+                                          @RequestParam(name="pageSize",required = false) String pageSize,
+                                          @RequestParam(name="pageNum",required = false) String pageNum,
+                                          @RequestParam(name="number",required = false) String number,
+                                          @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.empBaseInfoSbList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息失业金翻页列表")
+    @GetMapping("/empBaseInfoSyjList")
+    public FebsResponse empBaseInfoSyjList(@RequestParam(name="index",required = false) String index,
+                                          @RequestParam(name="btime",required = false) String btime,
+                                          @RequestParam(name="etime",required = false) String etime,
+                                          @RequestParam(name="pageSize",required = false) String pageSize,
+                                          @RequestParam(name="pageNum",required = false) String pageNum,
+                                          @RequestParam(name="number",required = false) String number,
+                                          @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.empBaseInfoSyjList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息不良记录翻页列表")
+    @GetMapping("/empBaseInfoBlList")
+    public FebsResponse empBaseInfoBlList(@RequestParam(name="index",required = false) String index,
+                                           @RequestParam(name="btime",required = false) String btime,
+                                           @RequestParam(name="etime",required = false) String etime,
+                                           @RequestParam(name="pageSize",required = false) String pageSize,
+                                           @RequestParam(name="pageNum",required = false) String pageNum,
+                                           @RequestParam(name="number",required = false) String number,
+                                           @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.empBaseInfoBlList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+    /**
+     *
+     * @param index 选的每日,还是每周之类
+     * @param btime 开始时间
+     * @param etime 结束时间
+     * @param pageSize
+     * @param pageNum
+     * @param number 第一排从1开始 在职就是1 新进就是2以此类推
+     * @param name 查询参数
+     * @return
+     */
+    @ApiOperation(value = "基本信息调岗翻页列表")
+    @GetMapping("/empBaseInfoTgList")
+    public FebsResponse empBaseInfoTgList(@RequestParam(name="index",required = false) String index,
+                                          @RequestParam(name="btime",required = false) String btime,
+                                          @RequestParam(name="etime",required = false) String etime,
+                                          @RequestParam(name="pageSize",required = false) String pageSize,
+                                          @RequestParam(name="pageNum",required = false) String pageNum,
+                                          @RequestParam(name="number",required = false) String number,
+                                          @RequestParam(name="name",required = false) String name) {
+        Map<String, Object> dataTable = FebsUtil.getDataTable(empBaseInfoService.empBaseInfoTgList(index,btime,etime,pageSize,pageNum,number,name));
+        return new FebsResponse().data(dataTable);
+    }
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index 0e20f03..111cf3c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -149,6 +149,13 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date entryDate;
 
+    @FieldInfo(name = "dimissionDate", type = "date", explain = "离职日期")
+    @TableField("dimissionDate")
+    @JsonSerialize(using = DateSerializer.class)
+    @JsonDeserialize(using = DateDeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date dimissionDate;
+
     @FieldInfo(name = "education", type = "varchar", explain = "最高学历")
     @TableField("education")
     private String education = "";
@@ -249,12 +256,7 @@
     @TableField("empStatus")
     private String empStatus = "";
     
-    @FieldInfo(name = "dimissionDate", type = "datetime", explain = "离职日期")
-    @TableField("dimissionDate")
-    @JsonSerialize(using = DateTimeSerializer.class)
-    @JsonDeserialize(using = DateTimeDeserializer.class)
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date dimissionDate;
+
 
     @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
     @TableField("createTime")
@@ -296,4 +298,57 @@
 	@TableField(exist = false)
 	private String dimissionDateStr= "";
 
+    @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
+    @TableField("dimissionType")
+    private String dimissionType = "";
+
+    @TableField(exist = false)
+    private String dimissionTypeName= "";
+
+
+    @FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
+    @TableField(exist = false)
+    @JsonSerialize(using = DateSerializer.class)
+    @JsonDeserialize(using = DateDeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date beginDate;
+
+    @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
+    @TableField(exist = false)
+    @JsonSerialize(using = DateSerializer.class)
+    @JsonDeserialize(using = DateDeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    @FieldInfo(name = "contractStatus", type = "varchar", explain = "合同状态")
+    @TableField(exist = false)
+    private String contractStatus = "";
+
+    @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+    @TableField(exist = false)
+    private Integer contractPeriod = 0;
+
+    @FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
+    @TableField(exist = false)
+    private String transactor = "";
+
+    @FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
+    @TableField(exist = false)
+    @JsonSerialize(using = DateSerializer.class)
+    @JsonDeserialize(using = DateDeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date signingDate;
+
+    @FieldInfo(name = "applayDate", type = "date", explain = "辞职申请日期")
+    @TableField(exist = false)
+    @JsonSerialize(using = DateSerializer.class)
+    @JsonDeserialize(using = DateDeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date applayDate;
+
+    @TableField(exist = false)
+    private String reason;
+    @TableField(exist = false)
+    private String reporter;
+
 }
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
index 12deba4..e9b8723 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
@@ -1,11 +1,15 @@
 package cc.mrbird.febs.server.hr.mapper;
 
-import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.entity.*;
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * name:EmpBaseinfo
@@ -60,4 +64,84 @@
             "        </foreach>\n" +
             "</script>")
     int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+    @SqlParser(filter=true)
+    Map<String, Object> countBaseInfoList(@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime);
+
+    Integer countXjygBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Map<String, Object> countLzygBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+
+    Integer countCzygBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Map<String, Object> countYxhtBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Integer countDqhtBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Map<String, Object> countCqrsBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Integer countYgqjBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+
+
+
+    @SqlParser(filter=true)
+    Integer countLzajBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Map<String, Object> countGsajBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Integer countSbsqBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Integer countSyjBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Integer countYgtjBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Integer countSfzBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Integer countYgtgBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+    @SqlParser(filter=true)
+    Integer countBljlBaseInfoList(@Param("index")String index,@Param("btime") String btime,@Param("etime") String etime);
+
+    IPage<EmpBaseInfo> baseInfoList(Page<EmpBaseInfo> page, String index, String btime, String etime, String name);
+
+
+    @SqlParser(filter=true)
+    IPage<EmpBaseInfo> zzbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name);
+    @SqlParser(filter=true)
+    IPage<EmpBaseInfo> xjbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name);
+    @SqlParser(filter=true)
+    IPage<EmpBaseInfo> zsbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name);
+    @SqlParser(filter=true)
+    IPage<EmpBaseInfo> lsbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name);
+    @SqlParser(filter=true)
+    IPage<EmpBaseInfo> lzbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name);
+    @SqlParser(filter=true)
+    IPage<EmpBaseInfo> cjbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name);
+    @SqlParser(filter=true)
+    IPage<EmpBaseInfo> zcbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+    @SqlParser(filter=true)
+    IPage<EmpBaseInfo> yxbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+    @SqlParser(filter=true)
+    IPage<EmpBaseInfo> dqbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name);
+    @SqlParser(filter=true)
+    IPage<EmpBaseInfo> jcseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name);
+    @SqlParser(filter=true)
+    IPage<EmpDimissionAttend> empBaseInfoCqList(@Param("page") Page<EmpDimissionAttend> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+    @SqlParser(filter=true)
+    IPage<EmpLeaveInfo> empBaseInfoQjList(@Param("page") Page<EmpLeaveInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+
+    @SqlParser(filter=true)
+    IPage<EmpPhysicalExam> empBaseInfoTjList(@Param("page") Page<EmpPhysicalExam> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+    @SqlParser(filter=true)
+    IPage<EmpLaborTrouble> empBaseInfoLzList(@Param("page") Page<EmpLaborTrouble> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+    @SqlParser(filter=true)
+    IPage<EmpOccupational> empBaseInfoGsList(@Param("page") Page<EmpOccupational> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+    @SqlParser(filter=true)
+    IPage<EmpAccidentCases> empBaseInfoYwList(@Param("page") Page<EmpAccidentCases> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+    @SqlParser(filter=true)
+    IPage<EmpInsurance> empBaseInfoSbList(@Param("page") Page<EmpInsurance> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+    @SqlParser(filter=true)
+    IPage<EmpUnemployment> empBaseInfoSyjList(@Param("page") Page<EmpUnemployment> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+    @SqlParser(filter=true)
+    IPage<EmpBadRecord> empBaseInfoBlList(@Param("page") Page<EmpBadRecord> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("number") String number);
+    @SqlParser(filter=true)
+    IPage<EmpBaseInfo> sfzbaseInfoList(@Param("page") Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name);
 }
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
index e48d91b..e9dce2e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
@@ -2,4 +2,1031 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper">
 
+
+    <select id="countBaseInfoList" resultType="java.util.Map">
+        SELECT
+            count(IF(t.empStatus = 0, 1, NULL)) zzyg,
+            count(IF(t.empType = '1', 1, NULL)) zsyg,
+            count(IF(t.empType = '2', 1, NULL)) lsyg,
+            count(
+                IF (t.dimissionType = '1', 1, NULL)
+            ) zclz,
+            count(
+                IF (t.dimissionType = '2', 1, NULL)
+            ) zdlz,
+            count(
+                IF (t.dimissionType = '4', 1, NULL)
+            ) gsct
+        FROM
+            t_emp_baseinfo t where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t.createTime,'%Y-%m-%d') &gt;= #{btime}  and date_format(t.createTime,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t.createTime) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t.createTime,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t.createTime)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+
+
+    <select id="countXjygBaseInfoList" resultType="java.lang.Integer">
+        SELECT
+        count(1) xjyg
+        FROM
+        t_emp_baseinfo t where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t.entryDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t.entryDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t.entryDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t.entryDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t.entryDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t.entryDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+    <select id="countLzygBaseInfoList" resultType="java.util.Map">
+        SELECT
+        count(1) lzyg,count(IF(t1.contractStatus = 3, 1, NULL)) jcht
+
+        FROM
+        t_emp_baseinfo t left JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t.dimissionDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t.dimissionDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t.dimissionDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t.dimissionDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+    <select id="countCzygBaseInfoList" resultType="java.lang.Integer">
+        SELECT
+        count(1) czyg
+        FROM
+        t_emp_baseinfo t INNER JOIN t_emp_resign t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t1.applayDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.applayDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.applayDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="countYxhtBaseInfoList" resultType="java.util.Map">
+        SELECT
+        count(IF(t1.contractStatus = 1 or t1.contractStatus = 2, 1, NULL)) yxht,
+        count(IF(t1.contractStatus = 1, 1, NULL)) xinqht,
+        count(IF(t1.contractStatus = 2, 1, NULL)) xqht
+
+        FROM
+        t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t1.signingDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.signingDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.signingDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+
+
+    <select id="countDqhtBaseInfoList" resultType="java.lang.Integer">
+        SELECT
+        count(IF(t1.contractStatus = 4, 1, NULL)) dqht
+        FROM
+        t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t1.endDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.endDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.endDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.endDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.endDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.endDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+
+
+    <select id="countCqrsBaseInfoList" resultType="java.util.Map">
+        SELECT
+        count(1) cqrs,count(IF(t1.overtimeDay!=0 or t1.overtimeHour!=0, 1, NULL)) ygjb
+        ,count(IF(t1.absenteeism !=0 , 1, NULL)) ygkg
+
+        FROM
+        t_emp_baseinfo t right  JOIN t_emp_dimissionattend t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and t1.attendMonth &gt;= #{btime}  and t1.attendMonth &lt;= #{etime}
+            </when>
+            <when test="index==2">
+                and t1.attendMonth = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and t1.attendMonth=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+
+
+    <select id="countYgqjBaseInfoList" resultType="java.lang.Integer">
+        SELECT
+        count(1) ygqj
+        FROM
+        t_emp_baseinfo t right  JOIN t_emp_leaveinfo t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t1.returnDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.returnDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.returnDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.returnDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.returnDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.returnDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+
+
+
+
+
+
+
+
+
+
+    <select id="countLzajBaseInfoList" resultType="java.lang.Integer">
+        SELECT
+        count(1) lzaj
+        FROM
+        t_emp_baseinfo t right  JOIN t_emp_labortrouble t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t1.arbitrationDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.arbitrationDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.arbitrationDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.arbitrationDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.arbitrationDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.arbitrationDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+
+
+    <select id="countGsajBaseInfoList" resultType="java.util.Map">
+        SELECT (SELECT  count(1)
+        FROM
+        t_emp_baseinfo t right  JOIN t_emp_accidentcases t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t1.injuredTime,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.injuredTime,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.injuredTime) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.injuredTime)=YEAR(NOW())
+            </otherwise>
+        </choose>) ywxaj,(
+        SELECT
+        count(1)
+        FROM
+        t_emp_baseinfo t right  JOIN t_emp_occupational t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t1.injuredTime,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.injuredTime,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.injuredTime) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.injuredTime)=YEAR(NOW())
+            </otherwise>
+        </choose>) gsaj
+
+    </select>
+
+
+
+    <select id="countSbsqBaseInfoList" resultType="java.lang.Integer">
+        SELECT
+        count(1) sbsq
+        FROM
+        t_emp_baseinfo t right  JOIN t_emp_insurance t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t1.applayDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.applayDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.applayDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+    <select id="countSyjBaseInfoList" resultType="java.lang.Integer">
+        SELECT
+        count(1) syj
+        FROM
+        t_emp_baseinfo t right  JOIN t_emp_unemployment t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t1.applayDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.applayDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.applayDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+    <select id="countYgtjBaseInfoList" resultType="java.lang.Integer">
+        SELECT
+        count(1) ygtj
+        FROM
+        t_emp_baseinfo t right  JOIN t_emp_physicalexam t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t1.physicalExamDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.physicalExamDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.physicalExamDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.physicalExamDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.physicalExamDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.physicalExamDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+    <select id="countSfzBaseInfoList" resultType="java.lang.Integer">
+        SELECT
+        count(1) sfz
+        FROM
+        t_emp_baseinfo t  where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t.certificateValidity,'%Y-%m-%d') &gt;= #{btime}  and date_format(t.certificateValidity,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t.certificateValidity) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t.certificateValidity,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t.certificateValidity,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t.certificateValidity)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="countYgtgBaseInfoList" resultType="java.lang.Integer">
+        SELECT
+        count(1) ygtg
+        FROM
+        t_emp_baseinfo t right  JOIN t_emp_jobChange t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="index==0">
+                and TO_DAYS(t1.changeDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.changeDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.changeDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.changeDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="countBljlBaseInfoList" resultType="java.lang.Integer">
+        SELECT
+        count(1) bljl
+        FROM
+        t_emp_baseinfo t right  JOIN t_emp_badrecord t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
+                and date_format(t1.badDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.badDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.badDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.badDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.badDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.badDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+    </select>
+
+
+
+    <select id="zzbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+        select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where empStatus=0
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.createTime,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.createTime,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.createTime) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.createTime,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.createTime)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+    <select id="sfzbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+        select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.certificateValidity,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.certificateValidity,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.certificateValidity) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.certificateValidity,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.certificateValidity,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.certificateValidity)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+    <select id="xjbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+        select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.entryDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.entryDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.entryDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.entryDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.entryDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.entryDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+
+
+    <select id="zsbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+        select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where empType='1'
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.createTime,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.createTime,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.createTime) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.createTime,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.createTime)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+    <select id="lsbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+        select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where empType='2'
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.createTime,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.createTime,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.createTime) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.createTime,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.createTime)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+
+
+    <select id="lzbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+        select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.dimissionDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.dimissionDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.dimissionDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.dimissionDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+
+
+    <select id="cjbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+        SELECT
+        t.*,t1.applayDate,t1.reason,t1.reporter
+        FROM
+        t_emp_baseinfo t INNER JOIN t_emp_resign t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t.empNumb like CONCAT('%',#{name},'%') or t.empName like CONCAT('%',#{name},'%') or
+            t.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.applayDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.applayDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.applayDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+
+    <select id="zcbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+        select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where 1=1
+        <choose>
+            <when test="number==8">
+               and t1.dimissionType = '1'
+            </when>
+            <when test="number==9">
+                and t1.dimissionType = '2'
+            </when>
+            <when test="number==10">
+                and t1.dimissionType = '4'
+            </when>
+            <otherwise>
+
+            </otherwise>
+        </choose>
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.createTime,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.createTime,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.createTime) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.createTime,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.createTime,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.createTime)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+
+    <select id="yxbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+        select t1.* from t_emp_baseinfo t left join t_dept t2 on t.deptId=t2.DEPT_ID INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1
+        <choose>
+            <when test="number==14">
+                and t1.contractStatus = '2'
+            </when>
+            <when test="number==13">
+                and t1.contractStatus = '1'
+            </when>
+            <otherwise>
+                and (t1.contractStatus = '1' or t1.contractStatus = '2')
+            </otherwise>
+        </choose>
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t.empNumb like CONCAT('%',#{name},'%') or t.empName like CONCAT('%',#{name},'%') or
+            t.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.signingDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.signingDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.signingDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+
+
+    <select id="dqbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+        SELECT
+        t1.*
+        FROM
+        t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t1.contractStatus = '4'
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t.empNumb like CONCAT('%',#{name},'%') or t.empName like CONCAT('%',#{name},'%') or
+            t.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.endDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.endDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.endDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.endDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.endDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.endDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+    <select id="jcseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
+        SELECT
+        t1.*
+        FROM
+        t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1 and t1.contractStatus = '3'
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t.empNumb like CONCAT('%',#{name},'%') or t.empName like CONCAT('%',#{name},'%') or
+            t.certificateNumb like CONCAT('%',#{name},'%') or t2.DEPT_NAME like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t.dimissionDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t.dimissionDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t.dimissionDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t.dimissionDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t.dimissionDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t.dimissionDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+    <select id="empBaseInfoCqList" resultType="cc.mrbird.febs.server.hr.entity.EmpDimissionAttend">
+        SELECT
+        t1.*
+        FROM
+        t_emp_baseinfo t right JOIN t_emp_dimissionattend t1 on t.empId=t1.empId left join t_dept t2 on t.deptId=t2.DEPT_ID where 1=1
+        <choose>
+            <when test="number==3">
+              and  t1.absenteeism !=0
+            </when>
+            <when test="number==2">
+              and  (t1.overtimeDay!=0 or t1.overtimeHour!=0)
+            </when>
+            <otherwise>
+
+            </otherwise>
+        </choose>
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                  and t1.attendMonth &gt;= #{btime}  and t1.attendMonth &lt;= #{etime}
+            </when>
+            <when test="index==2">
+                and t1.attendMonth = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and t1.attendMonth=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+
+
+    <select id="empBaseInfoQjList" resultType="cc.mrbird.febs.server.hr.entity.EmpLeaveInfo">
+        SELECT
+        t1.*
+        FROM
+        t_emp_baseinfo t right JOIN t_emp_leaveinfo t1 on t.empId=t1.empId where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.returnDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.returnDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.returnDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.returnDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.returnDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.returnDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+    <select id="empBaseInfoTjList" resultType="cc.mrbird.febs.server.hr.entity.EmpPhysicalExam">
+        SELECT
+        t1.*
+        FROM
+        t_emp_baseinfo t right JOIN t_emp_physicalexam t1 on t.empId=t1.empId where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.physicalExamDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.physicalExamDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.physicalExamDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.physicalExamDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.physicalExamDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.physicalExamDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+
+
+
+    <select id="empBaseInfoLzList" resultType="cc.mrbird.febs.server.hr.entity.EmpLaborTrouble">
+        SELECT
+        t1.*
+        FROM
+        t_emp_baseinfo t right JOIN t_emp_labortrouble t1 on t.empId=t1.empId where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.arbitrationDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.arbitrationDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.arbitrationDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.arbitrationDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.arbitrationDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.arbitrationDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+
+
+    <select id="empBaseInfoGsList" resultType="cc.mrbird.febs.server.hr.entity.EmpOccupational">
+        SELECT
+        t1.*
+        FROM
+        t_emp_baseinfo t right JOIN t_emp_occupational t1 on t.empId=t1.empId where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.injuredTime,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.injuredTime,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.injuredTime) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.injuredTime)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+    <select id="empBaseInfoYwList" resultType="cc.mrbird.febs.server.hr.entity.EmpAccidentCases">
+        SELECT
+        t1.*
+        FROM
+        t_emp_baseinfo t right JOIN t_emp_accidentcases t1 on t.empId=t1.empId where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.injuredTime,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.injuredTime,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.injuredTime) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.injuredTime,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.injuredTime,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.injuredTime)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+
+    <select id="empBaseInfoSbList" resultType="cc.mrbird.febs.server.hr.entity.EmpInsurance">
+        SELECT
+        t1.*
+        FROM
+        t_emp_baseinfo t right JOIN t_emp_insurance t1 on t.empId=t1.empId where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.applayDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.applayDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.applayDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+
+    <select id="empBaseInfoSyjList" resultType="cc.mrbird.febs.server.hr.entity.EmpUnemployment">
+        SELECT
+        t1.*
+        FROM
+        t_emp_baseinfo t right JOIN t_emp_unemployment t1 on t.empId=t1.empId where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.applayDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.applayDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.applayDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.applayDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.applayDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.applayDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
+
+    <select id="empBaseInfoBlList" resultType="cc.mrbird.febs.server.hr.entity.EmpBadRecord">
+        SELECT
+        t1.*
+        FROM
+        t_emp_baseinfo t right JOIN t_emp_badrecord t1 on t.empId=t1.empId where 1=1
+        <if test="name!= 'undefined' and name!=null and name!=''">
+            and (t1.empNumb like CONCAT('%',#{name},'%') or t1.empName like CONCAT('%',#{name},'%') or
+            t1.certificateNumb like CONCAT('%',#{name},'%') or t1.deptName like CONCAT('%',#{name},'%'))
+        </if>
+        <choose>
+            <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
+                and date_format(t1.badDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.badDate,'%Y-%m-%d') &lt;= #{etime}
+            </when>
+            <when test="index==0">
+                and TO_DAYS(t1.badDate) = TO_DAYS(NOW())
+            </when>
+            <when test="index==1">
+                and YEARWEEK(date_format(t1.badDate,'%Y-%m-%d')) = YEARWEEK(now())
+            </when>
+            <when test="index==2">
+                and date_format(t1.badDate,'%Y-%m') = date_format(now(),'%Y-%m')
+            </when>
+            <otherwise>
+                and YEAR(t1.badDate)=YEAR(NOW())
+            </otherwise>
+        </choose>
+
+    </select>
 </mapper>
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
index 63c6390..c67a4d6 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
@@ -1,12 +1,13 @@
 package cc.mrbird.febs.server.hr.service;
 
-import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.entity.*;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * name:EmpBaseinfo
@@ -99,4 +100,38 @@
      * @return cc.mrbird.febs.server.hr.entity.EmpBaseInfo
      */
     EmpBaseInfo getEmpBaseInfo(EmpBaseInfo empBaseInfo);
+
+    /**
+     *
+     *
+     * @param s
+     * @param btime
+     * @param index 0 今天 1本周 2本月 3今年
+     * @return
+     */
+    Map<String, Object> countBaseInfoList(String s, String btime, String index);
+
+    IPage<EmpBaseInfo> baseInfoList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpBaseInfo> baseInfoHeList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpDimissionAttend> empBaseInfoCqList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpLeaveInfo> empBaseInfoQjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpPhysicalExam> empBaseInfoTjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpLaborTrouble> empBaseInfoLzList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<?> empBaseInfoTgList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpOccupational> empBaseInfoGsList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpAccidentCases> empBaseInfoYwList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpInsurance> empBaseInfoSbList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpUnemployment> empBaseInfoSyjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
+
+    IPage<EmpBadRecord> empBaseInfoBlList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name);
 }
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 0e82aed..1302118 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -1,11 +1,8 @@
 package cc.mrbird.febs.server.hr.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
+import cc.mrbird.febs.server.hr.entity.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -26,7 +23,6 @@
 import cc.mrbird.febs.common.core.utils.FebsUtil;
 import cc.mrbird.febs.common.core.utils.SequenceUtil;
 import cc.mrbird.febs.common.redis.service.RedisService;
-import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
 import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
 import cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper;
 import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
@@ -48,6 +44,7 @@
     private final RedisService redisService;
     private final IRemoteDeptService remoteDeptService;
     private final EmpBaseInfoMapper empBaseInfoMapper;
+
     private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
             .map(u -> u.getUserId().toString())
             .orElse("1");
@@ -251,7 +248,296 @@
         if(StringUtils.isNotEmpty(empBaseInfo.getCertificateNumb())){
             queryWrapper.lambda().eq(EmpBaseInfo::getCertificateNumb, empBaseInfo.getCertificateNumb());
         }
-
         return this.getOne(queryWrapper);
     }
+
+
+    @Override
+    public IPage<EmpBaseInfo> baseInfoList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        Page<EmpBaseInfo> page = new Page<EmpBaseInfo>(new Long(pageNum), new Long(pageSize));
+        IPage<EmpBaseInfo> iPage =null;
+        if("1".equals(number)){ //在职员工
+            iPage = this.empBaseInfoMapper.zzbaseInfoList(page, index,btime,etime,name);
+        }else if("2".equals(number)){ //新进员工
+            iPage = this.empBaseInfoMapper.xjbaseInfoList(page, index,btime,etime,name);
+        }else if("3".equals(number)){ //正式员工
+            iPage = this.empBaseInfoMapper.zsbaseInfoList(page, index,btime,etime,name);
+        }else if("4".equals(number)){ //临时员工
+            iPage = this.empBaseInfoMapper.lsbaseInfoList(page, index,btime,etime,name);
+        }else if("5".equals(number)){ //超龄员工
+            iPage = this.empBaseInfoMapper.baseInfoList(page, index,btime,etime,name);
+        }else if("6".equals(number)){ //离职员工总数
+            iPage = this.empBaseInfoMapper.lzbaseInfoList(page, index,btime,etime,name);
+        }else if("7".equals(number)){ //辞职申请人数
+            iPage = this.empBaseInfoMapper.cjbaseInfoList(page, index,btime,etime,name);
+        }else if("8".equals(number) || "9".equals(number) || "10".equals(number)){ //正常离职人数 ,自动离职人数 ,公司辞退人数
+            iPage = this.empBaseInfoMapper.zcbaseInfoList(page, index,btime,etime,name,number);
+        }else if("11".equals(number)){ //身份证到期
+            iPage = this.empBaseInfoMapper.sfzbaseInfoList(page, index,btime,etime,name);
+        }
+        //设置部门
+        List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
+        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
+        list.forEach(p -> {
+            p.setSexName("1".equals(p.getSex()) ? "男" : "女");
+            if(StringUtils.isNotBlank(p.getEmpType())){
+                p.setEmpTypeName("1".equals(p.getEmpType()) ? "正式工" : "临时工");
+            }
+            if(StringUtils.isNotBlank(p.getDimissionType())){
+                if("1".equals(p.getDimissionType())){
+                    p.setDimissionTypeName("正常离职");
+                }else if("2".equals(p.getDimissionType())){
+                    p.setDimissionTypeName("自动离职");
+                }else if("3".equals(p.getDimissionType())){
+                    p.setDimissionTypeName("公司劝退");
+                }else if("4".equals(p.getDimissionType())){
+                    p.setDimissionTypeName("公司辞退");
+                }else if("5".equals(p.getDimissionType())){
+                    p.setDimissionTypeName("试用期内");
+                }
+            }
+            p.setInsuranceTypeName("1".equals(p.getInsuranceType()) ? "(深户)五险一档" : "(非深户)五险一档");
+            p.setArchivesStatusName("0".equals(p.getArchivesStatus()) ? "未移交" : "已移交");
+            // 设置民族
+            p.setNationName(dicItems.stream()
+                    .filter(k -> DicCode.NATION.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNation()))
+                    .findFirst()
+                    .map(DicItem::getDicItemName)
+                    .orElse("汉族"));
+            // 设置政治面貌
+            p.setPoliticsName(dicItems.stream()
+                    .filter(k -> DicCode.PLITICAL.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getPolitics()))
+                    .findFirst()
+                    .map(DicItem::getDicItemName)
+                    .orElse("群众"));
+            // 设置婚姻状况
+            p.setMarriageName(dicItems.stream()
+                    .filter(k -> DicCode.MARRIAGE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getMarriage()))
+                    .findFirst()
+                    .map(DicItem::getDicItemName)
+                    .orElse("未婚"));
+            // 设置学历
+            p.setEducationName(dicItems.stream()
+                    .filter(k -> DicCode.EDUCATION.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getEducation()))
+                    .findFirst()
+                    .map(DicItem::getDicItemName)
+                    .orElse("无学历"));
+            // 设置籍贯
+            p.setNativePlaceName(dicItems.stream()
+                    .filter(k -> DicCode.NATIVEPLACE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNativePlace()))
+                    .findFirst()
+                    .map(DicItem::getDicItemName)
+                    .orElse("未知"));
+        });
+        iPage.setRecords(list);
+        return iPage;
+    }
+
+    @Override
+    public IPage<EmpBaseInfo> baseInfoHeList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        Page<EmpBaseInfo> page = new Page<EmpBaseInfo>(new Long(pageNum), new Long(pageSize));
+        IPage<EmpBaseInfo> iPage =null;
+        if("11".equals(number) || "13".equals(number) || "14".equals(number)){ //有效合同   ,新签合同,续签合同
+            iPage = this.empBaseInfoMapper.yxbaseInfoList(page, index,btime,etime,name,number);
+        }else if("12".equals(number)){ //到期合同
+            iPage = this.empBaseInfoMapper.dqbaseInfoList(page, index,btime,etime,name);
+        }else if("15".equals(number)){ //解除合同
+            iPage = this.empBaseInfoMapper.jcseInfoList(page, index,btime,etime,name);
+        }
+        //设置部门
+        List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
+        list.forEach(p -> {
+             if("1".equals(p.getContractStatus())){
+                 p.setContractStatus("新签");
+             }else if("2".equals(p.getContractStatus())){
+                 p.setContractStatus("续签");
+             }else if("3".equals(p.getContractStatus())){
+                 p.setContractStatus("解除");
+             }else if("4".equals(p.getContractStatus())){
+                 p.setContractStatus("到期");
+             }
+        });
+        iPage.setRecords(list);
+        return iPage;
+    }
+
+    @Override
+    public IPage<EmpDimissionAttend> empBaseInfoCqList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        Page<EmpDimissionAttend> page = new Page<EmpDimissionAttend>(new Long(pageNum), new Long(pageSize));
+        IPage<EmpDimissionAttend> iPage =null;
+        //q出勤人数   员工加班   员工旷工
+        iPage = this.empBaseInfoMapper.empBaseInfoCqList(page, index,btime,etime,name,number);
+
+        return iPage;
+    }
+
+    @Override
+    public IPage<EmpLeaveInfo> empBaseInfoQjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        Page<EmpLeaveInfo> page = new Page<EmpLeaveInfo>(new Long(pageNum), new Long(pageSize));
+        IPage<EmpLeaveInfo> iPage =null;
+        //员工请假
+        iPage = this.empBaseInfoMapper.empBaseInfoQjList(page, index,btime,etime,name,number);
+        return iPage;
+    }
+
+    @Override
+    public IPage<EmpPhysicalExam> empBaseInfoTjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        Page<EmpPhysicalExam> page = new Page<EmpPhysicalExam>(new Long(pageNum), new Long(pageSize));
+        IPage<EmpPhysicalExam> iPage =null;
+        //员工体检
+        iPage = this.empBaseInfoMapper.empBaseInfoTjList(page, index,btime,etime,name,number);
+        return iPage;
+    }
+
+    @Override
+    public IPage<EmpLaborTrouble> empBaseInfoLzList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        Page<EmpLaborTrouble> page = new Page<EmpLaborTrouble>(new Long(pageNum), new Long(pageSize));
+        IPage<EmpLaborTrouble> iPage =null;
+        //劳资案件
+        iPage = this.empBaseInfoMapper.empBaseInfoLzList(page, index,btime,etime,name,number);
+        return iPage;
+    }
+
+    @Override
+    public IPage<?> empBaseInfoTgList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        return null;
+    }
+
+    @Override
+    public IPage<EmpOccupational> empBaseInfoGsList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        Page<EmpOccupational> page = new Page<EmpOccupational>(new Long(pageNum), new Long(pageSize));
+        IPage<EmpOccupational> iPage =null;
+        //工伤案件
+        iPage = this.empBaseInfoMapper.empBaseInfoGsList(page, index,btime,etime,name,number);
+        return iPage;
+    }
+
+    @Override
+    public IPage<EmpAccidentCases> empBaseInfoYwList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        Page<EmpAccidentCases> page = new Page<EmpAccidentCases>(new Long(pageNum), new Long(pageSize));
+        IPage<EmpAccidentCases> iPage =null;
+        //意外险案件
+        iPage = this.empBaseInfoMapper.empBaseInfoYwList(page, index,btime,etime,name,number);
+        return iPage;
+    }
+
+    @Override
+    public IPage<EmpInsurance> empBaseInfoSbList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        Page<EmpInsurance> page = new Page<EmpInsurance>(new Long(pageNum), new Long(pageSize));
+        IPage<EmpInsurance> iPage =null;
+        //社保
+        iPage = this.empBaseInfoMapper.empBaseInfoSbList(page, index,btime,etime,name,number);
+        return iPage;
+    }
+
+    @Override
+    public IPage<EmpUnemployment> empBaseInfoSyjList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        Page<EmpUnemployment> page = new Page<EmpUnemployment>(new Long(pageNum), new Long(pageSize));
+        IPage<EmpUnemployment> iPage =null;
+        //失业金
+        iPage = this.empBaseInfoMapper.empBaseInfoSyjList(page, index,btime,etime,name,number);
+        return iPage;
+    }
+
+    @Override
+    public IPage<EmpBadRecord> empBaseInfoBlList(String index, String btime, String etime, String pageSize, String pageNum, String number, String name) {
+        Page<EmpBadRecord> page = new Page<EmpBadRecord>(new Long(pageNum), new Long(pageSize));
+        IPage<EmpBadRecord> iPage =null;
+        //不良记录
+        iPage = this.empBaseInfoMapper.empBaseInfoBlList(page, index,btime,etime,name,number);
+        return iPage;
+    }
+
+    @Override
+    public Map<String, Object> countBaseInfoList(String index, String btime, String etime) {
+        //在职员工,正式员工,临时员工,正常离职,自动离职,公司辞退        判断条件离职申请日期
+        Map<String, Object> stringObjectMap = this.baseMapper.countBaseInfoList(index,btime,etime);
+        //新进员工      判断条件入职日期
+        Integer xjygObjectMap =this.baseMapper.countXjygBaseInfoList(index,btime,etime);
+        if(xjygObjectMap!=null){
+            stringObjectMap.put("xjyg",xjygObjectMap);
+        }
+        //离职员工总数,解除合同        判断条件离职申请日期
+        Map<String, Object> lzygObjectMap =this.baseMapper.countLzygBaseInfoList(index,btime,etime);
+        if(lzygObjectMap!=null){
+            stringObjectMap.put("lzyg",lzygObjectMap.get("lzyg").toString());
+            stringObjectMap.put("jcht",lzygObjectMap.get("jcht").toString());
+        }
+        //辞职申请员工总数     判断条件辞职申请日期
+        Integer czygObjectMap =this.baseMapper.countCzygBaseInfoList(index,btime,etime);
+        if(czygObjectMap!=null){
+            stringObjectMap.put("czyg",czygObjectMap);
+        }
+        //有效合同,新签合同,续签合同    判断条件合同签订日期
+        Map<String, Object> yxhtObjectMap =this.baseMapper.countYxhtBaseInfoList(index,btime,etime);
+        if(yxhtObjectMap!=null){
+            stringObjectMap.put("yxht",yxhtObjectMap.get("yxht").toString());
+            stringObjectMap.put("xinqht",yxhtObjectMap.get("xinqht").toString());
+            stringObjectMap.put("xqht",yxhtObjectMap.get("xqht").toString());
+        }
+        //到期合同     判断条件合同结束时间
+        Integer dqhtObjectMap =this.baseMapper.countDqhtBaseInfoList(index,btime,etime);
+        if(dqhtObjectMap!=null){
+            stringObjectMap.put("dqht",dqhtObjectMap);
+        }
+
+        //出勤人数,员工加班,员工旷工    判断条件考勤月份    本年,本月
+        Map<String, Object> cqrsObjectMap =this.baseMapper.countCqrsBaseInfoList(index,btime,etime);
+        if(cqrsObjectMap!=null){
+            stringObjectMap.put("cqrs",cqrsObjectMap.get("cqrs").toString());
+            stringObjectMap.put("ygjb",cqrsObjectMap.get("ygjb").toString());
+            stringObjectMap.put("ygkg",cqrsObjectMap.get("ygkg").toString());
+        }
+
+        //员工请假     判断条件到岗时间
+        Integer ygqjObjectMap =this.baseMapper.countYgqjBaseInfoList(index,btime,etime);
+        if(ygqjObjectMap!=null){
+            stringObjectMap.put("ygqj",ygqjObjectMap);
+        }
+
+        //劳资案件     判断条件仲裁日期
+        Integer lzajObjectMap =this.baseMapper.countLzajBaseInfoList(index,btime,etime);
+        if(lzajObjectMap!=null){
+            stringObjectMap.put("lzaj",lzajObjectMap);
+        }
+        //工伤案件,意外险案件     判断条件受伤日期
+        Map<String, Object> gsajObjectMap =this.baseMapper.countGsajBaseInfoList(index,btime,etime);
+        if(gsajObjectMap!=null){
+            stringObjectMap.put("gsaj",gsajObjectMap.get("gsaj").toString());
+            stringObjectMap.put("ywxaj",gsajObjectMap.get("ywxaj").toString());
+        }
+        //社保申请     判断条件社保申请日期
+        Integer sbsqObjectMap =this.baseMapper.countSbsqBaseInfoList(index,btime,etime);
+        if(sbsqObjectMap!=null){
+            stringObjectMap.put("sbsq",sbsqObjectMap);
+        }
+        //失业金领取     判断条件失业金申请日期
+        Integer syjObjectMap =this.baseMapper.countSyjBaseInfoList(index,btime,etime);
+        if(syjObjectMap!=null){
+            stringObjectMap.put("syj",syjObjectMap);
+        }
+        //员工体检     判断条件体检日期
+        Integer ygtjObjectMap =this.baseMapper.countYgtjBaseInfoList(index,btime,etime);
+        if(ygtjObjectMap!=null){
+            stringObjectMap.put("ygtj",ygtjObjectMap);
+        }
+        //身份证到期     判断条件身份证有效时间
+        Integer sfzObjectMap =this.baseMapper.countSfzBaseInfoList(index,btime,etime);
+        if(sfzObjectMap!=null){
+            stringObjectMap.put("sfz",sfzObjectMap);
+        }
+
+        //员工调岗     判断条件身份证有效时间
+        Integer ygtgObjectMap =this.baseMapper.countYgtgBaseInfoList(index,btime,etime);
+        if(ygtgObjectMap!=null){
+            stringObjectMap.put("ygtg",ygtgObjectMap);
+        }
+
+        //不良记录     判断条件身份证有效时间
+        Integer bljlObjectMap =this.baseMapper.countBljlBaseInfoList(index,btime,etime);
+        if(bljlObjectMap!=null){
+            stringObjectMap.put("bljl",bljlObjectMap);
+        }
+        return stringObjectMap;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0