feat(property): 完善考勤统计功能并优化数据查询

- 重构AttendanceRecordMapper.xml查询逻辑，新增多维度统计查询 - 添加打卡统计相关DAO方法实现数据访问层功能 - 新增QueryAttendanceStatsCmd命令类处理考勤统计业务逻辑 - 优化QueryTodayAttendanceDetailCmd添加地址信息展示 - 移除pom.xml中的时间戳构建配置项

feat(property): 完善考勤统计功能并优化数据查询
- 重构AttendanceRecordMapper.xml查询逻辑，新增多维度统计查询 - 添加打卡统计相关DAO方法实现数据访问层功能 - 新增QueryAttendanceStatsCmd命令类处理考勤统计业务逻辑 - 优化QueryTodayAttendanceDetailCmd添加地址信息展示 - 移除pom.xml中的时间戳构建配置项
王彪总
1 parent 2527b568
Showing 7 changed files with 359 additions and 9 deletions
pom.xml
service-user/src/main/java/com/java110/user/cmd/property/QueryAttendanceStatsCmd.java
service-user/src/main/java/com/java110/user/cmd/property/QueryTodayAttendanceDetailCmd.java
service-user/src/main/java/com/java110/user/dao/impl/AttendanceRecordV1ServiceDaoImpl.java
service-user/src/main/java/com/java110/user/dao/property/IAttendanceRecordV1ServiceDao.java
service-user/src/main/resources/mapper/property/AttendanceRecordMapper.xml
springboot/src/main/java/com/java110/boot/BootApplicationStart.java
@@ -564,7 +564,6 @@
     </dependencies>
     <build>
