ss

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/CheckmanStatisticsBean.java

@@ -29,6 +29,9 @@ public class CheckmanStatisticsBean {
     
     private Integer all_checked_num;
     
+    // 扣分次数
+    private Integer checked_num ;
+    
     //开始日期
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -305,10 +305,10 @@
 				AND t.end_time <= #{end_date}
 			</if>
 			<if test="score_flag!=null and score_flag == 1">
-				AND cs.score IS NOT NULL
+				AND cs.check_item_score IS NOT NULL
 			</if>
 			<if test="score_flag!=null and score_flag == 0">
-				AND cs.score IS  NULL
+				AND cs.check_item_score IS  NULL
 			</if>
      </select>
      
@@ -316,6 +316,7 @@
     	SELECT
 			COUNT(1) AS all_checkman,
 			COUNT(1) AS all_task_num,
+			COUNT(cs.check_item_score) AS checked_num ,
 			sum(
 				TIMESTAMPDIFF(MINUTE, t.start_time,t.end_time)
 			) AS all_check_minute,