绩效核查汇总sql修改

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

@@ -82,4 +82,9 @@ public class CheckAllRecordVo extends BaseEntityLong {
 
     private Date createTime;
 
+    /**
+     * 审核状态(1.同意,2.不同意)
+     */
+    private Integer auditStatus;
+
 }

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_attend_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>
@@ -30,12 +30,12 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
         FROM
         mortals_xhx_check_attend_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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(checkTime,'%Y-%m-%d');
+        staffId,staffName,workNum,deptId,deptName,DATE_FORMAT(checkTime,'%Y-%m-%d')
     </select>
 
     <!-- 部门绩效统计 -->
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
         FROM
         mortals_xhx_check_attend_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_complain_record
-        WHERE checkStatus = 2
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
         FROM
         mortals_xhx_check_complain_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as complainScoreSub
         FROM
         mortals_xhx_check_complain_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_effect_record
-        WHERE checkStatus = 2
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
         FROM
         mortals_xhx_check_effect_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as effectScoreSub
         FROM
         mortals_xhx_check_effect_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_gowork_record
-        WHERE checkStatus = 2
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as attendScoreSub
         FROM
         mortals_xhx_check_gowork_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as goworkScoreSub
         FROM
         mortals_xhx_check_gowork_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_other_record
-        WHERE checkStatus = 2
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
         FROM
         mortals_xhx_check_other_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as otherScoreSub
         FROM
         mortals_xhx_check_other_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>

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

@@ -11,7 +11,7 @@
             SUM(CASE subAddType WHEN 1 THEN score ELSE score*-1 END) as sumScore
         FROM
             mortals_xhx_check_review_record
-        WHERE checkStatus = 2
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>
@@ -30,7 +30,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
         FROM
         mortals_xhx_check_review_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>
@@ -49,7 +49,7 @@
         SUM(CASE subAddType WHEN 2 THEN score ELSE 0 END) as reviewScoreSub
         FROM
         mortals_xhx_check_review_record
-        WHERE checkStatus = 2 and checkResult = 1
+        WHERE checkStatus = 2 and auditStatus = 1
         <if test="staffId != null and staffId!=''"> AND staffId = #{staffId} </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>