-        <finalName>${project.artifactId}-${maven.build.timestamp}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.user.cmd.property;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.user.dao.property.IAttendanceRecordV1ServiceDao;
+import com.java110.utils.exception.CmdException;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.text.ParseException;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+@Java110Cmd(serviceCode = "property.queryAttendanceStats")
+public class QueryAttendanceStatsCmd extends Cmd {
+
+    @Autowired
+    private IAttendanceRecordV1ServiceDao attendanceRecordV1ServiceDao;
+
+    private static final DateTimeFormatter DATE_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        String startTime = reqJson.getString("startTime");
+        String endTime = reqJson.getString("endTime");
+        if (startTime == null || startTime.isEmpty()) {
+            throw new CmdException("开始时间不能为空");
+        }
+        if (endTime == null || endTime.isEmpty()) {
+            throw new CmdException("结束时间不能为空");
+        }
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        String storeId = CmdContextUtils.getStoreId(context);
+        String storeTypeCd = CmdContextUtils.getStoreTypeCd(context);
+
+        Map params = buildQueryParams(reqJson, storeId);
+        String startTime = (String) params.get("startTime");
+        String endTime = (String) params.get("endTime");
+
+        // 1. 按用户聚合统计（u_user 主表，LEFT JOIN 打卡记录，含无打卡员工）
+        List<Map> userStatsList = attendanceRecordV1ServiceDao.queryAttendanceStats(params);
+
+        // 2. 异常打卡明细（SQL 直接检测：有上班无下班 / 有下班无上班）
+        List<Map> anomalyRecords = attendanceRecordV1ServiceDao.queryAttendanceRecordsForStats(params);
+
+        // 3. 应出勤天数（查询时间范围内的总天数，按月即自然月）
+        int totalWorkdays = countDays(startTime, endTime);
+
+        // 4. 按 user_id 汇总异常
+        Map<String, List<Map>> anomalyMap = new HashMap<>();
+        for (Map a : anomalyRecords) {
+            String uid = (String) a.get("user_id");
+            anomalyMap.putIfAbsent(uid, new ArrayList<>());
+            Map detail = new HashMap();
+            detail.put("date", a.get("punch_date"));
+            detail.put("type", a.get("lack_desc"));
+            anomalyMap.get(uid).add(detail);
+        }
+
+        // 5. 组装结果
+        List<Map> resultList = new ArrayList<>();
+        int totalShouldDays = 0, totalActualDays = 0, totalPunches = 0;
+        int totalAnomalyDays = 0, totalAbsenceDays = 0;
+
+        for (Map stat : userStatsList) {
+            String userId = (String) stat.get("user_id");
+            int actualDays = parseInt(stat.get("actual_days"));
+            int shouldDays = totalWorkdays;
+
+            List<Map> userAnomalies = anomalyMap.getOrDefault(userId, new ArrayList<>());
+            int anomalyCount = userAnomalies.size();
+            int absenceCount = Math.max(0, shouldDays - actualDays);
+
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < userAnomalies.size(); i++) {
+                if (i > 0) sb.append("；");
+                Map an = userAnomalies.get(i);
+                sb.append(an.get("date")).append(" ").append(an.get("type"));
+            }
+
+            Map result = new HashMap();
+            result.put("userId", userId);
+            result.put("userName", stat.getOrDefault("user_name", ""));
+            result.put("address", stat.getOrDefault("address", ""));
+            result.put("shouldDays", shouldDays);
+            result.put("actualDays", actualDays);
+            result.put("totalPunches", parseInt(stat.get("total_punches")));
+            result.put("onPunches", parseInt(stat.get("on_punches")));
+            result.put("offPunches", parseInt(stat.get("off_punches")));
+            result.put("anomalyDays", anomalyCount);
+            result.put("anomalyDetail", sb.toString());
+            result.put("absenceDays", absenceCount);
+
+            resultList.add(result);
+
+            totalShouldDays += shouldDays;
+            totalActualDays += actualDays;
+            totalPunches += parseInt(stat.get("total_punches"));
+            totalAnomalyDays += anomalyCount;
+            totalAbsenceDays += absenceCount;
+        }
+
+        // 6. 每日趋势
+        List<Map> dailyStats = attendanceRecordV1ServiceDao.queryDailyAttendanceStats(params);
+
+        // 7. 汇总卡片
+        Map summary = new HashMap();
+        summary.put("totalUsers", userStatsList.size());
+        summary.put("totalShouldDays", totalShouldDays);
+        summary.put("totalActualDays", totalActualDays);
+        summary.put("totalPunches", totalPunches);
+        summary.put("totalAnomalyDays", totalAnomalyDays);
+        summary.put("totalAbsenceDays", totalAbsenceDays);
+        summary.put("totalWorkdays", totalWorkdays);
+
+        // 8. 项目维度（仅物业）
+        List<Map> projectStats = new ArrayList<>();
+        if ("800900000003".equals(storeTypeCd)) {
+            projectStats = attendanceRecordV1ServiceDao.queryProjectAttendanceStats(params);
+        }
+
+        Map response = new HashMap();
+        response.put("summary", summary);
+        response.put("dailyStats", dailyStats);
+        response.put("userStats", resultList);
+        response.put("projectStats", projectStats);
+        response.put("total", resultList.size());
+
+        context.setResponseEntity(ResultVo.createResponseEntity(resultList.size(), resultList.size(), response));
+    }
+
+    private Map buildQueryParams(JSONObject reqJson, String storeId) {
+        Map params = new HashMap<>();
+        params.put("startTime", reqJson.getString("startTime"));
+        params.put("endTime", reqJson.getString("endTime"));
+        if (reqJson.containsKey("filterUserId") && !reqJson.getString("filterUserId").isEmpty()) {
+            params.put("userId", reqJson.getString("filterUserId"));
+        }
+        if (storeId != null && !storeId.isEmpty()) {
+            params.put("storeId", storeId);
+        }
+        return params;
+    }
+
+    private int countDays(String startTime, String endTime) {
+        try {
+            String sd = startTime.length() >= 10 ? startTime.substring(0, 10) : startTime;
+            String ed = endTime.length() >= 10 ? endTime.substring(0, 10) : endTime;
+            LocalDate start = LocalDate.parse(sd, DATE_FMT);
+            LocalDate end = LocalDate.parse(ed, DATE_FMT);
+            return (int) java.time.temporal.ChronoUnit.DAYS.between(start, end) + 1;
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    private int parseInt(Object value) {
+        if (value == null) return 0;
+        if (value instanceof Integer) return (Integer) value;
+        if (value instanceof Long) return ((Long) value).intValue();
+        if (value instanceof java.math.BigDecimal) return ((java.math.BigDecimal) value).intValue();
+        if (value instanceof Double) return ((Double) value).intValue();
+        if (value instanceof String) {
+            try { return Integer.parseInt((String) value); } catch (NumberFormatException e) { return 0; }
+        }
+        return 0;
+    }
+}
@@ -52,10 +52,13 @@ public class QueryTodayAttendanceDetailCmd extends Cmd {
             if ("OFF".equals(type)) pd.put("offTime", r.get("punch_time"));
         }
-        // 4. 构建全系统员工→store映射
+        // 4. 构建全系统员工→store/address映射
         Map<String, String> userStoreMap = new HashMap<>();
+        Map<String, String> userAddressMap = new HashMap<>();
         for (Map u : allUsers) {
-            userStoreMap.put((String) u.get("user_id"), (String) u.get("store_name"));
+            String uid = (String) u.get("user_id");
+            userStoreMap.put(uid, (String) u.get("store_name"));
+            userAddressMap.put(uid, u.get("address") != null ? (String) u.get("address") : "");
         }
         // 5. 构建结果
@@ -65,6 +68,7 @@ public class QueryTodayAttendanceDetailCmd extends Cmd {
         for (Map.Entry<String, Map> e : punchMap.entrySet()) {
             Map data = e.getValue();
             data.put("storeName", userStoreMap.getOrDefault(e.getKey(), ""));
+            data.put("address", userAddressMap.getOrDefault(e.getKey(), ""));
             result.add(buildTask(data));
             seen.add(e.getKey());
         }
@@ -76,6 +80,7 @@ public class QueryTodayAttendanceDetailCmd extends Cmd {
                 m.put("staffId", uid);
                 m.put("staffName", u.get("user_name"));
                 m.put("storeName", u.get("store_name"));
+                m.put("address", u.get("address") != null ? u.get("address") : "");
                 m.put("onTime", null);
                 m.put("offTime", null);
                 result.add(buildTask(m));
@@ -91,6 +96,7 @@ public class QueryTodayAttendanceDetailCmd extends Cmd {
         task.put("staffId", data.get("staffId"));
         task.put("staffName", data.getOrDefault("staffName", ""));
         task.put("storeName", data.getOrDefault("storeName", ""));
+        task.put("address", data.getOrDefault("address", ""));
         boolean hasOn = data.get("onTime") != null;
         task.put("state", hasOn ? "30000" : "10000");
@@ -53,4 +53,39 @@ public class AttendanceRecordV1ServiceDaoImpl extends BaseServiceDao implements 
     public List<Map> queryAllAttendanceUsers(Map params) {
         return sqlSessionTemplate.selectList("AttendanceRecordV1ServiceDaoImpl.queryAllAttendanceUsers", params);
     }
+
+    @Override
+    public List<Map> queryAttendanceStats(Map params) {
+        return sqlSessionTemplate.selectList("AttendanceRecordV1ServiceDaoImpl.queryAttendanceStats", params);
+    }
+
+    @Override
+    public int queryAttendanceStatsCount(Map params) {
+        List<Map> result = sqlSessionTemplate.selectList("AttendanceRecordV1ServiceDaoImpl.queryAttendanceStatsCount", params);
+        if (result == null || result.isEmpty()) return 0;
+        Object count = result.get(0).get("count");
+        if (count instanceof Integer) return (Integer) count;
+        if (count instanceof Long) return ((Long) count).intValue();
+        return Integer.parseInt(count.toString());
+    }
+
+    @Override
+    public List<Map> queryDailyAttendanceStats(Map params) {
+        return sqlSessionTemplate.selectList("AttendanceRecordV1ServiceDaoImpl.queryDailyAttendanceStats", params);
+    }
+
+    @Override
+    public List<Map> queryAttendanceRecordsForStats(Map params) {
+        return sqlSessionTemplate.selectList("AttendanceRecordV1ServiceDaoImpl.queryAttendanceRecordsForStats", params);
+    }
+
+    @Override
+    public List<Map> queryProjectAttendanceStats(Map params) {
+        return sqlSessionTemplate.selectList("AttendanceRecordV1ServiceDaoImpl.queryProjectAttendanceStats", params);
+    }
+
+    @Override
+    public List<Map> queryScheduleWorkdays(Map params) {
+        return sqlSessionTemplate.selectList("AttendanceRecordV1ServiceDaoImpl.queryScheduleWorkdays", params);
+    }
 }
@@ -17,4 +17,17 @@ public interface IAttendanceRecordV1ServiceDao {
     /** 查询所有有打卡记录的用户列表 */
     List<Map> queryAllAttendanceUsers(Map params);
+
+    /** 打卡统计：按用户聚合 */
+    List<Map> queryAttendanceStats(Map params);
+    /** 打卡统计：用户数 */
+    int queryAttendanceStatsCount(Map params);
+    /** 打卡统计：每日出勤人数（图表用） */
+    List<Map> queryDailyAttendanceStats(Map params);
+    /** 打卡统计：时间范围内打卡记录明细（用于异常分析） */
+    List<Map> queryAttendanceRecordsForStats(Map params);
+    /** 打卡统计：项目维度聚合（物业端） */
+    List<Map> queryProjectAttendanceStats(Map params);
+    /** 打卡统计：查询员工排班工作日数 */
+    List<Map> queryScheduleWorkdays(Map params);
 }
@@ -52,12 +52,118 @@
     </select>
     <select id="queryAllAttendanceUsers" parameterType="map" resultType="map">
-        SELECT DISTINCT ar.user_id, ar.user_name, ar.work_type,
-               COALESCE(s.name, '未知') AS store_name
+        SELECT u.user_id, u.name AS user_name, u.address, '' AS work_type, '' AS store_name
+        FROM u_user u
+        WHERE u.status_cd = '0'
+        AND (u.level_cd = '00' OR u.level_cd = '01')
+        ORDER BY u.name
+    </select>
+
+    <!-- 打卡统计：按用户聚合（u_user 为主表，LEFT JOIN 打卡记录） -->
+    <select id="queryAttendanceStats" parameterType="map" resultType="map">
+        SELECT
+            u.user_id,
+            u.name AS user_name,
+            u.address,
+            COUNT(ar.id) AS total_punches,
+            IFNULL(SUM(CASE ar.punch_type WHEN 'ON' THEN 1 ELSE 0 END), 0) AS on_punches,
+            IFNULL(SUM(CASE ar.punch_type WHEN 'OFF' THEN 1 ELSE 0 END), 0) AS off_punches,
+            COUNT(DISTINCT DATE(ar.punch_time)) AS actual_days
+        FROM u_user u
+        <if test="storeId != null and storeId != ''">
+            INNER JOIN staff_community sc ON u.user_id = sc.staff_id AND sc.store_id = #{storeId} AND sc.status_cd = '0'
+        </if>
+        LEFT JOIN attendance_record ar
+            ON u.user_id = ar.user_id
+            AND ar.punch_time &gt;= #{startTime}
+            AND ar.punch_time &lt;= #{endTime}
+        WHERE u.status_cd != '1'
+        <if test="userId != null and userId != ''">AND u.user_id = #{userId}</if>
+        GROUP BY u.user_id, u.name, u.address
+        ORDER BY u.name
+    </select>
+
+    <!-- 打卡统计：用户数 -->
+    <select id="queryAttendanceStatsCount" parameterType="map" resultType="map">
+        SELECT COUNT(1) AS count
+        FROM u_user u
+        <if test="storeId != null and storeId != ''">
+            INNER JOIN staff_community sc ON u.user_id = sc.staff_id AND sc.store_id = #{storeId} AND sc.status_cd = '0'
+        </if>
+        WHERE u.status_cd != '1'
+        <if test="userId != null and userId != ''">AND u.user_id = #{userId}</if>
+    </select>
+
+    <!-- 打卡统计：每日出勤人数（图表用） -->
+    <select id="queryDailyAttendanceStats" parameterType="map" resultType="map">
+        SELECT
+            DATE(ar.punch_time) AS punch_date,
+            COUNT(DISTINCT ar.user_id) AS user_count,
+            COUNT(*) AS total_punches
         FROM attendance_record ar
-        LEFT JOIN s_store_user su ON ar.user_id = su.user_id AND su.status_cd = '0'
-        LEFT JOIN s_store s ON su.store_id = s.store_id AND s.status_cd = '0'
-        ORDER BY ar.user_name
+        WHERE ar.punch_time &gt;= #{startTime} AND ar.punch_time &lt;= #{endTime}
+        <if test="storeId != null and storeId != ''">
+            AND ar.user_id IN (SELECT DISTINCT staff_id FROM staff_community WHERE store_id = #{storeId} AND status_cd = '0')
+        </if>
+        GROUP BY DATE(ar.punch_time)
+        ORDER BY punch_date
+    </select>
+
+    <!-- 打卡统计：异常检测（有上班无下班 或 有下班无上班） -->
+    <select id="queryAttendanceRecordsForStats" parameterType="map" resultType="map">
+        SELECT
+            t1.user_id,
+            t1.punch_date,
+            CASE
+                WHEN t1.has_on = 1 AND t1.has_off = 0 THEN '有上班无下班'
+                WHEN t1.has_on = 0 AND t1.has_off = 1 THEN '有下班无上班'
+            END AS lack_desc
+        FROM (
+            SELECT
+                user_id,
+                DATE(punch_time) AS punch_date,
+                MAX(CASE punch_type WHEN 'ON' THEN 1 ELSE 0 END) AS has_on,
+                MAX(CASE punch_type WHEN 'OFF' THEN 1 ELSE 0 END) AS has_off
+            FROM attendance_record
+            WHERE punch_time &gt;= #{startTime} AND punch_time &lt;= #{endTime}
+            <if test="storeId != null and storeId != ''">
+                AND user_id IN (SELECT DISTINCT staff_id FROM staff_community WHERE store_id = #{storeId} AND status_cd = '0')
+            </if>
+            <if test="userId != null and userId != ''">AND user_id = #{userId}</if>
+            GROUP BY user_id, DATE(punch_time)
+        ) t1
+        HAVING lack_desc IS NOT NULL
+        ORDER BY t1.user_id, t1.punch_date
+    </select>
+
+    <!-- 打卡统计：项目维度聚合（物业端） -->
+    <select id="queryProjectAttendanceStats" parameterType="map" resultType="map">
+        SELECT
+            sc.community_id,
+            sc.community_name,
+            COUNT(DISTINCT ar.user_id) AS user_count,
+            COUNT(*) AS total_punches,
+            SUM(CASE WHEN ar.punch_type = 'ON' THEN 1 ELSE 0 END) AS on_punches,
+            SUM(CASE WHEN ar.punch_type = 'OFF' THEN 1 ELSE 0 END) AS off_punches,
+            COUNT(DISTINCT DATE(ar.punch_time)) AS total_actual_days
+        FROM staff_community sc
+        INNER JOIN attendance_record ar ON sc.staff_id = ar.user_id AND sc.status_cd = '0'
+        WHERE ar.punch_time &gt;= #{startTime} AND ar.punch_time &lt;= #{endTime}
+        <if test="storeId != null and storeId != ''">AND sc.store_id = #{storeId}</if>
+        GROUP BY sc.community_id, sc.community_name
+        ORDER BY sc.community_name
+    </select>
+
+    <!-- 打卡统计：查询员工排班工作日数 -->
+    <select id="queryScheduleWorkdays" parameterType="map" resultType="map">
+        SELECT
+            scs.staff_id,
+            COUNT(DISTINCT CONCAT(scd.day, '_', scd.week_flag)) AS schedule_days
+        FROM schedule_classes_staff scs
+        INNER JOIN schedule_classes_day scd ON scs.schedule_id = scd.schedule_id AND scd.status_cd = '0'
+        WHERE scs.status_cd = '0'
+        <if test="staffId != null and staffId != ''">AND scs.staff_id = #{staffId}</if>
+        GROUP BY scs.staff_id
     </select>
 </mapper>
@@ -263,4 +263,4 @@ public class BootApplicationStart {
         }
     }
-}
 \ No newline at end of file
+}