tt

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

@@ -9,7 +9,7 @@
 			LEFT JOIN check_task ct ON ct.id = t.task_id
 			WHERE 1=1 and ct.check_status!=22
 			<if test="start_date!=null and end_date != null">
-		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt;= #{end_date}
+		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt; #{end_date}
 			</if>
 			<if test="dept_id!=null">
 				AND t.checked_dept =#{dept_id}			
@@ -22,7 +22,7 @@
    
     SELECT * from check_task a LEFT JOIN check_score b on a.id=b.task_id where
           a.monitor_user_id != -1 and a.monitor_user_id != 0 and 
-       a.start_time &gt;= #{start_time} and a.end_time &lt;= #{end_time} and a.check_status !=22
+       a.start_time &gt;= #{start_time} and a.end_time &lt; #{end_time} and a.check_status !=22
     
     
     </select>
@@ -112,7 +112,7 @@
 					AND t.start_time >= #{start_date}
 				</if>
 				<if test="end_date !=null">
-					AND t.end_time &lt;= #{end_date}
+					AND t.end_time &lt; #{end_date}
 				</if>
 				<if test="mth!=null and mth!=''">
 					AND monthfunc (t.start_time) =#{mth}
@@ -136,7 +136,7 @@
 				AND t.start_time >= #{start_date}
 			</if>
 			<if test="end_date !=null">
-				AND t.end_time &lt;= #{end_date}
+				AND t.end_time &lt; #{end_date}
 			</if>
 			<if test="mth!=null and mth!=''">
 				AND monthfunc (t.start_time) =#{mth}
@@ -238,10 +238,10 @@
 					AND t.start_time >= #{start_date}
 				</if>
 				<if test="end_date !=null">
-					AND t.end_time &lt;= #{end_date}
+					AND t.end_time &lt; #{end_date}
 				</if>
 				<if test="user_id !=null ">
-					AND t.checked_person = #{user_id}
+					AND m.checked_person = #{user_id}
 				</if>
 				GROUP BY mth
 			) checked_score_t
@@ -260,7 +260,7 @@
 				AND t.start_time >= #{start_date}
 			</if>
 			<if test="end_date !=null">
-				AND t.end_time &lt;= #{end_date}
+				AND t.end_time &lt; #{end_date}
 			</if>
 			<if test="user_id !=null ">
 				AND t.checked_person = #{user_id}
@@ -289,7 +289,7 @@
 				AND  t.start_time >= #{start_date}
 			</if>
 			<if test="end_date !=null">
-				AND t.end_time &lt;= #{end_date}
+				AND t.end_time &lt; #{end_date}
 			</if>
 		GROUP BY m.parent_id
      
@@ -308,13 +308,13 @@
      			AND  t.checkman = #{user_id}
      		</if>
      		<if test="start_date !=null and end_date !=null and queryType ==1">
-     			AND t.check_time >= #{start_date} AND t.check_time &lt;= #{end_date}
+     			AND t.check_time >= #{start_date} AND t.check_time &lt; #{end_date}
      		</if>
      		<if test="start_date !=null and queryType == 0">
 				AND  t.start_time >= #{start_date}
 			</if>
 			<if test="end_date !=null and queryType == 0">
-				AND t.end_time &lt;= #{end_date}
+				AND t.end_time &lt; #{end_date}
 			</if>
 			<if test="score_flag!=null and score_flag == 1">
 				AND cs.check_item_score IS NOT NULL  
@@ -346,7 +346,7 @@
 					AND  t.check_time >= #{start_date}
 				</if>
 				<if test="end_date !=null">
-					AND t.check_time &lt;= #{end_date}
+					AND t.check_time &lt; #{end_date}
 				</if>
     </select>
     
@@ -356,7 +356,7 @@
    			AND t.start_time >= #{start_time}
    		</if>
    		<if test="end_time!=null">
-   			AND t.end_time &lt;= #{end_time}
+   			AND t.end_time &lt; #{end_time}
    		</if>
    		<if test="dept_list!=null and dept_list.size()>0 ">
     		AND	t.dept_id IN
@@ -449,7 +449,7 @@
 	   			AND t.appeal_time >= #{start_time}
 	   		</if>
 	   		<if test="end_time!=null ">
-	   			AND t.appeal_time &lt;= #{end_time}
+	   			AND t.appeal_time &lt; #{end_time}
 	   		</if>
 	   		<if test="dept_list!=null and dept_list.size()>0 ">
 	    		AND	t.appeal_dept IN