修改bug

VisualInspection/js/config.js

@@ -15,8 +15,8 @@ function getserveraddr() {
     if (base_ui_url.indexOf("jsjtyxt.com") != -1) {
         return "http://server_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
-        return "http://10.112.0.199:7001/"
-            //  return "http://localhost:8089/"
+        // return "http://10.112.0.199:7001/"
+             return "http://localhost:8089/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
     } else {

VisualInspection/js/mytask/check.js

@@ -741,7 +741,7 @@ function zTreeOnClick(event, treeId, treeNode) {
         'check_item_score': treeNode.score,
         'content': treeNode.value,
         'check_item_id': treeNode.id,
-        'checkman': treeNode.id,
+        'checkman': $.checkTask.checkman,
         'checked_person': $.checkTask.checked_person,
         'checked_dept': $.checkTask.checked_dept
     };

VisualInspection/js/statistics/assess_ranking.js

@@ -35,6 +35,9 @@ function queryEmpClick(){
     var startStr = start_date.replace(/-/g, '/');
     var endStr = end_date.replace(/-/g, '/');
     var start = new Date(startStr);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var end = new Date(endStr);
     if(start>end){
         tip("开始时间不能比结束时间大");
@@ -66,6 +69,10 @@ function initQueryEmp(){
     var start_date = start_time+" 23:00:00"; 
     var end_date = end_time+" 23:00:00"; 
 
+    var start = new Date(start_date);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var param = {
         "start_date": start_date,
         "end_date": end_date,
@@ -223,6 +230,7 @@ function exportExcel(){
         start_date += " 23:00:00";
         end_date += " 23:00:00";
     }
+    if(!dept_id) dept_id="";
     window.open( getserveraddr() + "/file/employee/order?dept_id="+dept_id+
     "&start_date="+start_date+"&end_date="+end_date+"&start_score="+start_score+"&end_score="+end_score);
 }

VisualInspection/js/statistics/assess_situation.js

@@ -20,6 +20,9 @@ function querySituationClick(){
     var startStr = start_date.replace(/-/g, '/');
     var endStr = end_date.replace(/-/g, '/');
     var start = new Date(startStr);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var end = new Date(endStr);
     if(start>end){
         tip("开始时间不能比结束时间大");
@@ -57,6 +60,10 @@ function initQuerySituation(){
     var start_date = start_time+" 23:00:00"; 
     var end_date = end_time+" 23:00:00"; 
     
+    var start = new Date(start_date);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var param = {
         "start_date": start_date,
         "end_date": end_date,

VisualInspection/js/statistics/assess_type.js

@@ -24,6 +24,9 @@ function queryTypeClick(){
     var startStr = start_date.replace(/-/g, '/');
     var endStr = end_date.replace(/-/g, '/');
     var start = new Date(startStr);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var end = new Date(endStr);
     if(start>end){
         tip("开始时间不能比结束时间大");
@@ -59,7 +62,10 @@ function initQueryType(){
     $("#end-time").val(end_time);
     var start_date = start_time+" 23:00:00"; 
     var end_date = end_time+" 23:00:00"; 
-    
+    var start = new Date(start_date);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var param = {
         "start_date": start_date,
         "end_date": end_date,

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

@@ -22,7 +22,7 @@
     	SELECT COUNT(1) AS checked_num , t.checked_person AS user_id FROM check_task t 
     	WHERE 1=1 and t.check_status!=22
 			<if test="start_date!=null and end_date != null">
-		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt;= #{end_date} 
+		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt; #{end_date} 
 			</if>
 			<if test="dept_id!=null">
 				AND t.checked_dept =#{dept_id}			
@@ -35,7 +35,7 @@
     	FROM check_task  t left join t_sys_users u on t.checked_person = u.id
     	WHERE 1=1 and t.check_status!=22
     		<if test="start_date!=null and end_date != null">
-		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt;= #{end_date}
+		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt; #{end_date}
 			</if>
 			<if test="position_ids != null and position_ids.size() > 0">
         		AND u.positionid in 
@@ -54,7 +54,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>
     		GROUP BY t.checked_dept,t.checked_person
     </select>
@@ -67,7 +67,7 @@
 			LEFT JOIN t_sys_users uu on t.checked_person = uu.id
 			WHERE 1=1  and ct.check_status!=22 and ci.score is not null
 			<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="position_ids != null and position_ids.size() > 0">
         		AND uu.positionid in