Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue

@@ -220,10 +220,8 @@ export default {
     },
     /** 导出Excel */
     doExport() {
-
-      console.log("isExport:",this.isExport)
-
       if(this.isExport==true) {
+        console.log("isExport:",this.isExport)
         this.$message.info("考勤数据正在导出中，请勿重复点击！")
         return false;
       }
@@ -240,6 +238,8 @@ export default {
         params["idList"] = this.selection;
       }
 
+      let that=this;
+
       this.$download(
         "/attendance/record/hik/exportExcel",
         {
@@ -247,7 +247,9 @@ export default {
         },
         { type: "excel" }
       )
-        .then(() => (this.isExport = false))
+        .then(() => {
+          console.log("isExport222:",this.isExport)
+          that.isExport = false})
         .catch((error) => {
           this.isExport = false;
           this.$message.error(error.message);

attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue

@@ -202,6 +202,7 @@ export default {
           params[value.name] = this.query[value.name];
         }
       }
+
       if (this.selection.length > 0) {
         params["idList"] = this.selection;
       }

attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -209,15 +209,20 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         attendanceRecordQuery.setAttendanceDateStart(DateUtil.beginOfMonth(new Date()).toDateStr());
         attendanceRecordQuery.setAttendanceDateEnd(DateUtil.today());
         List<AttendanceRecordEntity> attendanceRecordEntities = recordService.find(attendanceRecordQuery);
-        //总打卡人次
-        long total = recordHikService.find(hikQuery).parallelStream().map(item -> item.getStaffId()).distinct().count();
-        //long total = attendanceRecordEntities.parallelStream().map(item -> item.getStaffId()).distinct().count();
+
+
+        //获取当月打卡人数，如果存在
+        Long totalCache = cacheService.hget(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.format(new Date(), "yyyy-MM"), Long.class);
+        if (ObjectUtils.isEmpty(totalCache)) {
+            totalCache = recordHikService.find(hikQuery).parallelStream().map(item -> item.getStaffId()).distinct().count();
+            cacheService.hset(RedisKey.KEY_ATTENC_TOTOAL_CACHE, DateUtil.format(new Date(), "yyyy-MM"), totalCache);
+        }
 
         //迟到次数
         long beLate = attendanceRecordEntities.parallelStream()
                 .flatMap(item -> item.getAttendanceRecordDetailList().stream())
                 .filter(f -> GoWorkResultEnum.迟到.getValue() == f.getGoWorkResult() || OffWorkResultEnum.迟到.getValue() == f.getOffWorkResult())
-                .map(i->i.getStaffId())
+                .map(i -> i.getStaffId())
                 .distinct()
                 .count();
 
@@ -225,7 +230,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         long leaveEarly = attendanceRecordEntities.parallelStream()
                 .flatMap(item -> item.getAttendanceRecordDetailList().stream())
                 .filter(f -> GoWorkResultEnum.早退.getValue() == f.getGoWorkResult() || OffWorkResultEnum.早退.getValue() == f.getOffWorkResult())
-                .map(i->i.getStaffId())
+                .map(i -> i.getStaffId())
                 .distinct()
                 .count();
 
@@ -233,7 +238,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         long lackOfCards = attendanceRecordEntities.parallelStream()
                 .flatMap(item -> item.getAttendanceRecordDetailList().stream())
                 .filter(f -> GoWorkResultEnum.缺卡.getValue() == f.getGoWorkResult() || OffWorkResultEnum.缺卡.getValue() == f.getOffWorkResult())
-                .map(i->i.getStaffId())
+                .map(i -> i.getStaffId())
                 .distinct()
                 .count();
 
@@ -259,12 +264,12 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
                 .count();
         //异常考勤记录
         //未考勤
-       // long noAtt=lackOfCards;
-        long att = totalAttend - lackOfCardsAttend-levealPersonNum;
-        if (att!=0L){
-            BigDecimal bigDecimal = new BigDecimal(att).divide(new BigDecimal(totalAttend),4,BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_CEILING);
-            homeStatInfo.setAttendRadio(bigDecimal.toString()+"%");
-        }else{
+        // long noAtt=lackOfCards;
+        long att = totalAttend - lackOfCardsAttend - levealPersonNum;
+        if (att != 0L) {
+            BigDecimal bigDecimal = new BigDecimal(att).divide(new BigDecimal(totalAttend), 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_CEILING);
+            homeStatInfo.setAttendRadio(bigDecimal.toString() + "%");
+        } else {
             homeStatInfo.setAttendRadio("0%");
         }
 
@@ -272,7 +277,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         homeStatInfo.setLatePersonNum(beLate);
         homeStatInfo.setLeftEarlyPersonNum(leaveEarly);
         homeStatInfo.setMissCardPersonNum(lackOfCards);
-        homeStatInfo.setAttendPersonNum(total);
+        homeStatInfo.setAttendPersonNum(totalCache);
 
         data.put("homeStat", homeStatInfo);
         data.put("token", token);
@@ -289,7 +294,6 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     }
 
 
-
     @RequestMapping("validcode")
     public String validCode(HttpServletRequest request, HttpServletResponse response, LoginForm loginForm) {
         JSONObject ret = new JSONObject();

attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java

@@ -16,4 +16,9 @@ public class RedisKey {
      */
     public static final String KEY_DINGTALK_ACCESSTOKEN_CACHE = "dingtalk:token:";
 
+    /**
+     * 每月打卡人数
+     */
+    public static final String KEY_ATTENC_TOTOAL_CACHE = "attend:total";
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceStatVo.java

@@ -19,10 +19,8 @@ public class AttendanceStatVo extends BaseEntityLong {
 
     private List<AttendanceStaffStatEntity> attendanceStaffStatEntities;
 
-
     private String startTime;
     private String endTime;
-
-
+    private List <Long> idList;
 
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceSummaryQuery.java

@@ -38,6 +38,8 @@ public class AttendanceSummaryQuery {
 
     private List<String> properties;
 
+    private List<Long> idList;
+
     public AttendanceSummaryQuery(String summaryTime) {
         this.summaryTime = summaryTime;
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java

@@ -4,13 +4,15 @@ import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.util.DataUtil;
+import com.mortals.framework.util.DateUtils;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.busiz.h5.req.AttendSaveReq;
 import com.mortals.xhx.busiz.h5.web.ApiWebPerformController;
 import com.mortals.xhx.common.code.ErrorStatusEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.attendance.model.AttendanceClassDetailEntity;
-import com.mortals.xhx.module.attendance.service.AttendanceClassDetailService;
-import com.mortals.xhx.module.attendance.service.AttendanceClassService;
+import com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery;
+import com.mortals.xhx.module.attendance.service.*;
 import com.mortals.xhx.module.perform.service.PerformAttendRecordService;
 import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +22,6 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.attendance.dao.AttendanceRecordErrorDao;
 import com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity;
-import com.mortals.xhx.module.attendance.service.AttendanceRecordErrorService;
 import org.springframework.util.ObjectUtils;
 
 import java.util.List;
@@ -47,6 +48,8 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
     private ApiWebPerformController apiWebPerformController;
     @Autowired
     private StaffService staffService;
+    @Autowired
+    private AttendanceStatService attendanceStatService;
 
 
     @Override
@@ -140,6 +143,14 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
                 attendSaveReq.setStaffId(entity.getStaffId());
                 performAttendRecordService.saveAttend(attendSaveReq, context);
             }
+
+            //异常处理后重新汇总考勤
+            if(StringUtils.isNotEmpty(entity.getProcessResult())) {
+                AttendanceSummaryQuery query = new AttendanceSummaryQuery();
+                query.setStaffId(entity.getStaffId());
+                query.setSummaryTime(DateUtils.getStrDate(entity.getErrorDateTime()));
+                attendanceStatService.doAttendanceSummary(query);
+            }
         }
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java

@@ -308,9 +308,25 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
         }
 
         if (!ObjectUtils.isEmpty(errorEntityList)) {
+
+            //删除当前员工当日未处理的异常后，重新添加
+            AttendanceRecordErrorQuery errorQuery = new AttendanceRecordErrorQuery();
+            errorQuery.setCreateTimeStart(DateUtil.today());
+            errorQuery.setCreateTimeEnd(DateUtil.today());
+            errorQuery.setStaffId(attendanceRecordEntity.getStaffId());
+            errorQuery.setProcessStatus(ProcessStatusEnum.未处理.getValue());
+
+            Long[] errorIds = errorService.find(errorQuery).stream().map(i -> i.getId()).toArray(Long[]::new);
+
+            if(!ObjectUtils.isEmpty(errorIds)){
+                errorService.remove(errorIds,context);
+            }
+
             for (AttendanceRecordErrorEntity errorEntity : errorEntityList) {
-                //查看是否存在相同的异常记录，如果存在 则不添加
-                AttendanceRecordErrorQuery errorQuery = new AttendanceRecordErrorQuery();
+                errorService.save(errorEntity, context);
+
+               /* //查看是否存在相同的异常记录，如果存在 则不添加
+                 errorQuery = new AttendanceRecordErrorQuery();
                 errorQuery.setShiftsId(errorEntity.getShiftsId());
                 errorQuery.setGoOffDateTime(errorEntity.getErrorDateTime());
                 errorQuery.setStaffId(errorEntity.getStaffId());
@@ -323,7 +339,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                     errorEntity.setId(attendanceRecordErrorEntity.getId());
                     errorService.update(errorEntity,context);
                     log.info("已经存在相同的异常记录，更新保存！");
-                }
+                }*/
             }
         }
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java

@@ -6,6 +6,7 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.utils.ServletUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
@@ -14,6 +15,7 @@ import com.mortals.xhx.common.code.GoWorkResultEnum;
 import com.mortals.xhx.common.code.NormalEnum;
 import com.mortals.xhx.common.code.OffWorkResultEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.keys.RedisCacheKeys;
 import com.mortals.xhx.module.attendance.model.*;
 import com.mortals.xhx.module.attendance.model.vo.AttendStatInfo;
 import com.mortals.xhx.module.attendance.service.AttendanceClassService;
@@ -75,6 +77,8 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
     private AttendanceGroupService groupService;
     @Autowired
     private AttendanceClassService classService;
+    @Autowired
+    private ICacheService cacheService;
 
     public AttendanceRecordController() {
         super.setModuleDesc("考勤打卡记录信息");
@@ -96,6 +100,14 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
 
     @Override
     public void doExportBefore(Context context, AttendanceRecordEntity query, List<String> properties) throws AppException {
+
+
+        String bool = cacheService.get(RedisCacheKeys.getRecordExportLockKey());
+        if (!ObjectUtils.isEmpty(bool)) {
+            throw new AppException("每日数据正在导出中，请稍后再试！");
+        }
+        cacheService.set(RedisCacheKeys.getRecordExportLockKey(), "111", 120L);
+
         if (!ObjectUtils.isEmpty(query.getProperties())) {
           /*  //通过属性转换为注解
             List<Field> tempFields = new ArrayList<>();
@@ -177,6 +189,9 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         attendanceExportRecordEntity.setType(2);
         attendanceExportRecordEntity.setExportOrImport(1);
         attendanceExportRecordService.save(attendanceExportRecordEntity);
+
+        cacheService.del(RedisCacheKeys.getRecordExportLockKey());
+
     }
 
 
@@ -323,7 +338,7 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
         JSONObject jsonObject = new JSONObject();
         String busiDesc = this.getModuleDesc() + "统计";
         try {
-           // Rest<AttendStatInfo> rest = this.service.statByDay(getContext());
+            // Rest<AttendStatInfo> rest = this.service.statByDay(getContext());
 //            if (rest.getCode() == YesNoEnum.NO.getValue()) {
 //                throw new AppException("统计异常！");
 //            } else {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordHikController.java

@@ -190,7 +190,6 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
 
 
         String bool = cacheService.get(RedisCacheKeys.getHikExportLockKey());
-
         if(!ObjectUtils.isEmpty(bool)){
             throw new AppException("考勤数据正在导出中，请稍后再试！");
         }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/DeptDao.java

@@ -36,5 +36,8 @@ public interface  DeptDao extends ICRUDDao<DeptEntity,Long>{
      * */
     DeptEntity queryDeptParient(String parentCode);
 
-
+    /**
+     * 查询包含本部门所有下级部门
+     * */
+    List<DeptEntity> getAllChildrenDept(Long deptId);
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/dao/ibatis/DeptDaoImpl.java

@@ -37,7 +37,10 @@ public class DeptDaoImpl extends BaseCRUDDaoMybatis<DeptEntity,Long> implements
         return getSqlSession().selectOne(getSqlId("queryDeptParient"),parentCode);
     }
 
-
+    @Override
+    public List<DeptEntity> getAllChildrenDept(Long deptId) {
+        return getSqlSession().selectList(getSqlId("getAllChildrenDept"), deptId);
+    }
 
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/DeptService.java

 package com.mortals.xhx.module.dept.service;
 
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.dept.dao.DeptDao;
@@ -64,5 +65,10 @@ public interface DeptService extends ICRUDService<DeptEntity, Long> {
      */
     Rest<Void> updateDeptNum(Context context);
 
+    /**
+     * 查询包含本部门所有下级部门
+     * */
+    List<DeptEntity> getAllChildrenDept(Long deptId) throws AppException;
+
 
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java

@@ -255,5 +255,10 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
         return Rest.ok();
     }
 
+    @Override
+    public List<DeptEntity> getAllChildrenDept(Long deptId) throws AppException {
+        return dao.getAllChildrenDept(deptId);
+    }
+
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -95,7 +95,7 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
         int code = VALUE_RESULT_SUCCESS;
         try {
             DeptQuery deptQuery = new DeptQuery();
-            deptQuery.setOrderColList(Arrays.asList(new OrderCol("deptName")));
+            deptQuery.setOrderColList(Arrays.asList(new OrderCol("orderNum","desc")));
             List<DeptEntity> list = this.service.find(deptQuery);
             List<DeptTreeSelect> treeSelects = this.service.buildDeptTreeSelect(list);
             model.put("result", treeSelects);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffVo.java

@@ -32,4 +32,6 @@ public class StaffVo extends BaseEntityLong {
 
     private List<StaffInfoVo>staffInfoVos;
 
+    private List <Long> deptIdList;
+
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.SecurityUtil;
 import com.mortals.xhx.base.system.role.model.RoleUserQuery;
@@ -33,14 +34,12 @@ import com.mortals.xhx.module.staff.model.StaffQuery;
 import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
 import com.mortals.xhx.module.staff.service.StaffService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -263,4 +262,20 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
         System.out.println("1" + StrUtil.padPre("125", 7, "0"));
 
     }
+
+    @Override
+    protected StaffEntity findBefore(StaffEntity params, PageInfo pageInfo, Context context) throws AppException {
+        if(params.getDeptId()!=null){
+            List<DeptEntity> deptList = deptService.getAllChildrenDept(params.getDeptId());
+            if(CollectionUtils.isNotEmpty(deptList)){
+                List<Long> deptIdList = new ArrayList<>();
+                deptList.forEach(item -> {
+                    deptIdList.add(item.getId());
+                });
+                params.setDeptId(null);
+                params.setDeptIdList(deptIdList);
+            }
+        }
+        return params;
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceStaffStatMapperExt.xml

@@ -9,5 +9,7 @@
         where s.staffId=#{staffId}
         AND STR_TO_DATE(CONCAT(s.`year`,'-',s.`month`,'-',s.`day`),'%Y-%m-%d') <![CDATA[ >= ]]> STR_TO_DATE(#{summaryTimeStart},'%Y-%m-%d')
         AND STR_TO_DATE(CONCAT(s.`year`,'-',s.`month`,'-',s.`day`),'%Y-%m-%d') <![CDATA[ <= ]]> STR_TO_DATE(#{summaryTimeEnd},'%Y-%m-%d')
+
+
     </select>
 </mapper>
\ No newline at end of file

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceStatMapperExt.xml

@@ -5,6 +5,7 @@
     <select id="getListExt" parameterType="com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery" resultMap="AttendanceStatEntity-Map">
         SELECT * FROM (
         SELECT
+        s.id,
         s.staffId,
         s.staffName,
         s.deptId,
@@ -52,6 +53,12 @@
         <if test="staffName != null and staffName!=''"> AND s.staffName like #{staffName}</if>
         <if test="phoneNumer != null and phoneNumer!=''"> AND s.phoneNumer like #{phoneNumer}</if>
         <if test="deptId != null and deptId!=''"> AND s.deptId = #{deptId}</if>
+        <if test="idList != null and idList.size>0">
+            and s.id in
+            <foreach collection="idList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY
         s.staffId,
         s.staffName,
@@ -64,6 +71,7 @@
     <select id="getListCountExt" parameterType="com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery" resultType="int">
         SELECT count(1) FROM (
         SELECT
+        s.id,
         s.staffId,
         s.staffName,
         s.deptId,

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceSummaryMapper.xml

@@ -39,6 +39,8 @@
         FROM
             mortals_xhx_staff s
         LEFT JOIN mortals_xhx_attendance_vacation_balance b ON s.id = b.staffId
+        WHERE 1=1
+        <if test="staffId != null and staffId!=''"> AND s.id = #{staffId}</if>
     </select>
 
     <!-- 汇总当前日期请假情况 -->
@@ -60,6 +62,7 @@
             AND processStatus = 2
             AND STR_TO_DATE(date_format(startTime,'%Y-%m-%d'),'%Y-%m-%d')  <![CDATA[ <= ]]> STR_TO_DATE(#{summaryTime},'%Y-%m-%d')
             AND STR_TO_DATE(date_format(endTime,'%Y-%m-%d'),'%Y-%m-%d')  <![CDATA[ >= ]]> STR_TO_DATE(#{summaryTime},'%Y-%m-%d')
+        <if test="staffId != null and staffId!=''"> AND leavePersonId = #{staffId}</if>
         GROUP BY leavePersonId,leavePerson,leaveType
 
     </select>
@@ -83,6 +86,7 @@
             and processResult != 4
             and e.errorDateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{summaryTime},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
             and e.errorDateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{summaryTime},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        <if test="staffId != null and staffId!=''"> AND e.staffId = #{staffId}</if>
         group by
             e.staffId,
             e.staffName

attendance-performance-manager/src/main/resources/sqlmap/module/dept/DeptMapperExt.xml

@@ -12,4 +12,20 @@
     <select id="queryDeptParentId" resultType="integer">
         select parentId from mortals_xhx_dept where deptId = #{deptId}
     </select>
+    <!--查询所有子部门-->
+    <select id="getAllChildrenDept" resultType="com.mortals.xhx.module.dept.model.DeptEntity">
+        SELECT * FROM (
+            SELECT id, parentId, deptName,deptCode,deptStatus FROM mortals_xhx_dept  WHERE id = #{deptId}
+            UNION ALL
+            SELECT i.id, i.parentId, i.deptName,i.deptCode,i.deptStatus
+            FROM mortals_xhx_dept  i
+            INNER JOIN (
+                SELECT * FROM (
+                    SELECT id, parentId, deptName,deptCode,deptStatus FROM mortals_xhx_dept  WHERE id = #{deptId}
+                    UNION ALL
+                    SELECT id, parentId, deptName,deptCode,deptStatus FROM mortals_xhx_dept WHERE parentId = #{deptId}
+                ) t1
+            ) t2 ON i.parentId = t2.id
+        ) t3
+    </select>
 </mapper>
\ No newline at end of file

common-lib/src/main/java/com/mortals/xhx/common/keys/RedisCacheKeys.java

@@ -23,4 +23,8 @@ public final class RedisCacheKeys {
         return "hik:export:lock";
     }
 
+    public static String getRecordExportLockKey() {
+        return "record:export:lock";
+    }
+
 }