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

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckResultAddEnum.java

@@ -9,8 +9,8 @@ import java.util.Map;
 * @author zxfei
 */
 public enum CheckResultAddEnum {
-    核查加分("核查加分", "核查加分"),
-    核查不加分("核查不加分", "核查不加分");
+    核查加分("1", "核查加分"),
+    核查不加分("2", "核查不加分");
     private String value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckResultEnum.java

@@ -9,8 +9,8 @@ import java.util.Map;
 * @author zxfei
 */
 public enum CheckResultEnum {
-    加分或扣分("加分或扣分", "加分或扣分"),
-    不扣分("不扣分", "不扣分");
+    加分或扣分("1", "加分或扣分"),
+    不扣分("2", "不加分或不扣分");
     private String value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckResultSubEnum.java

@@ -9,8 +9,8 @@ import java.util.Map;
 * @author zxfei
 */
 public enum CheckResultSubEnum {
-    核查扣分("核查扣分", "核查扣分"),
-    核查不扣分("核查不扣分", "核查不扣分");
+    核查扣分("1", "核查扣分"),
+    核查不扣分("2", "核查不扣分");
     private String value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java

@@ -145,6 +145,7 @@ public class DingMessageController {
                                 attendanceVacationBalanceEntity.setEntryTime(staffEntity.getEntryDate());
 
                                 if(result.getTasks().size() >0 ){
+                                    if(result.getTasks().get(0).getCreateTime() != null && result.getTasks().get(0).getFinishTime() != null){
                                         Date startTime = dateFormat(result.getTasks().get(0).getCreateTime(),"yyyy-MM-dd'T'HH:mm'Z'");
 
                                         Date endTime = dateFormat(result.getTasks().get(0).getFinishTime(),"yyyy-MM-dd'T'HH:mm'Z'");
@@ -152,6 +153,7 @@ public class DingMessageController {
                                         leaveRecordEntity.setEndTime(endTime);
                                         leaveRecordEntity.setDuration((int) ((endTime.getTime() - startTime.getTime())/1000));
                                     }
+                                }
 
                                 String leave_code = LeaveRulesEnum.事假.getLeave_code();
                                 String leave_name = "事假";
@@ -239,7 +241,7 @@ public class DingMessageController {
                                                 break;
                                             case "探亲假":
                                                 leaveRecordEntity.setLeaveType(21);
-                                                leave_code = LeaveRulesEnum.年假.getLeave_code();
+                                                leave_code = LeaveRulesEnum.探亲假.getLeave_code();
                                                 break;
                                             default:
                                                 leaveRecordEntity.setLeaveType(1);  //默认事假

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

@@ -164,48 +164,48 @@
     <select id="getScoreSummary" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.CheckAllScoreSummaryVo">
         SELECT sum(0-a.initScore) AS initScore,sum(0-a.checkScore) AS checkScore,sum(a.appealScore) AS appealScore,sum(0-a.checkScore-a.appealScore) AS total FROM (
         SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) appealScore
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
         FROM mortals_xhx_check_attend_record WHERE 1=1
         <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>
         UNION
 
         SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) appealScore
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
         FROM mortals_xhx_check_effect_record WHERE 1=1
         <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>
         UNION
 
         SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) appealScore
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
         FROM mortals_xhx_check_complain_record WHERE 1=1
         <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>
 
         UNION
         SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) appealScore
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
         FROM mortals_xhx_check_gowork_record WHERE 1=1
         <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>
 
         UNION
         SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) appealScore
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
         FROM mortals_xhx_check_review_record WHERE 1=1
         <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>
 
         UNION
         SELECT sum(CASE subMethod WHEN 4 THEN 0 ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) as initScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) checkScore,
-        sum(CASE checkStatus WHEN 2 THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) appealScore
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN 0  ELSE (CASE subAddType WHEN 1 THEN score ELSE score*-1 END) END) ELSE 0 END) ELSE 0 END) checkScore,
+        sum(CASE checkStatus WHEN 2 THEN (CASE checkResult WHEN '1' THEN (CASE subMethod WHEN 4 THEN (CASE subAddType WHEN 1 THEN score ELSE score*-1 END)  ELSE 0 END) ELSE 0 END) ELSE 0 END) appealScore
         FROM mortals_xhx_check_other_record WHERE 1=1
         <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/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
+        WHERE checkStatus = 2 and checkResult = 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_attend_record
-        WHERE checkStatus = 2
+        WHERE checkStatus = 2 and checkResult = 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 attendScoreSub
         FROM
         mortals_xhx_check_attend_record
-        WHERE checkStatus = 2
+        WHERE checkStatus = 2 and checkResult = 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

@@ -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
+        WHERE checkStatus = 2 and checkResult = 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
+        WHERE checkStatus = 2 and checkResult = 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

@@ -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
+        WHERE checkStatus = 2 and checkResult = 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
+        WHERE checkStatus = 2 and checkResult = 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

@@ -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
+        WHERE checkStatus = 2 and checkResult = 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
+        WHERE checkStatus = 2 and checkResult = 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

@@ -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
+        WHERE checkStatus = 2 and checkResult = 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
+        WHERE checkStatus = 2 and checkResult = 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

@@ -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
+        WHERE checkStatus = 2 and checkResult = 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
+        WHERE checkStatus = 2 and checkResult = 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>