周期更改

VisualInspection/js/statistics/appeal.js

@@ -105,10 +105,10 @@ $(function() {
 function getFsWorkInfo() {
 
     var param = {
-        "start_time": timeTranslate(GV("#sel_month")),
-        "end_time": (GV("#sel_month") + "/25 23:00:00").replace("/", "-").replace("/", "-")
+        "start_time":(GV("#sel_month") + "/01 00:00:00").replace("/", "-").replace("/", "-"),
+        "end_time": timeTranslateNew(GV("#sel_month"))
     }
-
+console.log(param);
     if (GV("#fs_station") != '') {
         param['dept_id'] = GV("#fs_station");
     } else if (GV("#center_manage") != '') {

VisualInspection/js/statistics/assess_ranking.js

@@ -41,7 +41,6 @@ $(function() {
             dept = getCurrentUser().organid;
         }
         var feeList = cache_road_manager_fee_list_map.get(road_manager);
-        console.log(feeList);
         // $("#fsList").html(obj);
         setRoadManagerValue(feeList, "#fsList", dept, true);
         // $("#fsList").val(dept);
@@ -53,7 +52,6 @@ $(function() {
         get_common_service("/dept/getAllFs", null, function(data) {
             setRoadManagerValue(data, "#fsList", null, true);
         });
-        console.log(deptData);
         initQueryEmp(null, null);
     }
     // 道管中心选择变化
@@ -92,14 +90,14 @@ function queryEmpClick() {
         tip("请选择起止日期");
         return;
     } else {
-        start_date += " 23:00:00";
-        end_date += " 23:00:00";
+        start_date += " 00:00:00";
+        end_date += " 24:00:00";
     }
     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.setDate(start.getDate());
     start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var end = new Date(endStr);
     if (start > end) {
@@ -153,16 +151,8 @@ function initQueryEmp(parent_dept_id, dept_id) {
     var tdaytime = moment();
     var start_time = "";
     var end_time = "";
-    if (tdaytime.get('D') >= 26) {
-        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
-        tdaytime = moment();
-        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
-    } else {
-        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
-        tdaytime = moment();
-        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
-
-    }
+    start_time = tdaytime.set('date', 1).format("YYYY-MM-DD");
+    end_time = tdaytime.set('date', 1).add(1, 'M').subtract(1, 'd').format("YYYY-MM-DD");
 
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();
@@ -172,10 +162,10 @@ function initQueryEmp(parent_dept_id, dept_id) {
     //默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);
-    var start_date = start_time + " 23:00:00";
-    var end_date = end_time + " 23:00:00";
+    var start_date = start_time + " 00:00:00";
+    var end_date = end_time + " 24:00:00";
 
-    var start = moment(start_date).subtract(1, "day");
+    var start = moment(start_date);
     //开始日期取前一天的23:00
 
     start_date = start.toDate().Format("yyyy-MM-dd HH:mm:ss");
@@ -199,7 +189,6 @@ function initQueryEmp(parent_dept_id, dept_id) {
  * @param {*} param
  */
 function getEmployeeInfosClick(url, param, start_score, end_score, start_num, end_num) {
-    console.log(param);
     post_common_service(url, param, function(data) {
         $("#itemInfo").empty();
         itemNameList = data.itemList;
@@ -220,7 +209,6 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
         }
 
         data = data["lists"];
-        console.log(data);
         var strTbody = '';
         var count = 0;
         var start_date_time = moment(param.end_date + "Z");
@@ -310,7 +298,6 @@ function jumpuser(userid, deptid) {
 
 
 function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date, checknum) {
-
     var tasklist = data.teamClasseList;
     var userclasslist = data.userClassCountList;
 
@@ -326,17 +313,20 @@ function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date,
     var taskmap = new Map();
     var userClassmap = new Map();
 
-
     for (var i = 0; i < tasklist.length; i++) {
         var task = tasklist[i];
         if (!taskmap.get(task.work_date)) {
+        
             taskmap.put(task.work_date, []);
         }
         var arr = taskmap.get(task.work_date);
         arr.push(task);
         taskmap.put(task.work_date, arr);
+    
     }
+  
     for (var i = 0; i < userclasslist.length; i++) {
+
         var usercount = userclasslist[i];
 
         var daytime = moment(usercount.start_time).toDate()
@@ -366,15 +356,16 @@ function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date,
     var morningtd = "<td style='background:#e5e5e5'>早班</td>"
 
     for (var i = 1; i <= days; i++) {
-        var daytime = new Date(satrtday.valueOf() + i * 1000 * 60 * 60 * 24 - 1000 * 60 * 60 * 23);
+        var daytime = new Date(satrtday.valueOf() + i * 1000 * 60 * 60 * 24 - 1000 * 60 * 60 * 0);
         var workday = daytime.Format("yyyy-MM-dd HH:mm");
-
+        console.log(workday);
 
         var html1 = ""
         var html2 = ""
         var html3 = ""
-
+        
         if (taskmap.get(workday)) {
+            debugger
             var userclassarry = null;
             if (userClassmap.get(workday)) {
                 userclassarry = userClassmap.get(workday);
@@ -382,7 +373,7 @@ function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date,
 
 
             var arry = taskmap.get(workday);
-
+            console.log(arry);
             for (var j = 0; j < arry.length; j++) {
                 var hasin = false;
                 var tasktemp = arry[j];
@@ -422,7 +413,7 @@ function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date,
 
 
                 var teamid = tasktemp.class_id + "_" + (typeof(tasktemp.unregular_id) == "undefined" ? "" : tasktemp.unregular_id)
-
+                 
                 if (tasktemp.class_type == 1) {
 
                     html2 += "<div class='row'><button class=\"btn " + classname + " classbtn\" id=" + teamid + "  data=" + workday + " onclick='selectTeamClass(this)'  type=\"button\">" + name + "</button></div>"
@@ -452,6 +443,7 @@ function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date,
             for (var j = 0; j < arry.length; j++) {
                 var hasin = false;
                 var usercounttemp = arry[j];
+                console.log(usercounttemp);
                 var taskfail = false;
 
                 if (teamclassarry != null) {
@@ -625,7 +617,6 @@ function addTask(userid, username, stationname, checknum, start_date, end_date)
         var html = showAddTaskListView(data, allwidth, allheight, start_date, end_date, checknum);
 
 
-
         layerindex = layer.open({
             type: 1,
             title: "生成稽查任务：" + stationname + "--" + username + "   已稽查：" + checknum + "次",

VisualInspection/js/statistics/assess_situation.js

@@ -15,14 +15,14 @@
                 tip("请选择起止日期");
                 return;
             } else {
-                start_date += " 23:00:00";
-                end_date += " 23:00:00";
+                start_date += " 00:00:00";
+                end_date += " 24:00:00";
             }
             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.setDate(start.getDate() - 1);
             start_date = start.Format("yyyy-MM-dd HH:mm:ss");
             var end = new Date(endStr);
             if (start > end) {
@@ -34,6 +34,7 @@
                 "start_date": start_date,
                 "end_date": end_date,
             }
+            console.log(param);
             var url = "statistics/score/info";
             var strTbody = '';
             post_common_service(url, param, function(data) {
@@ -55,49 +56,53 @@
             var tdaytime = moment();
             var start_time = "";
             var end_time = "";
-            if (tdaytime.get('D') >= 26) {
-                start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
-                tdaytime = moment();
-                end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
-            } else {
-                start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
-                tdaytime = moment();
-                end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+            start_time = tdaytime.set('date', 1).format("YYYY-MM-DD");
+            end_time = tdaytime.set('date', 1).add(1, 'M').add(-1,"d").format("YYYY-MM-DD");
+            // if (tdaytime.get('D') >= 26) {
+            //     start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+            //     tdaytime = moment();
+            //     end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+            // } else {
+            //     start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+            //     tdaytime = moment();
+            //     end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
 
-            }
+            // }
 
             var temp_time = $.zui.store.get('page_data_param_temp_time');
-            if (temp_time) {
+            console.log(temp_time);
+            // if (temp_time) {
 
-                var year = temp_time.split('/')[0];
-                var month = temp_time.split('/')[1];
+            //     var year = temp_time.split('/')[0];
+            //     var month = temp_time.split('/')[1];
 
-                var starty = year;
-                var startm = parseInt(month) - 1;
+            //     var starty = year;
+            //     var startm = parseInt(month) - 1;
 
-                if (startm <= 0) {
-                    startm = 12;
-                    starty = parseInt(year) - 1;
-                }
+            //     if (startm <= 0) {
+            //         startm = 12;
+            //         starty = parseInt(year) - 1;
+            //     }
 
-                start_time = starty + '-' + (startm >= 10 ? startm : ("0" + startm)) + '-26';
-                end_time = year + '-' + month + '-25'
-                $.zui.store.set('page_data_param_temp_time', null)
-            }
+            //     start_time = starty + '-' + (startm >= 10 ? startm : ("0" + startm)) + '-26';
+            //     end_time = year + '-' + month + '-25'
+            //     $.zui.store.set('page_data_param_temp_time', null)
+            // }
             //默认初始化时间页面回显
             $("#start-time").val(start_time);
             $("#end-time").val(end_time);
-            var start_date = start_time + " 23:00:00";
-            var end_date = end_time + " 23:00:00";
+            var start_date = start_time + " 00:00:00";
+            var end_date = end_time + " 24:00:00";
 
             var start = new Date(start_date);
             //开始日期取前一天的23:00
-            start.setDate(start.getDate() - 1);
+            // 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,
             }
+            console.log(param);
             var url = "statistics/score/info";
             var strTbody = '';
 
@@ -265,12 +270,12 @@
                 tip("请选择起止日期");
                 return;
             } else {
-                start_date += " 23:00:00";
-                end_date += " 23:00:00";
+                start_date += " 00:00:00";
+                end_date += " 00:00:00";
 
                 var start = new Date(start_date);
                 //开始日期取前一天的23:00
-                start.setDate(start.getDate() - 1);
+                //start.setDate(start.getDate() - 1);
                 start_date = start.Format("yyyy-MM-dd HH:mm:ss");
             }
             window.open(getserveraddr() + "/file/score/info?start_date=" + start_date + "&end_date=" + end_date);

VisualInspection/js/statistics/assess_type.js

@@ -19,14 +19,14 @@ function queryTypeClick() {
         tip("请选择起止日期");
         return;
     } else {
-        start_date += " 23:00:00";
-        end_date += " 23:00:00";
+        start_date += " 00:00:00";
+        end_date += " 24:00:00";
     }
     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.setDate(start.getDate() - 1);
     start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     var end = new Date(endStr);
     if (start > end) {
@@ -58,31 +58,34 @@ function initQueryType() {
     var tdaytime = moment();
     var start_time = "";
     var end_time = "";
-    if (tdaytime.get('D') >= 26) {
-        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
-        tdaytime = moment();
-        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
-    } else {
-        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
-        tdaytime = moment();
-        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
+    start_time = tdaytime.set('date', 1).format("YYYY-MM-DD");
+    end_time = tdaytime.set('date', 1).add(1, 'M').subtract(1, 'd').format("YYYY-MM-DD");
+    // if (tdaytime.get('D') >= 26) {
+    //     start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
+    //     tdaytime = moment();
+    //     end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
+    // } else {
+    //     start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
+    //     tdaytime = moment();
+    //     end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
 
-    }
+    // }
 
     // 默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);
-    var start_date = start_time + " 23:00:00";
-    var end_date = end_time + " 23:00:00";
+    var start_date = start_time + " 00:00:00";
+    var end_date = end_time + " 24:00:00";
     var start = new Date(start_date);
     //开始日期取前一天的23:00
-    start.setDate(start.getDate() - 1);
+    //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,
         "check_type":0
     }
+    console.log(param);
     var url = "statistics/score/item/info";
     var strTbody = '';
 
@@ -306,11 +309,11 @@ function exportExcel() {
         tip("请选择起止日期");
         return;
     } else {
-        start_date += " 23:00:00";
-        end_date += " 23:00:00";
+        start_date += " 00:00:00";
+        end_date += " 00:00:00";
         var start = new Date(start_date);
         //开始日期取前一天的23:00
-        start.setDate(start.getDate() - 1);
+       // start.setDate(start.getDate() - 1);
         start_date = start.Format("yyyy-MM-dd HH:mm:ss");
     }
     window.open(getserveraddr() + "/file/score/item/info?start_date=" + start_date + "&end_date=" + end_date+"&type="+$('#type').val());

VisualInspection/js/statistics/change_attendance.js

@@ -32,16 +32,8 @@ $(function() {
     var tdaytime = moment();
     var start_time = "";
     var end_time = "";
-    if (tdaytime.get('D') >= 26) {
-        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
-        tdaytime = moment();
-        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
-    } else {
-        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
-        tdaytime = moment();
-        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
-
-    }
+    start_time = tdaytime.set('date', 1).format("YYYY-MM-DD");
+    end_time = tdaytime.set('date', 1).add(1, 'M').subtract(1, 'd').format("YYYY-MM-DD");
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);
     // 收费站中心选择
@@ -89,10 +81,10 @@ $(function() {
 function getFsWorkInfo(flag) {
 
     var param = {
-        "start_time": dateChange(new Date(GV("#start-time") + " 00:00:00"), 60 * 60 * 1000),
-        "end_time": GV("#end-time") + " 23:00:00"
+        "start_time": dateChange(new Date(GV("#start-time") + " 00:00:00"), 0),
+        "end_time": GV("#end-time") + " 24:00:00"
     }
-
+    console.log(param);
     if (GV("#fs_employee") != '') {
         param['user_id'] = GV("#fs_employee");
     } else if (GV("#fs_station") != '') {

VisualInspection/js/statistics/change_work.js

@@ -32,16 +32,8 @@ $(function() {
     var tdaytime = moment();
     var start_time = "";
     var end_time = "";
-    if (tdaytime.get('D') >= 26) {
-        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
-        tdaytime = moment();
-        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
-    } else {
-        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
-        tdaytime = moment();
-        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
-
-    }
+    start_time = tdaytime.set('date', 1).format("YYYY-MM-DD");
+    end_time = tdaytime.set('date', 1).add(1, 'M').subtract(1, 'd').format("YYYY-MM-DD");
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);
 
@@ -89,10 +81,9 @@ $(function() {
 function getFsWorkInfo() {
 
     var param = {
-        "start_time": dateChange(new Date(GV("#start-time") + " 00:00:00"), 60 * 60 * 1000),
-        "end_time": GV("#end-time") + " 23:00:00"
+        "start_time": dateChange(new Date(GV("#start-time") + " 00:00:00"),0),
+        "end_time": GV("#end-time") + " 24:00:00"
     }
-
     if (GV("#fs_employee") != '') {
         param['user_id'] = GV("#fs_employee");
     } else if (GV("#fs_station") != '') {

VisualInspection/js/statistics/check_workload_statistics.js

@@ -2,20 +2,12 @@
 var tdaytime = moment();
 var start_time = "";
 var end_time = "";
-if (tdaytime.get('D') >= 26) {
-    start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
-    tdaytime = moment();
-    end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
-} else {
-    start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
-    tdaytime = moment();
-    end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
-
-}
+start_time = tdaytime.set('date', 1).format("YYYY-MM-DD");
+end_time = tdaytime.set('date', 1).add(1, 'M').subtract(1, 'd').format("YYYY-MM-DD");
 $(".div-start input").val(start_time);
 $(".div-end input").val(end_time);
-var start_date = dateChange(new Date($(".div-start input").val() + " 00:00:00"), 60 * 60 * 1000);
-var end_date = $(".div-end input").val() + " 23:00:00";
+var start_date = dateChange(new Date($(".div-start input").val() + " 00:00:00"), 0);
+var end_date = $(".div-end input").val() + " 24:00:00";
 var user_id = $("#select-personal").val();
 var cur_status;
 var hide = false;
@@ -87,6 +79,7 @@ $(function() {
             "check_status": cur_status,
             "score_flag": $(".score-select").val()
         }
+        //console.log(data);
         if (hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) || hasRole(ROLE_JICHA) || roleContains('STATION')) {
             hide = true;
         }
@@ -124,8 +117,8 @@ $(function() {
     // 导出excel
     $("#export-check-info").click(function() {
         var param = '';
-        var start_date = dateChange(new Date($(".div-start input").val() + " 00:00:00"), 60 * 60 * 1000);
-        var end_date = $(".div-end input").val() + " 23:00:00";
+        var start_date = dateChange(new Date($(".div-start input").val() + " 00:00:00"), 0);
+        var end_date = $(".div-end input").val() + " 24:00:00";
         if ($("#select-personal").val() != '') {
             param += "&user_id=" + $("#select-personal").val();
         }
@@ -136,8 +129,8 @@ $(function() {
 
     $(".query button").click(function() {
         pageindex = 1;
-        var start_date = dateChange(new Date($(".div-start input").val() + " 00:00:00"), 60 * 60 * 1000);
-        var end_date = $(".div-end input").val() + " 23:00:00";
+        var start_date = dateChange(new Date($(".div-start input").val() + " 00:00:00"), 0);
+        var end_date = $(".div-end input").val() + " 24:00:00";
         var startStr = start_date.replace(/-/g, '/');
         var endStr = end_date.replace(/-/g, '/');
         var start = new Date(startStr);

VisualInspection/js/statistics/common_attendance.js

@@ -93,10 +93,12 @@ $(function() {
         function getFsWorkInfo(flag) {
 
             var param = {
-                "start_time": timeTranslate(GV("#sel_month")),
-                "end_time": (GV("#sel_month") + "/25 23:00:00").replace("/", "-").replace("/", "-")
+                // "start_time": timeTranslate(GV("#sel_month")),
+                // "end_time": (GV("#sel_month") + "/25 23:00:00").replace("/", "-").replace("/", "-")
+                "start_time":(GV("#sel_month") + "/01 00:00:00").replace("/", "-").replace("/", "-"),
+                "end_time": timeTranslateNew(GV("#sel_month"))
             }
-
+            console.log(param);
             if (GV("#fs_employee") != '') {
                 param['user_id'] = GV("#fs_employee");
             } else if (GV("#fs_station") != '') {
@@ -188,7 +190,6 @@ function getTableContent(obj, seq) {
             }
         }
     }
-   console.log(obj.work_minutes);
     var content = "<tr><td rowspan='3' width='4%'>" + seq + "</td> <td rowspan='3' width='4%'>" + obj.feeStationName + "</td> <td rowspan='3' width='4%'>" + obj.userName +
         "</td> <td rowspan='3' width='4%'>" + obj.positionName + "</td><td rowspan='3' width='8%'>" + obj.workno + "</td><td width='4%'>夜班</td> " + class_html[0] + "<td rowspan='3' width='4%'>" +
         obj.work_days + "</td><td rowspan='3' width='4%'>" + convertT(obj.work_minutes) + "</td><td rowspan='3' width='3%'></td> </tr>\

VisualInspection/js/statistics/common_statistic.js

@@ -300,6 +300,20 @@ function timeTranslate(str){
     return year2 + "-"+month2 + "-25 23:00:00" ;
 }
 
+function timeTranslateNew(str){
+    var strs = str.split("/") ;
+    var year = strs[0];
+    var month = strs[1];
+    var month2 = Number(month) + 1 ;
+    var year2 = year ;
+    if( month2 == 13 ){
+        year2 = year2 + 1 ;
+        month2 = 1 ;
+    }
+    return year2 + "-"+month2 + "-01 00:00:00" ;
+}
+
+
 /**
  * 
  * @param {*} datet 

VisualInspection/js/statistics/common_work.js

@@ -33,16 +33,8 @@ $(function() {
     var tdaytime = moment();
     var start_time = "";
     var end_time = "";
-    if (tdaytime.get('D') >= 26) {
-        start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
-        tdaytime = moment();
-        end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
-    } else {
-        start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
-        tdaytime = moment();
-        end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
-
-    }
+    start_time = tdaytime.set('date', 1).format("YYYY-MM-DD");
+    end_time = tdaytime.set('date', 1).add(1, 'M').subtract(1, 'd').format("YYYY-MM-DD");
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);
 
@@ -96,10 +88,10 @@ function getFsWorkInfo() {
     //     "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
     // }
     var param = {
-        "start_time": dateChange(new Date(GV("#start-time") + " 00:00:00"), 60 * 60 * 1000),
-        "end_time": GV("#end-time") + " 23:00:00"
+        "start_time": dateChange(new Date(GV("#start-time") + " 00:00:00"),0),
+        "end_time": GV("#end-time") + " 24:00:00"
     }
-
+    console.log(param);
     if (GV("#fs_employee") != '') {
         param['user_id'] = GV("#fs_employee");
     } else if (GV("#fs_station") != '') {

VisualInspection/js/statistics/personal_data_statistics.js

@@ -17,25 +17,16 @@ var array_points2 = new Array();
 var tdaytime = moment();
 var start_time = "";
 var end_time = "";
-if (tdaytime.get('D') >= 26) {
-    start_time = tdaytime.set('date', 26).format("YYYY-MM-DD");
-    tdaytime = moment();
-    end_time = tdaytime.set('date', 25).add(1, 'M').format("YYYY-MM-DD");
-} else {
-    start_time = tdaytime.set('date', 26).subtract(1, 'M').format("YYYY-MM-DD");
-    tdaytime = moment();
-    end_time = tdaytime.set('date', 25).format("YYYY-MM-DD");
-
-}
-
+start_time = tdaytime.set('date', 1).format("YYYY-MM-DD");
+end_time = tdaytime.set('date', 1).add(1, 'M').subtract(1, 'd').format("YYYY-MM-DD");
 
 // 默认初始化日期一个月
 $(".div-start input").val(start_time);
 $(".div-end input").val(end_time);
 
-var start_date = dateChange(moment($(".div-start input").val() + " 00:00:00"), 60 * 60 * 1000);
+var start_date = dateChange(moment($(".div-start input").val() + " 00:00:00"), 0);
 
-var end_date = $(".div-end input").val() + " 23:00:00";
+var end_date = $(".div-end input").val() + " 24:00:00";
 
 /**
  * 预加载方法
@@ -179,6 +170,7 @@ $(function() {
                     "user_id": user_id,
                     "queryType": 0,
                 }
+
                 if ($(".score-select").val() == "0") {
                     data["score_flag"] = 0;
                 }
@@ -252,8 +244,8 @@ $(function() {
 
     $(".query button").click(function() {
         var user_id = $("#select-personal").val();
-        var start_date = dateChange(new Date($(".div-start input").val() + " 00:00:00"), 60 * 60 * 1000);
-        var end_date = $(".div-end input").val() + " 23:00:00";
+        var start_date = dateChange(new Date($(".div-start input").val() + " 00:00:00"), 0);
+        var end_date = $(".div-end input").val() + " 24:00:00";
         var startStr = start_date.replace(/-/g, '/');
         var endStr = end_date.replace(/-/g, '/');
         var start = new Date(startStr);
@@ -268,8 +260,6 @@ $(function() {
         }
 
 
-
-
         // 查询图一
         init_personal_score_statistics("statistics/one/person/year/info", user_id);
         // 查询图二
@@ -287,14 +277,12 @@ $(function() {
      */
     function init_personal_score_statistics(url, user_id) {
 
-        var end_date = $(".div-end input").val() + " 23:00:00";
+        var end_date = $(".div-end input").val() + " 24:00:00";
         var date = moment(end_date);
+    
         var y = date.get('y');
-        var m = date.get('M') + 1;
-
-
-
-
+        var m = date.get('M');
+      
         x_m_array = new Array();
         for (var i = 1; i <= 12; i++) {
             var month = parseInt(m) + i;
@@ -306,12 +294,18 @@ $(function() {
             x_m_array.push(starty + "/" + (month >= 10 ? month : ("0" + month)));
         }
 
+        if(m != 12){
+            var start_date = (parseInt(y) - 1) + "-" + (parseInt(m)+1) + "-1" + " 00:00:00";
+            var end_date = y + "-" + (parseInt(m)+1) + "-1" + " 00:00:00"; 
+        }else{
+            var start_date = (parseInt(y)) + "-" + '1' + "-1" + " 00:00:00";
+            var end_date = (parseInt(y)+1) + "-" + '1' + "-1" + " 00:00:00"; 
+        }
         var param = {
-            "start_date": (y - 1) + "-" + new Date().getMonth() + "-25" + " 23:00:00",
-            "end_date": y + "-" + (new Date().getMonth() + 1) + "-25" + " 23:00:00",
+            "start_date": start_date,
+            "end_date": end_date,
             "user_id": user_id
         }
-
         initRqueset(url, param, 1);
     }
 
@@ -327,6 +321,7 @@ $(function() {
             "end_date": end_date,
             "user_id": user_id
         }
+        console.log(param);
         initRqueset(url, param, 2);
     }
 
@@ -556,8 +551,8 @@ $(function() {
     }
 
     function getInit() {
-        var start_date = dateChange(moment($(".div-start input").val() + " 00:00:00"), 60 * 60 * 1000);
-        var end_date = $(".div-end input").val() + " 23:00:00";
+        var start_date = dateChange(moment($(".div-start input").val() + " 00:00:00"), 60 * 60 * 0);
+        var end_date = $(".div-end input").val() + " 24:00:00";
         var user_id = $("#select-personal").val();
         // 页面初始化
         echart();

VisualInspection/js/statistics/toll_station_statistics.js

@@ -128,14 +128,19 @@
      	            }
      	            x_m_array.push(starty + "/" + (month >= 10 ? month : ("0" + month)));
      	        }
-
+				 if(m != 12){
+					var start_date = (parseInt(y) - 1) + "-" + (parseInt(m)+1) + "-1" + " 00:00:00";
+					var end_date = y + "-" + (parseInt(m)+1) + "-1" + " 00:00:00"; 
+				}else{
+					var start_date = (parseInt(y)) + "-" + '1' + "-1" + " 00:00:00";
+					var end_date = (parseInt(y)+1) + "-" + '1' + "-1" + " 00:00:00"; 
+				}
      	        var param = {
-     	                "start_date": (parseInt(y) - 1) + "-" + m + "-25" + " 23:00:00",
-     	                "end_date": y + "-" + m + "-25" + " 23:00:00",
+     	                "start_date": start_date,
+     	                "end_date": end_date,
      	                "dept_id": select_station,
      	                "queryType": 2
      	            }
-     	            // console.log(param);
      	        initRqueset(url, param, 1);
      	    }
 
@@ -299,21 +304,26 @@
      	            array_year_score.length = 0;
      	            if (data != '' && 　data.length != 0) {
 
-     	                x_m_array_temp = new Array();
+						 x_m_array_temp = new Array();
+						 x_m_array_temp=x_m_array;
      	                for (var i = 0; i < x_m_array.length; i++) {
 
-     	                    var index = -1;
+							 var index = -1;
+							 var score = 0;
      	                    for (var j = 0; j < data.length; j++) {
      	                        if (x_m_array[i] == data[j].mth) {
-     	                            index = j;
+									 index = j;
+									 score = data[index].all_check_score;
      	                            break;
-     	                        }
-     	                    }
-     	                    if (index < 0) {} else {
-     	                        x_m_array_temp.push(x_m_array[i]);
-     	                        array_year_score.push(
-     	                            (100 - data[index].all_check_score));
-     	                    }
+								 }
+							 }
+							 array_year_score.push(
+								(100 - score));
+     	                    // if (index < 0) {} else {
+     	                    //     x_m_array_temp.push(x_m_array[i]);
+     	                    //     array_year_score.push(
+     	                    //         (100 - data[index].all_check_score));
+     	                    // }
      	                }
      	            } else {
      	                array_year_score.length = 0;
@@ -323,9 +333,9 @@
      	            if (eval("Math.min(" + array_year_score.toString() + ")") == 0)
      	                min_year = 0;
      	            else
-     	                min_year = eval("Math.min(" + array_year_score.toString() + ")").toFixed(0) - 10;
+						 min_year = eval("Math.min(" + array_year_score.toString() + ")").toFixed(0) - 10;
+				    console.log(array_year_score);
      	        } else if (type == 2) {
-					 console.log(data);
      	            array_points.length = 0;
      	            if (data != '') {
      	                array_points.push({ "value": (data.people_num - (data.score_fifteen + data.score_fifty + data.score_over_fifty)), "name": '满分' });
@@ -368,7 +378,6 @@
      	                array_five_score_temp.push({ value: array_five_score[i], name: data[i].user.id + "_" + data[i].user.organid })
      	            }
      	        } else if (type == 4) {
-					 console.log(data);
      	            array_score_order.length = 0;
      	            array_score_data.length = 0;
      	            var m = 1;
@@ -471,7 +480,6 @@
 					 //console.log(obj.name);
 					 array_all_name.push(obj.name);
 				 }
-				 console.log(array_all_name);
 				// array_all_name = ["安全管理", "系统和设备管理", "票、款、卡管理", "内部解缴", "外部解缴", "环境卫生", "服务形象", "服务规范", "操作流程", "便民服务", "通行质量", "内部管理"];
 		
 			    var Tmth = data.Tmth;

VisualInspection/js/statistics/total_company_statistics.js

@@ -99,14 +99,23 @@ $(function() {
             }
             x_m_array.push(starty + "/" + (month >= 10 ? month : ("0" + month)));
         }
-
-
+        console.log(x_m_array);
+        //var start_date = 
+        // var param = {
+        //     "start_date": (parseInt(y) - 1) + "-" + m + "-25" + " 23:00:00",
+        //     "end_date": y + "-" + (m) + "-25" + " 23:00:00"
+        // }
+        if(m != 12){
+            var start_date = (parseInt(y) - 1) + "-" + (parseInt(m)+1) + "-1" + " 00:00:00";
+            var end_date = y + "-" + (parseInt(m)+1) + "-1" + " 00:00:00"; 
+        }else{
+            var start_date = (parseInt(y)) + "-" + '1' + "-1" + " 00:00:00";
+            var end_date = (parseInt(y)+1) + "-" + '1' + "-1" + " 00:00:00"; 
+        }
         var param = {
-            "start_date": (parseInt(y) - 1) + "-" + m + "-25" + " 23:00:00",
-            "end_date": y + "-" + (m) + "-25" + " 23:00:00"
+            "start_date": start_date,
+            "end_date": end_date
         }
-
-
         initRqueset("statistics/score/year/info", param, 1);
 
     }
@@ -116,16 +125,19 @@ $(function() {
      */
     function init_company_points_assess(url, y, mon) {
         var starty = y;
-        var startm = parseInt(mon) - 1;
+        var startm = parseInt(mon);
+        var endy = y;
+        var endm = parseInt(mon)+1;
 
-        if (startm <= 0) {
-            startm = 12;
-            starty = parseInt(y) - 1;
+        if (startm == 12) {
+            endy = starty +1;
+            endm = 1;
         }
         var param = {
-            "start_date": starty + '-' + (startm >= 10 ? startm : ("0" + startm)) + '-25 23:00:00',
-            "end_date": y + '-' + mon + '-25 23:00:00'
+            "start_date": starty + '-' + (startm >= 10 ? startm : ("0" + startm)) + '-1 00:00:00',
+            "end_date": y + '-' + (endm >= 10 ? endm : ("0" + endm)) + '-1 00:00:00'
         }
+        console.log(param);
         initRqueset(url, param, 2);
     }
     // init_company_points_assess("statistics/lost/score/rate",initDate+"");

VisualInspection/js/statistics/user_check_statistics.js

@@ -31,7 +31,7 @@ $(function() {
     });
 
 
-    getscore("2017-07", moment(moment().format("YYYY-MM")).subtract(1, "month").format("YYYY-MM"), 3, 985, 1000);
+    getscore("2019-05", moment(moment().format("YYYY-MM")).subtract(1, "month").format("YYYY-MM"), 3, 985, 1000);
 
 
 
@@ -43,8 +43,8 @@ $(function() {
 function getscore(starttime, endtime, limitnumber, limitscore, limitscore2) {
 
     var data_p = {
-        "start_date": moment(starttime + "-25 23:00:00").valueOf(),
-        "end_date": moment(endtime + "-25 23:00:00").valueOf(),
+        "start_date": moment(starttime + "-1 00:00:00").valueOf(),
+        "end_date": moment(endtime + "-1 00:00:00").valueOf(),
         "limitnumber": limitnumber,
         "limitscore": limitscore,
         "limitscore2": limitscore2

VisualInspection/js/teamClass/check_team_schedule.js

@@ -1,5 +1,5 @@
     $(document).ready(function() {
-
+       
         //  $("#main_content_title").html("稽查人员排班")
 
         var user = $.zui.store.get("user"); // 缓存用户信息，取出dept_id
@@ -65,6 +65,7 @@
         function getTeamClass(data, _function) {
             post_common_service("teamClass/getClassList", data, function(data) {
                 _function(data);
+               // $.zui.store.set("teamId",data[0].id);
             }, function(error) {
                 return "";
             })
@@ -132,6 +133,7 @@
             setAddTermTitle(date.format("yyyy-MM-dd"));
             // 保存当前日期
             $("#save_term_class").data("date", date.format("yyyy-MM-dd"));
+            $("#delete_term_class").data("date", date.format("yyyy-MM-dd"));
             $("#team_detail").val("");
             var data = {
                 "dept_id": user_dept_id,
@@ -141,6 +143,10 @@
             }
 
             getTeamClass(data, function(data) {
+                if(data[0]){
+                    $("#delete_term_class").data("id",data[0].id);
+                }
+               
                 for (var i = 0; i < $("select[id*='_term']").length; i++) {
                     $("select[id*='_term']").eq(i).val("");
                 }
@@ -226,10 +232,10 @@
                     str_user_ids = str_user_ids + ((i != 0) ? (',' + user_ids[i]) : user_ids[i]);
                 }
             }
-            if (str_user_ids == '') {
-                tip("请选择值班人员");
-                return;
-            }
+            // if (str_user_ids == '') {
+            //     tip("请选择值班人员");
+            //     return;
+            // }
             for (var i = 0; i < $("select[id*='_term']").length; i++) {
                 if ($("select[id*='_term']").eq(i).val() != "") {
                     var obj = {
@@ -269,6 +275,21 @@
             }
         })
 
+        $("#delete_term_class").click(function() {
+             //console.log($("#delete_term_class").data('id'));
+             var obj = {id:$("#delete_term_class").data('id')}
+            // console.log(obj);
+          post_common_service("teamClass/delete", obj, function(data) {
+            updateCalendar();
+            tip("删除排班成功!");
+            $('#myModal').modal('hide');
+        }, function(error) {
+            $('#myModal').modal('hide');
+        })
+        })
+
+
+
         $("#close_btn").click(function() {
             $('#myModal').modal('hide');
         })

VisualInspection/js/util/util.js

@@ -511,7 +511,6 @@ function showClientImg(src) {
 }
 
 function showClientVideo(src) {
-    alert(1);
     callFunc("showVideo", src);
 }
 

VisualInspection/view/term_management/check_stuff_schedule.html

@@ -42,6 +42,7 @@
                         <div class="col-sm-12">
                             <button  style="float:right;margin-right:10px;" id="close_btn" class="btn btn">关闭</button>
                             <button type="submit" style="float:right;margin-right:10px;" id="save_term_class" class="btn btn-info">生成今日排班</button>
+                            <button type="submit" style="float:right;margin-right:10px;" id="delete_term_class" class="btn btn-danger">删除今日排班</button>
                         </div>
                     </div>
                 </div>

VisualInspection_server/src/main/java/com/xintong/GetOffWork.java

@@ -18,7 +18,7 @@ public class GetOffWork {
 
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(GetOffWork.class);
 
-    @Scheduled(cron = "0 37 * * * ?")
+    @Scheduled(cron = "0 6 9 * * ?")
     public void confirmTasks() {
       // Date now = new Date();
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TeamClassController.java

@@ -112,7 +112,24 @@ public class TeamClassController extends BaseController {
     	teamClassService.updateList(teamClasses);
     	return super.returnSuccessResult("修改成功");
     }
-    
+
+	@RequestMapping(value = "/delete/list")
+	public String delete(@Valid @RequestBody List<TeamClass> teamClasses,HttpServletRequest request){
+		User u = getCurrentUser(request);
+		for(TeamClass teamClass : teamClasses){
+			if(teamClass.getDept_id()==null){
+				teamClass.setDept_id(u.getOrganid()+0L);
+			}
+			//直接从后台获取当班的人员
+			if(teamClass.getUser_type()!=null && teamClass.getUser_type()==1 && teamClass.getTeam_id()!=null){
+				Team t = teamService.getById(teamClass.getTeam_id());
+				teamClass.setUser_ids(t.getUser_ids());
+			}
+		}
+		teamClassService.deleteList(teamClasses);
+		return super.returnSuccessResult("修改成功");
+	}
+
     /**
      * 删除班次
      * @return

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

@@ -664,6 +664,9 @@
         <if test="end_date !=null">
             AND end_time &lt; #{end_date}
         </if>
+        <if test="dept_id !=null">
+            AND checked_dept = #{dept_id}
+        </if>
         AND checked_person IS NOT NULL AND check_status != 22 ) b ON a.task_id = b.id
         ) t
         WHERE

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/TeamClassService.java

@@ -26,7 +26,9 @@ public interface TeamClassService {
     public void update(TeamClass teamClass);
     public void delete(Long id);
     public void updateList(List<TeamClass> teamClasses);
-    
+
+    public void deleteList(List<TeamClass> teamClasses);
+
     public List<TeamClass> getClassCode(ClassCode teamClass);
     
     public UserClassCheck getLaneClassListByUserAndTime(com.xintong.visualinspection.pojo.TeamClass teamClass);

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -86,15 +86,15 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		CheckTaskPeriod lastTaskPeriod = null;
 		// 计算上个周期时间 周期时间：00:00:00 ----- 00:00:00 参数：23:00:00
 		for (CheckTaskPeriod p : checkTaskPeriods) {
-			if (obj.getStart_date().getTime() + 1 * 1000 * 60 * 60 == p.getEndtime().getTime()) {
+			if (obj.getStart_date().getTime()  == p.getEndtime().getTime()) {
 				lastTaskPeriod = p;
 				break;
 			}
 		}
 		if (lastTaskPeriod != null) {
 			StatisticsBean temp = new StatisticsBean();
-			temp.setStart_date(new Date(lastTaskPeriod.getStarttime().getTime() - 1 * 1000 * 60 * 60));
-			temp.setEnd_date(new Date(lastTaskPeriod.getEndtime().getTime() - 1 * 1000 * 60 * 60));
+			temp.setStart_date(new Date(lastTaskPeriod.getStarttime().getTime()));
+			temp.setEnd_date(new Date(lastTaskPeriod.getEndtime().getTime()));
 			List<StatisticsBo> list = getEmployeeCheckedInfo(temp);
 			if (list == null || list.size() < 1)
 				return data;
@@ -1917,6 +1917,35 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 						formatter.format(sta.getStart_date()) + formatter2.format(sta.getEnd_date()));
 			}
 		}
+
+        for(StatisticsBean bean:list){
+            String timeText = "";
+            if(bean.getPics() != null && bean.getPics() != ""){
+                if(bean.getPics().split("_").length > 1){
+                    String[] array = bean.getPics().split("\\.");
+                    String fileurl = bean.getPics().split("\\.")[0];
+                    String time = fileurl.split("_")[1];
+                    //int timeCoumt =  (Integer.valueOf(time)-62135596800000000)/10000000
+                    long timetemp = (Long.valueOf(time)-621355968000000000l)/10000000-60*60*8;
+                    SimpleDateFormat format =  new SimpleDateFormat("MM月dd日 HH:mm"); //设置格式
+                    timetemp = (long)timetemp;
+                    timeText=format.format(timetemp*1000);
+                }
+//				SimpleDateFormat format =  new SimpleDateFormat("MM月dd日 HH:mm");
+//				timeText = format.format(bean.getStart_date());
+            }else{
+                SimpleDateFormat format =  new SimpleDateFormat("MM月dd日 HH:mm");
+                timeText = format.format(bean.getStart_date());
+            }
+            if(bean.getName() != null && bean.getName() != ""){
+//                if (bean.getName().substring(bean.getName().length() - 1).equals("分")) {
+                    timeText = timeText + bean.getCheck_task_name().split("站")[1] + bean.getName();
+//                } else {
+//                    timeText = timeText + bean.getCheck_task_name().split("站")[1] + bean.getName() + "扣" + bean.getScore() + "分";
+//                }
+                bean.setStart_score(timeText);
+            }
+        }
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("list", list);
 		exportExcel("稽查人员工作量统计", "check_info", map, resp);
@@ -2498,23 +2527,23 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
         List<CheckTaskPeriod> checkTaskPeriods = checkTaskPeriodDao.select(new CheckTaskPeriod());
 
         for (CheckTaskPeriod p : checkTaskPeriods) {
-            if (obj.getStart_date() + 1 * 1000 * 60 * 60 == p.getEndtime().getTime()) {
+            if (obj.getStart_date() == p.getEndtime().getTime()) {
                 obj.setStartperiod_id(p.getId());
             }
-            if (obj.getEnd_date() + 1 * 1000 * 60 * 60 == p.getEndtime().getTime()) {
+            if (obj.getEnd_date() == p.getEndtime().getTime()) {
                 obj.setEndperiod_id(p.getId());
             }
         }
-        if(obj.getStart_date()>(checkTaskPeriods.get(checkTaskPeriods.size()-1).getEndtime().getTime()- 1 * 1000 * 60 * 60)){
+        if(obj.getStart_date()>(checkTaskPeriods.get(checkTaskPeriods.size()-1).getEndtime().getTime())){
             return  new ArrayList<>();
         }
-        if(obj.getEnd_date()<(checkTaskPeriods.get(0).getEndtime().getTime()- 1 * 1000 * 60 * 60)){
+        if(obj.getEnd_date()<(checkTaskPeriods.get(0).getEndtime().getTime())){
             return  new ArrayList<>();
         }
-        if(obj.getStart_date()<(checkTaskPeriods.get(0).getEndtime().getTime()- 1 * 1000 * 60 * 60)){
+        if(obj.getStart_date()<(checkTaskPeriods.get(0).getEndtime().getTime())){
             obj.setStartperiod_id(checkTaskPeriods.get(0).getId());
         }
-        if(obj.getEnd_date()>(checkTaskPeriods.get(checkTaskPeriods.size()-1).getEndtime().getTime()- 1 * 1000 * 60 * 60)){
+        if(obj.getEnd_date()>(checkTaskPeriods.get(checkTaskPeriods.size()-1).getEndtime().getTime())){
             obj.setEndperiod_id(checkTaskPeriods.get(checkTaskPeriods.size()-1).getId());
         }
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/TeamClassServiceImpl.java

@@ -131,6 +131,14 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 	}
 
 	@Override
+	public void deleteList(List<TeamClass> teamClasses) {
+		// 先删除原来的数据，再添加
+		if(teamClasses.size()>0){
+			teamClassDao.deleteByDeptWorkdate(teamClasses.get(0));
+		}
+	}
+
+	@Override
 	public void delete(Long id) {
 		// TODO Auto-generated method stub
 		teamClassDao.delete(id);