回退：绩效核查汇总时由核查时间汇总改为发生时间汇总

76c4154f · 廖旭伟 · 8570e55c · 76c4154f · 76c4154f · 76c4154f
Commit 76c4154f authored Nov 24, 2023 by 廖旭伟
6 changed files
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapperExt.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapperExt.xml
@@ -6,54 +6,54 @@
    <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
        SELECT
            staffId,staffName,workNum,deptId,deptName,
-            ANY_VALUE(DATE_FORMAT(errorTime,'%Y')) as `year`,
-            ANY_VALUE(DATE_FORMAT(errorTime,'%m')) as `month`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
            SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
        FROM
            mortals_xhx_check_attend_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND errorTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND errorTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(errorTime,'%Y-%m')
+            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
    </select>

    <!-- 个人绩效统计 -->
    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
        SELECT
        staffId,staffName,workNum,deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(errorTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(errorTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(errorTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as attendScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
        FROM
        mortals_xhx_check_attend_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND errorTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND errorTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(errorTime,'%Y-%m-%d')
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d')
    </select>

    <!-- 部门绩效统计 -->
    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
        SELECT
        deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(errorTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(errorTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(errorTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as attendScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
        FROM
        mortals_xhx_check_attend_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND errorTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND errorTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        deptId,deptName,DATE_FORMAT(errorTime,'%Y-%m-%d');
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
    </select>
 </mapper>
\ No newline at end of file
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckComplainRecordMapperExt.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckComplainRecordMapperExt.xml
@@ -6,54 +6,54 @@
    <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
        SELECT
            staffId,staffName,workNum,deptId,deptName,
-            ANY_VALUE(DATE_FORMAT(complainTime,'%Y')) as `year`,
-            ANY_VALUE(DATE_FORMAT(complainTime,'%m')) as `month`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
            SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
        FROM
            mortals_xhx_check_complain_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND complainTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND complainTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(complainTime,'%Y-%m')
+            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
    </select>

    <!-- 个人绩效统计 -->
    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
        SELECT
        staffId,staffName,workNum,deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(complainTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(complainTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(complainTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as complainScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
        FROM
        mortals_xhx_check_complain_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND complainTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND complainTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(complainTime,'%Y-%m-%d');
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
    </select>

    <!-- 部门绩效统计 -->
    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
        SELECT
        deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(complainTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(complainTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(complainTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as complainScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
        FROM
        mortals_xhx_check_complain_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND complainTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND complainTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        deptId,deptName,DATE_FORMAT(complainTime,'%Y-%m-%d');
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
    </select>
 </mapper>
\ No newline at end of file
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckEffectRecordMapperExt.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckEffectRecordMapperExt.xml
@@ -6,54 +6,54 @@
    <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
        SELECT
            staffId,staffName,workNum,deptId,deptName,
-            ANY_VALUE(DATE_FORMAT(happenTime,'%Y')) as `year`,
-            ANY_VALUE(DATE_FORMAT(happenTime,'%m')) as `month`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
            SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
        FROM
            mortals_xhx_check_effect_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND happenTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND happenTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(happenTime,'%Y-%m')
+            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
    </select>

    <!-- 个人绩效统计 -->
    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
        SELECT
        staffId,staffName,workNum,deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as effectScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
        FROM
        mortals_xhx_check_effect_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND happenTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND happenTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(happenTime,'%Y-%m-%d');
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
    </select>

    <!-- 部门绩效统计 -->
    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
        SELECT
        deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as effectScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
        FROM
        mortals_xhx_check_effect_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND happenTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND happenTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        deptId,deptName,DATE_FORMAT(happenTime,'%Y-%m-%d');
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
    </select>
 </mapper>
\ No newline at end of file
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapperExt.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapperExt.xml
@@ -6,54 +6,54 @@
    <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
        SELECT
            staffId,staffName,workNum,deptId,deptName,
-            ANY_VALUE(DATE_FORMAT(goworkTime,'%Y')) as `year`,
-            ANY_VALUE(DATE_FORMAT(goworkTime,'%m')) as `month`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
            SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
        FROM
            mortals_xhx_check_gowork_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND goworkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND goworkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(goworkTime,'%Y-%m')
+            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
    </select>

    <!-- 个人绩效统计 -->
    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
        SELECT
        staffId,staffName,workNum,deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(goworkTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(goworkTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(goworkTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as goworkScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as goworkScoreSub
        FROM
        mortals_xhx_check_gowork_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND goworkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND goworkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(goworkTime,'%Y-%m-%d');
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
    </select>

    <!-- 部门绩效统计 -->
    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
        SELECT
        deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(goworkTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(goworkTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(goworkTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as goworkScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as goworkScoreSub
        FROM
        mortals_xhx_check_gowork_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND goworkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND goworkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        deptId,deptName,DATE_FORMAT(goworkTime,'%Y-%m-%d');
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
    </select>
 </mapper>
\ No newline at end of file
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckOtherRecordMapperExt.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckOtherRecordMapperExt.xml
@@ -6,54 +6,54 @@
    <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
        SELECT
            staffId,staffName,workNum,deptId,deptName,
-            ANY_VALUE(DATE_FORMAT(happenTime,'%Y')) as `year`,
-            ANY_VALUE(DATE_FORMAT(happenTime,'%m')) as `month`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
            SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
        FROM
            mortals_xhx_check_other_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND happenTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND happenTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(happenTime,'%Y-%m')
+            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
    </select>

    <!-- 个人绩效统计 -->
    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
        SELECT
        staffId,staffName,workNum,deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as otherScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
        FROM
        mortals_xhx_check_other_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND happenTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND happenTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(happenTime,'%Y-%m-%d');
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
    </select>

    <!-- 部门绩效统计 -->
    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
        SELECT
        deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(happenTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as otherScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
        FROM
        mortals_xhx_check_other_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND happenTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND happenTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        deptId,deptName,DATE_FORMAT(happenTime,'%Y-%m-%d');
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
    </select>
 </mapper>
\ No newline at end of file
--- a/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckReviewRecordMapperExt.xml
+++ b/attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckReviewRecordMapperExt.xml
@@ -6,54 +6,54 @@
    <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
        SELECT
            staffId,staffName,workNum,deptId,deptName,
-            ANY_VALUE(DATE_FORMAT(reviewTime,'%Y')) as `year`,
-            ANY_VALUE(DATE_FORMAT(reviewTime,'%m')) as `month`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+            ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
            SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
        FROM
            mortals_xhx_check_review_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND reviewTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND reviewTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(reviewTime,'%Y-%m')
+            staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m')
    </select>

    <!-- 个人绩效统计 -->
    <select id="getStaffPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.staff.model.StaffPerformStatEntity">
        SELECT
        staffId,staffName,workNum,deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(reviewTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(reviewTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(reviewTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as reviewScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
        FROM
        mortals_xhx_check_review_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND reviewTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND reviewTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(reviewTime,'%Y-%m-%d');
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
    </select>

    <!-- 部门绩效统计 -->
    <select id="getDeptPerformStat" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
        SELECT
        deptId,deptName,
-        ANY_VALUE(DATE_FORMAT(reviewTime,'%Y')) as `year`,
-        ANY_VALUE(DATE_FORMAT(reviewTime,'%m')) as `month`,
-        ANY_VALUE(DATE_FORMAT(reviewTime,'%d')) as `day`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%Y')) as `year`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%m')) as `month`,
+        ANY_VALUE(DATE_FORMAT(checkTime,'%d')) as `day`,
        SUM(CASE subAddType WHEN 1 THEN score ELSE 0 END) as reviewScoreAdd,
        SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
        FROM
        mortals_xhx_check_review_record
        WHERE checkStatus = 2 and auditStatus = 1
        <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </if>
-        <if test="checkTimeStart != null and checkTimeStart!=''"> AND reviewTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
-        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND reviewTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeStart != null and checkTimeStart!=''"> AND checkTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{checkTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') </if>
+        <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
        GROUP BY
-        deptId,deptName,DATE_FORMAT(reviewTime,'%Y-%m-%d');
+        deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d');
    </select>
 </mapper>
\ No newline at end of file