chedui

VisualInspection/fwq/js/task/task_list.js

@@ -53,6 +53,7 @@ function initQueryParams() {
 
 
     var page_params = $.zui.store.get("page_params");
+    console.log(page_params);
 
 
     if (page_params && page_params.status) {

VisualInspection/js/config.js

@@ -78,7 +78,8 @@ function getImageaddr() {
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://10.112.0.199:7000/"
         // return "http://file_release_yanhai.jsxt.jsjtyxt.com:8283/";
-        return "http://localhost:8081/";
+        //return "http://localhost:8081/";
+        return "http://200.200.19.126:8080/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {

VisualInspection/js/main.js

@@ -48,7 +48,7 @@ $(document).ready(function() {
         mbody.type = 30;
         var deptname="清障队稽查";
 
-    } else if (pathName.indexOf("cd") != -1) {
+    } else if (pathName.indexOf("motorcade") != -1) {
         //车队
         mbody.type = 40;
         var deptname="车队稽查";
@@ -211,7 +211,6 @@ $(document).ready(function() {
 
                         currentpage = $.zui.store.get("currentpage");
                     }
-                    console.log(currentpage);
                     var cexit = false;
 
 
@@ -334,7 +333,6 @@ function addobj_child(data) {
 
 
 function chageToPageUI(menu) {
-    console.log(menu);
     if(menu.childs){
         $('#treeMenu').tree('expand', $("#" + menu.id).parent());
     }
@@ -467,7 +465,6 @@ function redirectPage(url) {
 //跳转到最新打开的菜单，并保存上次的请求参数
 function redirectLastPage() {
     var currentpage = $.zui.store.get("currentpage");
-    console.log(currentpage);
     if (typeof(MENU) != "undefined" && MENU != null) {
         for (var i = 0; i < MENU.length; i++) {
             var menu = MENU[i];

VisualInspection/js/mytask/task_list.js

@@ -94,9 +94,9 @@ function initTableRowBtn() {
 //查询任务
 function queryTask() {
     var start_time = "";
-    if ($("#start_time").val()) start_time = $("#start_time").val() + " 00:00:00";
+    if ($("#start_time").val()) start_time = moment($("#start_time").val()).add(-1,"day").format("YYYY-MM-DD") + " 23:00:00";
     var end_time = "";
-    if ($("#end_time").val()) end_time = $("#end_time").val() + " 23:59:59";
+    if ($("#end_time").val()) end_time = $("#end_time").val() + " 23:00:00";
     var data = {
             "start_time": start_time,
             "end_time": end_time,
@@ -106,7 +106,7 @@ function queryTask() {
             "position_id": $("#jobSelect").val(),
             "checked_person": $("#feePersonList").val()
         }
-        // console.log(data);
+         console.log(data);
     var hide = false;
     if (hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) || hasRole(ROLE_JICHA) || roleContains('STATION')) {
         hide = true;

VisualInspection/js/new.js

@@ -402,7 +402,7 @@ function menusuccess(data) {
 }
 
 function opennew(a, id) {
-    var furl = ['', 'fwq/', 'qzd/', 'cd/'];
+    var furl = ['', 'fwq/', 'qzd/', 'motorcade/'];
     $.zui.store.set("openid", id);
     var user = $.zui.store.get("user");
     if (user.roles[0].level > 2) {
@@ -425,6 +425,8 @@ function opennew(a, id) {
             } else {
                 alert("权限不足");
             }
+        }else if (a == 3) {
+                window.location.href = base_ui_url + furl[a] + "view/main.html?";
         }else if (a == 4) {
                 window.location.href = base_ui_url + furl[0] + "view/main.html?";
         }

VisualInspection/js/other_check/other_check.js

@@ -174,7 +174,6 @@ $("#save-check").click(function() {
             "wrecker_check_type": wrecker_check_type,
             "special_check_type": special_check_type
         }
-        console.log(data);
         if (idUpdate) {
             post_common_service("checkOther/update", data, function(data) {
                 file_src = "";
@@ -313,6 +312,7 @@ function updateCheckTeam(id) {
         "id": id
     }
     post_common_service("checkOther/getCheckById", data, function(data) {
+        console.log(data);
         var select_road = $(".div-roadManage select").val();
         var feeList = getOrganList(select_road);
         setFeeSelectValue(feeList, "#select-dept", data.dept_id);
@@ -325,6 +325,8 @@ function updateCheckTeam(id) {
         var time = data.check_time;
         $("#month_date2").val(data.check_time);
         $("#check_num").val(data.check_num);
+        $("#select-monitor").val(data.monitor);
+        $("#select-viceMonitor").val(data.vice_monitor);
         setCheckTypeSelect('#select-check-type', data.wrecker_check_type, "wrecker_group_check_type");
         setCheckTypeSelect('#select-special-check-type', data.special_check_type, 'special_check_type');
         $("#editImage").empty();
@@ -498,7 +500,6 @@ function setPersonal(selectUserId) {
         url = "user/getWGUserList";
     }
     post_common_service(url, param, function(data) {
-        console.log(data);
         if (data.length != 0) {
             var userId;
             if (hasRole("ROLE_STATION")) {
@@ -801,7 +802,6 @@ function static() {
 
 
         post_common_service("/checkOther/getOtherCheckStatistics", p, function(data) {
-
             var names = new Array();
             var totalnamesvalue = new HashMap();
             var itemsname = "";
@@ -891,7 +891,6 @@ function static() {
 
 
         post_common_service("/checkOther/getOtherCheckStatistics", p, function(data) {
-
             var names = new Array();
             var totalnamesvalue = new HashMap();
             var itemsname = "";

VisualInspection/js/util/util.js

@@ -882,6 +882,20 @@ function getTimeByMonth(time) {
     return { starttime: starttime, endtime: endtime };
 }
 
+function getTimeByRMonth(time) {
+    var t = time.replace("/", "-") + "";
+    var endtime = moment(t + "-25 24:00:00", "YYYY-MM-DD HH:mm:ss");
+    var starttime = moment(moment(t + "-25 24:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+    return { starttime: starttime, endtime: endtime };
+}
+
+function getTimeByQMonth(time) {
+    var t = time.replace("/", "-") + "";
+    var endtime = moment(t + "-25 23:59:59", "YYYY-MM-DD HH:mm:ss");
+    var starttime = moment(moment(t + "-25 24:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+    return { starttime: starttime, endtime: endtime };
+}
+
 function getMomentTimeFormat(t) {
     return t.format("YYYY-MM-DD HH:mm:ss");
 }

VisualInspection/motorcade/js/carInfo.js

@@ -0,0 +1,159 @@
+var cur_status;
+var cur_page;
+var is_save;
+var updateid = null;
+var user = $.zui.store.get("user");
+
+
+function initTaskPage() {
+    getUser();
+    initTableRowBtn();
+    queryTask();
+}
+
+function initQueryParams() {
+    // 仅选择日期
+
+    $("#start_time").val(getCurrentTimeFormat());
+    var page_params = $.zui.store.get("page_params");
+    if (page_params && page_params.status) {
+        cur_status = page_params.status;
+    }
+
+    var checked_dept = null;
+}
+//初始化表行按钮
+function initTableRowBtn() {
+    $.zui.store.set("task_table_btn_1", [{ func: 'checkUpdate', text: '修改', icon_class: '' },
+        { func: 'deleteCarInfo', text: '删除', icon_class: 'text-center' }
+    ]);
+    $.zui.store.set("task_table_btn_2", [{ func: 'checkUpdate', text: '修改', icon_class: '' }]);
+    // $.zui.store.set("task_table_btn_2", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
+    // $.zui.store.set("task_table_btn_3", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
+    // $.zui.store.set("task_table_btn_7", [{ func: 'showContinueCheck', text: '继续稽查', icon_class: 'icon-eye-open' }]);
+    // $.zui.store.set("task_table_btn_4", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' },
+    //     { func: 'dispatchTaskById', text: '下发', icon_class: 'icon-signin' }
+    // ]);
+    // $.zui.store.set("task_table_btn_5", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' }]);
+    // $.zui.store.set("task_table_btn_6", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' }]);
+    // $.zui.store.set("task_table_btn_21", [{ func: 'showApplyDetail', text: '处理', icon_class: 'icon-hand-up' }]);
+}
+//查询任务
+function queryTask() {
+    var data = {
+        // "check_status": cur_status
+    };
+    var cols = [
+        { width: 20, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
+        { width: 80, text: '车牌号', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'car_number' },
+        { width: 80, text: '车类型', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'car_type' },
+        { width: 80, text: '驾驶员', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'driver_name' },
+       // { width: 80, text: '车类型', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'car_type' },
+    ];
+    var colFunc = { width: 40, text: '操作', type: 'string', flex: true, field: 'id', colClass: 'text-center' };
+    colFunc.oper = $.zui.store.get("task_table_btn_1");
+    cols.push(colFunc);
+    //只有下发才显示复选框
+    var checkable = false;
+    taskTableObj = $('#task_list_table').mytable({
+        'cols': cols,
+        'checkable': checkable,
+        'url': "/c/info/getall/",
+        'param': data,
+        'pager': {
+            'p_cur': cur_page
+        },
+    });
+   
+    $.zui.store.set('store_param_' + current_url, data);
+}
+
+
+function addTask() {
+    is_save = 0;
+    resert();
+    // var contenthtml =  base_ui_url+'qzd/view/task/addtask.html';
+    // document.getElementById("addrecord").href = contenthtml;
+    $('#addModal').modal('show');
+}
+
+
+
+function checkUpdate(id) {
+    console.log(id);
+    resert();
+    is_save = "_" + id;
+    var data = {
+        "id": id
+    };
+    post_common_service('c/info/getone', data, function(redata) {
+        $('#addModal').modal('show');
+        console.log(redata);
+        car_number = $("#car_number").val(redata.car_number);
+        car_type = $("#car_type").val(redata.car_type);
+        driver = $("#driver").val(redata.driver);
+    })
+}
+
+function resert() {
+    car_number = $("#car_number").val('');
+    car_type = $("#car_type").val('');
+    driver = $("#driver").val('');
+}
+
+function save(){
+    var car_number = $("#car_number").val();
+    var car_type = $("#car_type").val();
+    var driver = $("#driver").val();
+    var data ={
+        'car_number':car_number,
+        'car_type':car_type,
+        'driver':driver
+    }
+    if(is_save == 0){
+        if(driver != null && driver != ''){
+            post_common_service('c/info/add', data, function(redata) {
+                window.parent.location.reload();
+           });
+        }else{
+            alert("请选择驾驶员");
+        }
+    }else{
+        data.id = is_save.split("_")[1];
+        post_common_service('c/info/update', data, function(redata) {
+            window.parent.location.reload();
+       });
+    }
+   
+}
+
+function getUser(){
+    var userData = {
+        "organid": 102
+    }
+    UserGetList(userData, function(data) {
+        $("#driver").html('');
+        for(var index in data){
+        var html = "<option value='"+data[index].id+"'>"+data[index].truename+"</option>";
+        $("#driver").append(html);
+    }
+    });
+}
+
+function deleteCarInfo(id){
+    var data = {
+        "id": id,
+        "is_vaild":1
+    };
+    post_common_service('c/info/update', data, function(redata) {
+        window.parent.location.reload();
+   });
+}
+
+
+
+
+
+
+
+

VisualInspection/motorcade/js/carTask.js

@@ -0,0 +1,201 @@
+var cur_status;
+var cur_page;
+var is_save;
+var updateid = null;
+var user = $.zui.store.get("user");
+
+
+function initTaskPage() {
+    getCarNumber();
+    initQueryParams();
+    initTableRowBtn();
+    queryTask();
+}
+
+function initQueryParams() {
+    // 仅选择日期
+    $.jeDate("#searchTime", {
+        isinitVal: true,
+        format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+    });
+
+    var store_params = $.zui.store.get('store_param_'+current_url);
+    console.log(store_params);
+    var checked_dept = null;
+    if (store_params) {
+        $("#searchTime").val(getCurrentTimeFormat());
+        // checked_dept = store_params.checked_dept;
+        // // $("#start_time").val(store_params.end_time.substr(0, 7));
+        // $("#start_time").val(moment(store_params.start_time).add(1,"d").format("YYYY-MM-DD"));
+        // $("#end_time").val(store_params.end_time.substr(0, 11));
+        // $("#hasScoreList").val(store_params.hasScore);
+        // cur_page = store_params.currentpage;
+        // console.log(cur_page);
+    } else {
+        $("#searchTime").val(getCurrentTimeFormat());
+    }
+    var page_params = $.zui.store.get("page_params");
+    if (page_params && page_params.status) {
+        cur_status = page_params.status;
+    }
+
+    var checked_dept = null;
+}
+//初始化表行按钮
+function initTableRowBtn() {
+    $.zui.store.set("task_table_btn_1", [{ func: 'checkUpdate', text: '修改', icon_class: '' },
+        { func: 'deleteRecord', text: '删除', icon_class: 'text-center' }
+    ]);
+    $.zui.store.set("task_table_btn_2", [{ func: 'checkUpdate', text: '修改', icon_class: '' }]);
+    // $.zui.store.set("task_table_btn_2", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
+    // $.zui.store.set("task_table_btn_3", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
+    // $.zui.store.set("task_table_btn_7", [{ func: 'showContinueCheck', text: '继续稽查', icon_class: 'icon-eye-open' }]);
+    // $.zui.store.set("task_table_btn_4", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' },
+    //     { func: 'dispatchTaskById', text: '下发', icon_class: 'icon-signin' }
+    // ]);
+    // $.zui.store.set("task_table_btn_5", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' }]);
+    // $.zui.store.set("task_table_btn_6", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' }]);
+    // $.zui.store.set("task_table_btn_21", [{ func: 'showApplyDetail', text: '处理', icon_class: 'icon-hand-up' }]);
+}
+//查询任务
+function queryTask() {
+    var t = getTimeByMonth(GV("#searchTime"));
+    var data = {
+         "driver":$("#driverlist").val(),
+         "car_id":$("#carNumber").val(),
+         "startTime": getMomentTimeFormat(t.starttime),
+         "endTime": getMomentTimeFormat(t.endtime),
+    };
+    var cols = [
+        { width: 20, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
+        { width: 40, text: '乘客', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'customer_name' },
+        { width: 40, text: '驾驶员', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'driver_name' },
+        { width: 40, text: '车牌号', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'car_number' },
+        { width: 40, text: '出发时间', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'start_time' },
+        { width: 40, text: '结束时间', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'end_time' },
+        { width: 40, text: '出发地点', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'start_addr' },
+        { width: 40, text: '结束地点', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'end_addr' },
+        { width: 40, text: '里程数', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'mileage' },
+    ];
+    var colFunc = { width: 40, text: '操作', type: 'string', flex: true, field: 'id', colClass: 'text-center' };
+    colFunc.oper = $.zui.store.get("task_table_btn_1");
+    cols.push(colFunc);
+    //只有下发才显示复选框
+    var checkable = false;
+    taskTableObj = $('#task_list_table').mytable({
+        'cols': cols,
+        'checkable': checkable,
+        'url': "/c/task/getall/",
+        'param': data,
+        'pager': {
+            'p_cur': cur_page
+        },
+    });
+    $.zui.store.set('store_param_'+current_url, data);
+     var store_params = $.zui.store.get('store_param_'+current_url);
+     console.log(store_params);
+    
+}
+
+
+function addTask() {
+    is_save = 0;
+    resert();
+    // var contenthtml =  base_ui_url+'qzd/view/task/addtask.html';
+    // document.getElementById("addrecord").href = contenthtml;
+    $('#addModal').modal('show');
+}
+
+
+
+function checkUpdate(id) {
+    resert();
+    is_save = "_" + id;
+    var data = {
+        "id": id
+    };
+    post_common_service('c/task/getone', data, function(redata) {
+        i=0;
+        $("#peopleHead").hide();
+        $('#townsman').html("");
+        $('#addModal').modal('show');
+        $("#car_number").val(redata.car_id);
+        $("#start_addr").val(redata.start_addr);
+        $("#end_addr").val(redata.end_addr);
+        $("#driver").val(redata.driver);
+        $("#dept100").val(redata.send_dept);
+        $("#start_time").val(redata.start_time)
+        $("#end_time").val(redata.end_time)
+        // moment($("#start_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        getUser(100,redata.send_car_people);
+        $("#dept0").val(redata.dept);
+        getUser(0,redata.customer);
+        $("#oil").val(redata.oil);
+        $("#start_mileage").val(redata.start_mileage);
+        $("#end_mileage").val(redata.end_mileage);
+        $("#mileage").val(redata.mileage);
+        $("#customer").val(redata.customer);
+        $("#reason").val(redata.reason);
+        //redata.with_man.split(",");
+        if(redata.with_man != 'undefined' && redata.with_man.length>1){
+           var obj = redata.with_man.split(",");
+           for(var j=0;j<obj.length;j++){
+            addPerson(redata.with_dept.split(",")[j],obj[j]);
+           }
+        }
+        //console.log(redata.with_man.split(","));
+    })
+}
+
+
+function resert() {
+    $("#car_number").val('');
+    $("#start_addr").val('');
+    $("#end_addr").val('');
+    $("#driver").val('');
+    $("#dept100").val('');
+    $("#dept0").val('');
+    $("#deptpeople0").val('');
+    $("#deptpeople100").val('');
+    $("#oil").val('');
+    $("#mileage").val('');
+    $("#customer").val('');
+    $("#reason").val('');
+}
+
+function getCarNumber(){
+   var data ={
+
+   };
+    post_common_service('/c/info/getall/0/0', data, function(redata) {
+        $("#car_number").html('');
+        $("#carNumber").html("");
+        $("#carNumber").append("<option value=''>全部</option>");
+        for(var index in redata){
+        var html = "<option value='"+redata[index].id+"'>"+redata[index].car_number+"</option>";
+        $("#car_number").append(html);
+        $("#carNumber").append(html);
+    }
+    });
+}
+
+function deleteRecord(id){
+    var data ={
+        "id":id
+    }
+    post_common_service('/c/task/delete', data, function(redata) {
+        window.parent.location.reload();
+    });
+}
+
+
+
+
+
+
+
+
+
+
+
+

VisualInspection/motorcade/js/car_collection.js

@@ -0,0 +1,168 @@
+var lianyungang_Station = new Array;
+var yancheng_Station = new Array;
+var nantong_Station = new Array;
+var r1 = new Array();
+var r2 = new Array();
+var r3 = new Array();
+var rank = new Array();
+var qzdPeople;
+var qzdCheckPeople;
+var qzdCheck;
+var qzdRecord;
+/**
+ * 点击查询
+ */
+function queryTypeClick() {
+    //每次点击前清空表格数据
+    $(".table-tbody").empty('');
+    var t = getTimeByMonth($("#start-time").val());
+    var start_date = getMomentTimeFormat(t.starttime);
+    var end_date = getMomentTimeFormat(t.endtime);
+   
+    var param = {
+        // "dept_id": $("#fsList").val(),
+        "start_time": start_date,
+        "end_time": end_date,
+    }
+    var url = "c/collection/getCarList";
+    var strTbody = '';
+    post_common_service(url, param, function(data) {
+        console.log(data);
+        // 运营管理综合检查情况
+        check_operation_avg(data);
+    }, function(error) {
+        return "";
+    });
+}
+
+/**
+ * 表格初始化
+ */
+function initQueryType() {
+    var t = getTimeByMonth($("#start-time").val());
+    var start_date = getMomentTimeFormat(t.starttime);
+    var end_date = getMomentTimeFormat(t.endtime);
+    var param = {
+        "start_time": start_date,
+        "end_time": end_date,
+    }
+    // var url = "q/statistics/operation/manage/integration";
+    var url = "c/collection/getCarList";
+    var strTbody = '';
+
+    post_common_service(url, param, function(data) {
+        console.log(data);
+        // 运营管理综合检查情况
+        check_operation_avg(data);
+    }, function(error) {
+        return "";
+    });
+
+}
+
+/**
+ * 表格拼接及数据传入
+ * @param {*} data
+ * @param {*} i
+ * @param {*} avg
+ */
+function gethtml(data, i, avg, lists) {
+    var strTbody = "";
+    var i= i+1;
+    var avgOil = (data.oil/(data.end_mileage-data.start_mileage)*100).toFixed(2);
+    strTbody += "<tr width='100%'><td width='8%'>" + i + "</td>";
+    strTbody += "<td width='8%'>" + data.car_number + "</td><td width='8%'>" + data.driver_name + "</td><td width='8%'>" + data.car_type + "</td><td width='8%'>" + data.end_mileage +
+        "</td><td width='8%'>" + data.start_mileage + "</td><td width='8%'>" + (data.end_mileage-data.start_mileage) +"<td width='8%'>" + data.oil + "</td>"+"<td width='8%'>" + avgOil + "</td>"+
+        "</td><td width='8%'>" + data.maintenance_cost + "</td><td width='20%'>" + data.remark +
+        "</td>";
+    strTbody += "</tr>";
+    return strTbody;
+}
+
+function getTotalHtml(data) {
+    var avg = (qzdCheck/qzdCheckPeople).toFixed(0);
+    var html = "<tr><td>合计</td><td></td><td width='8%'>" + qzdPeople + "</td><td width='8%'>" + qzdCheckPeople + "</td><td>" + qzdRecord + "</td><td>" + qzdCheck + "</td><td>" + "/" + "</td><td>" + data.totalCompanyScore + "</td><td>" +
+        "1" + "</td><td>" + data.totalThirdScore + "</td><td>" + "1" + "</td><td>" + data.totalOnsiteScore +
+         "</td><td>-</td><td>-</td></tr>";
+    return html;
+}
+
+/**
+ * 管道中心受检人平均每人次扣分
+ * @param {*} data
+ */
+function check_operation_avg(data) {
+    var list = data;
+    var dataArray = new Array();
+    var sum = 0;
+    var sum1 = 0;
+    // for (k = 0; k < list.length; k++) {
+    //     sum = parseFloat(sum) + parseFloat(list[k].check_total_avg);
+    //     sum1++;
+    //     if (k == 6) {
+    //         dataArray.push(filterJudge(sum, sum1));
+    //         sum = 0;
+    //         sum1 = 0;
+    //     }
+    //     if (k == 12) {
+    //         dataArray.push(filterJudge(sum, sum1));
+    //         sum = 0;
+    //         sum1 = 0;
+    //     }
+    //     if (k == 20) {
+    //         dataArray.push(filterJudge(sum, sum1));
+    //         sum = 0;
+    //         sum1 = 0;
+    //     }
+    // }
+    for (i = 0; i < list.length; i++) {
+        $(".table-tbody").append(gethtml(list[i], i, dataArray[0], null));
+    }
+    //$(".table-tbody").append(getTotalHtml(data));
+}
+
+/**
+ * 过滤undefined
+ * @param {*} value
+ * @param {*} default_display_value
+ */
+function filter(value, default_display_value) {
+    if (value != '' && value != undefined) {
+        return value;
+    } else if (default_display_value != undefined) {
+        return default_display_value;
+    } else {
+        return "";
+    }
+}
+
+/**
+ * 过滤除数为0和保留二位小数时出现的0.00
+ * @param {*} value
+ * @param {*} default_display_value
+ */
+function filterByZeroHandle(value, default_display_value) {
+    if (isNaN(value)) {
+        return default_display_value;
+    } else {
+        if ((value + '').endsWith('.00')) {
+            return value.substring(0, value.length - 3);
+        }
+        return value;
+    }
+}
+
+function filterJudge(num1, num2) {
+    if (num2 == 0) {
+        return 0;
+    } else {
+        return (num1 / num2).toFixed(2);
+    }
+}
+
+function exportExcel() {
+    var t = getTimeByMonth($("#start-time").val());
+    var start_date = getMomentTimeFormat(t.starttime);
+    var end_date = getMomentTimeFormat(t.endtime);
+    window.open(getQzdExcelServeraddr() + "q/file/car/excel?start_date=" + start_date + "&end_date=" + end_date);
+}

VisualInspection/motorcade/js/maintenanceInfo.js

@@ -0,0 +1,195 @@
+var cur_status;
+var cur_page;
+var is_save;
+var updateid = null;
+var user = $.zui.store.get("user");
+
+
+function initTaskPage() {
+    laydate.render({
+        elem: '#maintenance_time',
+        type: 'datetime',
+        format: 'yyyy-MM-dd HH:mm'
+    });
+    initQueryParams();
+    getCarNumber();
+    getUser();
+    initTableRowBtn();
+    queryTask();
+}
+
+function initQueryParams() {
+    $.jeDate("#searchTime", {
+        isinitVal: true,
+        format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+    });
+    $("#searchTime").val(getCurrentTimeFormat());
+    var page_params = $.zui.store.get("page_params");
+    if (page_params && page_params.status) {
+        cur_status = page_params.status;
+    }
+
+    var checked_dept = null;
+}
+//初始化表行按钮
+function initTableRowBtn() {
+    $.zui.store.set("task_table_btn_1", [{ func: 'checkUpdate', text: '修改', icon_class: '' },
+        { func: 'deleteMaintenance', text: '删除', icon_class: 'text-center' }
+    ]);
+    $.zui.store.set("task_table_btn_2", [{ func: 'checkUpdate', text: '修改', icon_class: '' }]);
+    // $.zui.store.set("task_table_btn_2", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
+    // $.zui.store.set("task_table_btn_3", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
+    // $.zui.store.set("task_table_btn_7", [{ func: 'showContinueCheck', text: '继续稽查', icon_class: 'icon-eye-open' }]);
+    // $.zui.store.set("task_table_btn_4", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' },
+    //     { func: 'dispatchTaskById', text: '下发', icon_class: 'icon-signin' }
+    // ]);
+    // $.zui.store.set("task_table_btn_5", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' }]);
+    // $.zui.store.set("task_table_btn_6", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' }]);
+    // $.zui.store.set("task_table_btn_21", [{ func: 'showApplyDetail', text: '处理', icon_class: 'icon-hand-up' }]);
+}
+//查询任务
+function queryTask() {
+    var car_id = $("#carNumber").val();
+    var maintenance_type = $("#maintenance_type").val();
+    var t = getTimeByMonth(GV("#searchTime"));
+    var data = {
+        "car_id":car_id,
+        "start_time": getMomentTimeFormat(t.starttime),
+        "end_time": getMomentTimeFormat(t.endtime),
+        "maintenance_type":maintenance_type
+    };
+    ///console.log(data);
+    var cols = [
+        { width: 20, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
+        { width: 80, text: '时间', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'maintenance_time' },
+        { width: 80, text: '类型', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'type_name' },
+        { width: 80, text: '数值', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'number_type' },
+        { width: 80, text: '车牌号', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'car_number' },
+        { width: 80, text: '备注', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'remark' },
+       // { width: 80, text: '车类型', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'car_type' },
+    ];
+    var colFunc = { width: 40, text: '操作', type: 'string', flex: true, field: 'id', colClass: 'text-center' };
+    colFunc.oper = $.zui.store.get("task_table_btn_1");
+    cols.push(colFunc);
+    //只有下发才显示复选框
+    var checkable = false;
+    taskTableObj = $('#task_list_table').mytable({
+        'cols': cols,
+        'checkable': checkable,
+        'url': "/c/maintenance/getall/",
+        'param': data,
+        'pager': {
+            'p_cur': cur_page
+        },
+    });
+   
+    $.zui.store.set('store_param_' + current_url, data);
+}
+
+
+function addTask() {
+    is_save = 0;
+    resert();
+    // var contenthtml =  base_ui_url+'qzd/view/task/addtask.html';
+    // document.getElementById("addrecord").href = contenthtml;
+    $('#addModal').modal('show');
+}
+
+
+
+function checkUpdate(id) {
+    console.log(id);
+    resert();
+    is_save = "_" + id;
+    var data = {
+        "id": id
+    };
+    post_common_service('c/maintenance/getone', data, function(redata) {
+        $('#addModal').modal('show');
+        console.log(redata);
+         $("#maintenance_number").val(redata.maintenance_number);
+         $("#maintenance_type").val(redata.maintenance_type);
+         $("#car_id").val(redata.car_id);
+         $("#remark").val(redata.remark);
+         $("#maintenance_time").val(redata.maintenance_time);
+    })
+}
+
+function resert() {
+     $("#maintenance_type").val(1);
+     $("#maintenance_number").val('');
+     $("#car_id").val('');
+     $("#maintenance_time").val('');
+     $("#remark").val('');
+}
+
+function save(){
+    var car_id = $("#car_id").val();
+    var maintenance_type = $("#maintenance_type").val();
+    var maintenance_time = moment($("#maintenance_time").val()).format("YYYY-MM-DD HH:mm:ss")
+    var maintenance_number = $("#maintenance_number").val();
+    var remark = $("#remark").val();
+    var data ={
+        'car_id':car_id,
+        'maintenance_type':maintenance_type,
+        'maintenance_time':maintenance_time,
+        "maintenance_number":maintenance_number,
+        "remark":remark
+    }
+    if(is_save == 0){
+        post_common_service('c/maintenance/add', data, function(redata) {
+            window.parent.location.reload();
+       });
+    }else{
+        data.id = is_save.split("_")[1];
+        post_common_service('c/maintenance/update', data, function(redata) {
+            window.parent.location.reload();
+       });
+    }
+   
+}
+
+function getUser(){
+    var userData = {
+        "organid": 102
+    }
+    UserGetList(userData, function(data) {
+        $("#driver").html('');
+        for(var index in data){
+        var html = "<option value='"+data[index].id+"'>"+data[index].truename+"</option>";
+        $("#driver").append(html);
+    }
+    });
+}
+
+function getCarNumber(){
+    var data ={
+ 
+    };
+     post_common_service('/c/info/getall/0/0', data, function(redata) {
+         $("#car_id").html('');
+         $("#carNumber").html("");
+         $("#carNumber").append("<option value=''>全部</option>");
+         for(var index in redata){
+         var html = "<option value='"+redata[index].id+"'>"+redata[index].car_number+"</option>";
+         $("#car_id").append(html);
+         $("#carNumber").append(html);
+     }
+     });
+ }
+
+function deleteMaintenance(id){
+    var data = {
+        "id": id,
+        "is_vaild":1
+    };
+    post_common_service('c/maintenance/update', data, function(redata) {
+        window.parent.location.reload();
+   });
+}
+
+
+
+
+
+

VisualInspection/motorcade/view/addCar.html

@@ -0,0 +1,27 @@
+<div class="container-fluid ">
+    <form class="form-horizontal">
+        <div class="form-group">
+        </div>
+        <div class="form-group">
+            <label for="exampleInputAccount4" class="col-md-4 col-sm-2">车牌号</label>
+            <div class="col-md-6 col-sm-10">
+            <input type="text" class="form-control" id="car_number" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="exampleInputPassword4" class="col-md-4 col-sm-2">车类型</label>
+            <div class="col-md-6 col-sm-10">
+            <input type="text" class="form-control" id="car_type" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="exampleInputPassword4" class="col-md-4 col-sm-2">驾驶员</label>
+            <div class="col-md-6 col-sm-10">
+                <select class="form-control" id="driver" >
+                </select>
+        </div>
+        <div class="form-group" style="margin-top:50px;float: right;margin-right: 40px">
+            <button class="btn btn-info2 col-xs-1" style="height:40px;width:90px;" type="button" onclick="save()">保存</button>
+        </div>
+    </form>
+</div>

VisualInspection/motorcade/view/addMaintenance.html

@@ -0,0 +1,39 @@
+<div class="container-fluid ">
+    <form class="form-horizontal">
+        <div class="form-group">
+        </div>
+        <div class="form-group">
+            <!-- <label for="exampleInputAccount4" class="col-md-4 col-sm-2">车牌号</label> -->
+            <div class="col-md-4 col-sm-2">
+                <select class="form-control" id="maintenance_type" >
+                    <option value="1">耗油(L)</option>
+                    <option value="2">维保(元)</option>
+                </select>
+            </div>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="maintenance_number" placeholder="">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="exampleInputPassword4" class="col-md-4 col-sm-2">车牌号:</label>
+            <div class="col-md-6 col-sm-10">
+                <select class="form-control" id="car_id" >
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="exampleInputPassword4" class="col-md-4 col-sm-2">时间:</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" style="width:100%;" id="maintenance_time" class="form-control">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="exampleInputPassword4" class="col-md-4 col-sm-2">备注:</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" style="width:100%;" id="remark" class="form-control">
+        </div>
+        <div class="form-group" style="margin-top:50px;float: right;margin-right: 40px">
+            <button class="btn btn-info2 col-xs-1" style="height:40px;width:90px;" type="button" onclick="save()">保存</button>
+        </div>
+    </form>
+</div>

VisualInspection/motorcade/view/addcarTask.html

@@ -4,138 +4,119 @@
     }
 </style>
 <div class="form-group" style="margin:0px;vertical-align: middle">
+    <div class="row">
     <div class="form-group col-xs-5">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">清障情况：</label>
+        <label for="exampleInputAccount1" class="col-xs-3" style="text-align: left;padding:0">部门：</label>
         <div class="col-xs-8">
-            <select class="form-control" id="type">
-                            <option value="1">抛锚</option>
-                            <option value="2">事故</option>
+            <select class="form-control" id="dept0" onchange="getUser(0)">
                         </select>
         </div>
     </div>
-    <div class="form-group col-xs-7">
-        <label for="exampleInputAccount1" class="col-xs-4">车牌号：</label>
-        <div class="col-xs-8">
-            <input type="text" id="carinfo" class="form-control form-date" placeholder="">
-        </div>
-    </div>
-</div>
-<div class="form-group">
     <div class="form-group col-xs-5">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding: 0px">接报时间：</label>
+        <label for="exampleInputAccount1" class="col-xs-3">用车人：</label>
         <div class="col-xs-8">
-            <input type="text" style="width:100%;" id="received_time" class="form-control">
+            <select class="form-control" id="deptpeople0" >
+            </select>
         </div>
-    </div>
-    <div class="form-group col-xs-7">
-        <label for="exampleInputAccount1" class="col-xs-4">客户信息：</label>
-        <div class="col-xs-8">
-            <input type="text" id="carUserinfo" class="form-control form-date" placeholder="">
+        <div onclick="addPerson()">
+                <i class="icon icon-plus-sign" style="font-size: 25px"></i>
         </div>
     </div>
+    </div>
 </div>
-<div class="form-group" style="margin:0px;">
-    <div class="form-group col-xs-5">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">清障队：</label>
-        <div class="col-xs-8">
-            <select class="form-control" id="dept" onchange="setRecordUser()">
-                                </select>
-        </div>
+<div style="display:none;text-align: left;padding:0;font-size: 13px;font-weight: 700" id="peopleHead">
+    添加同乘人
+</div>
+<div class="form-group" style="margin:0px;vertical-align: middle" id="townsman">
+      
     </div>
-    <div class="form-group col-xs-7">
-        <label for="exampleInputAccount1" class="col-xs-4">出勤人员：</label>
-        <div class="col-xs-8">
-            <input type="text" id="recordUser" class="form-control" placeholder="请选择出勤人员" autocomplete="off">
+<div class="form-group">
+    <div class="row">
+        <div class="form-group col-xs-5">
+            <label for="exampleInputAccount1" class="col-xs-3" style="text-align: left;padding:0">驾驶员：</label>
+            <div class="col-xs-8">
+                <select class="form-control" id="driver" >
+                </select>
+            </div>
         </div>
-    </div>
-</div>
-<div class="form-group" style="margin:0px;">
-    <div class="form-group col-xs-5">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">发生方向：</label>
-        <div class="col-xs-8">
-            <input type="text" style="width:100%;" id="direction" class="form-control">
+        <div class="form-group col-xs-5">
+            <label for="exampleInputAccount1" class="col-xs-3">车牌号：</label>
+            <div class="col-xs-8">
+                    <select class="form-control" id="car_number" >
+                        </select>
+            </div>
         </div>
-    </div>
-    <div class="form-group col-xs-7">
-        <label for="" class="col-xs-4">桩号：</label>
-        <div class="col-xs-6">
-            <input type="text" style="width:100%;" id="addr" class="form-control">
         </div>
-    </div>
 </div>
-<div class="form-group" style="margin:0px;">
-    <div class="form-group col-xs-5">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">到达现场时间：</label>
-        <div class="col-xs-8">
-            <input type="text" style="width:100%;" id="arrive_time" class="form-control">
+<div class="form-group">
+    <div class="row">
+        <div class="form-group col-xs-5">
+            <label for="exampleInputAccount1" class="col-xs-3" style="text-align: left;padding:0">出发时间： </label>
+            <div class="col-xs-8">
+                <input type="text" style="width:100%;" id="start_time" class="form-control">
+            </div>
+        </div>
+        <div class="form-group col-xs-5">
+            <label for="exampleInputAccount1" class="col-xs-3">结束时间：</label>
+            <div class="col-xs-8">
+                <input type="text" style="width:100%;" id="end_time" class="form-control">
+            </div>
         </div>
-    </div>
-    <div class="form-group col-xs-7">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">离场时间：</label>
-        <div class="col-xs-6">
-            <input type="text" style="width:100%;" id="back_time" class="form-control">
         </div>
-    </div>
 </div>
-<!-- <div class="form-group" style="margin:0px;">
-    <div class="form-group col-xs-5">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">离场时间：</label>
-        <div class="col-xs-8">
-            <input type="text" style="width:100%;" id="back_time" class="form-control" autocomplete="off">
+<div class="form-group">
+    <div class="row">
+        <div class="form-group col-xs-5">
+            <label for="exampleInputAccount1" class="col-xs-3" style="text-align: left;padding:0">出发地点： </label>
+            <div class="col-xs-8">
+                <input type="text" style="width:100%;" id="start_addr" class="form-control">
+            </div>
         </div>
-    </div> -->
-    <div class="form-group col-xs-5">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">是否放空：</label>
-        <div class="col-xs-6">
-            <select class="form-control" id="isApply">
-                <option value="0">否</option>
-                <option value="1">是</option>
-        </select>
+        <div class="form-group col-xs-5">
+            <label for="exampleInputAccount1" class="col-xs-3">结束地点：</label>
+            <div class="col-xs-8">
+                <input type="text" style="width:100%;" id="end_addr" class="form-control">
+            </div>
         </div>
-    </div>
-    <div class="form-group col-xs-7">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">客户满意度：</label>
-        <div class="col-xs-6">
-            <select class="form-control" id="car_user_satisfaction">
-                <option value="1">非常满意</option>
-                <option value="2">满意</option>
-                <option value="3">不满意</option>
-        </select>
         </div>
-    </div>
-    <div style="color: red">
-           备注：发生方向和放空暂时未启用，不需要填写。
-    </div>
-<!-- </div> -->
-<!-- <div class="form-group" style="margin:0px;">
-    <div class="form-group col-xs-5">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">施救时间：</label>
-        <div class="col-xs-8">
-            <input type="text" style="width:100%;" id="rescue_time" class="form-control">
+</div>
+<div class="form-group">
+    <div class="row">
+        <div class="form-group col-xs-5">
+            <label for="exampleInputAccount1" class="col-xs-3" style="text-align: left;padding:0">出发前里程数： </label>
+            <div class="col-xs-8">
+                <input type="text" style="width:100%;" id="start_mileage" class="form-control">
+            </div>
         </div>
-    </div>
-    <div class="form-group col-xs-7">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">离场时间：</label>
-        <div class="col-xs-6">
-            <input type="text" style="width:100%;" id="back_time" class="form-control">
+        <div class="form-group col-xs-5">
+            <label for="exampleInputAccount1" class="col-xs-3">结束后里程数：</label>
+            <div class="col-xs-8">
+                <input type="text" style="width:100%;" id="end_mileage" class="form-control">
+            </div>
         </div>
-    </div>
-</div> -->
-<!-- <div class="form-group" style="margin:0px;">
-    <div class="form-group col-xs-5">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">解脱时间：</label>
-        <div class="col-xs-8">
-            <input type="text" style="width:100%;" id="relief_time" class="form-control">
         </div>
-    </div>
-    <div class="form-group col-xs-7">
-        <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">回场时间：</label>
-        <div class="col-xs-6">
-            <input type="text" style="width:100%;" id="backfield_time" class="form-control">
+</div>
+<div class="form-group">
+    <div class="row">
+        <div class="form-group col-xs-5">
+            <label for="exampleInputAccount1" class="col-xs-3" style="text-align: left;padding:0">派车单位 </label>
+            <div class="col-xs-8">
+                <select class="form-control" id="dept100" onchange="getUser(100)">
+                </select>
+            </div>
         </div>
-    </div>
-</div> -->
+        <div class="form-group col-xs-5">
+            <label for="exampleInputAccount1" class="col-xs-3">派车人</label>
+            <div class="col-xs-8">
+                <select class="form-control" id="deptpeople100">
+                </select>
+            </div>
+        </div>
+        </div>
+</div>
 <div class="form-group" style="margin:0px;">
+        <label for="exampleInputAccount1" class="col-xs-2" style="text-align: left;padding:0">用车事由： </label>
+        <textarea id="reason" class="col-xs-6 form-control" rows="6" cols="25"></textarea>
 </div>
 <div class="form-group" style="margin-top:50px;float: right;margin-right: 40px">
     <button class="btn btn-info2 col-xs-1" style="height:40px;width:90px;" type="button" onclick="save()">保存</button>
@@ -144,157 +125,163 @@
 </form>
 </div>
 <script>
-    var selectRecord;
-    var arrive = 30;
-    var back = 60;
+    var i =0;
+    var deptobj = '';
+    getdept(0);
+    getdept(100);
+    getcd();
     laydate.render({
-        elem: '#received_time',
+        elem: '#start_time',
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm'
     });
-    // laydate.render({
-    //     elem: '#delivery_time',
-    //     type: 'datetime',
-    //     format: 'yyyy-MM-dd HH:mm'
-    // });
-    // laydate.render({
-    //     elem: '#accept_time',
-    //     type: 'datetime',
-    //     format: 'yyyy-MM-dd HH:mm'
-    // });
-    // laydate.render({
-    //     elem: '#startTime',
-    //     type: 'datetime',
-    //     format: 'yyyy-MM-dd HH:mm'
-    // });
-    laydate.render({
-        elem: '#arrive_time',
-        type: 'datetime',
-        format: 'yyyy-MM-dd HH:mm'
-    });
-    // laydate.render({
-    //     elem: '#rescue_time',
-    //     type: 'datetime',
-    //     format: 'yyyy-MM-dd HH:mm'
-    // });
 
-    laydate.render({
-        elem: '#back_time',
+        laydate.render({
+        elem: '#end_time',
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm'
     });
-    // laydate.render({
-    //     elem: '#relief_time',
-    //     type: 'datetime',
-    //     format: 'yyyy-MM-dd HH:mm'
-    // });
-    // laydate.render({
-    //     elem: '#backfield_time',
-    //     type: 'datetime',
-    //     format: 'yyyy-MM-dd HH:mm'
-    // });
-
-    setRecordUser();
 
-    function changestatus() {
-        // $("#status").html("到达");
-
-    }
-
-    function setRecordUser() {
-        var dept = $("#dept").val();
+    function getcd(){
+        $("#driverlist").append("<option value=''>全部</option>");
+        //var dept = $("#dept"+i).val();
         var userData = {
-            "organid": dept
+            "organid": 102
         }
         UserGetList(userData, function(data) {
-            console.log(data);
-            var nameArray = new Array();
-            for (var index in data) {
-                var p = data[index];
-                p.title = p.truename;
-                nameArray.push(p.title);
-            }
-var resultArray = nameArray.sort(
-    function compareFunction(param1, param2) {
-        return param1.localeCompare(param2,"zh");
-    }
-);
-var objArray = new Array();
-for(var i in resultArray){
-    for(var j in data){
-       if(data[j].title == resultArray[i]){
-             var obj = {
-                 'title':resultArray[i],
-                 "id":data[j].id
-             };
-             objArray.push(obj);
-       }
+            $("#deptpeople"+i).html('');
+            for(var index in data){
+            var html = "<option value='"+data[index].id+"'>"+data[index].truename+"</option>";
+            $("#driver").append(html);
+            $("#driverlist").append(html);
+        }
+        });
     }
-}
-//console.log(objArray);
-            if (selectRecord != null) {
-                $("#recordUser").val("");
-                selectRecord.unbind();
-                selectRecord.options = {
-                    source: objArray,
-                    isMultiple: true
-                };
-                selectRecord.closeDropDownMenu();
-                selectRecord.init();
-                $(".ComboTreeItemChlid").find("input").prop('checked', false);
-            } else {
-                selectRecord = $('#recordUser').comboTree({
-                    source: data,
-                    isMultiple: true
-                });
+
+    function getdept(number,deptid){
+        //debugger;
+        if(deptobj.length > 0){
+            data = deptobj;
+            for(var index in data){
+            if(data[index].id == deptid){
+                var html = "<option selected='selected' value='"+data[index].id+"'>"+data[index].organname+"</option>"
+            }else{
+                var html = "<option value='"+data[index].id+"'>"+data[index].organname+"</option>"
             }
-        });
+            $("#dept"+number).append(html)
+        }
+        }else{
+        get_common_service('/dept/getCarDept',null,function(data) {
+        for(var index in data){
+            deptobj = data;
+            if(data[index].id == deptid){
+                var html = "<option selected='selected' value='"+data[index].id+"'>"+data[index].organname+"</option>"
+            }else{
+                var html = "<option value='"+data[index].id+"'>"+data[index].organname+"</option>"
+            }
+            $("#dept"+number).append(html)
+        }
+            });
+        }
     }
 
-function setRecordUserID(usersid) {
-    console.log(usersid);
-        var dept = $("#dept").val();
+    function getUser(number,uid){
+        console.log(uid);
+        var dept = $("#dept"+number).val();
         var userData = {
             "organid": dept
         }
         UserGetList(userData, function(data) {
-            console.log(data);
-            for (var index in data) {
-                var p = data[index];
-                p.title = p.truename;
-            }
-            if (selectRecord != null) {
-                $("#recordUser").val("");
-                selectRecord.unbind();
-                selectRecord.options = {
-                    source: data,
-                    isMultiple: true
-                };
-                selectRecord.closeDropDownMenu();
-                selectRecord.init();
-                $(".ComboTreeItemChlid").find("input").prop('checked', false);
-            } else {
-                selectRecord = $('#recordUser').comboTree({
-                    source: data,
-                    isMultiple: true
-                });
-            }
-            for (var i in usersid) {
-                $('span[data-id="' + usersid[i] + '"] input').click();
+            $("#deptpeople"+number).html('');
+            var html;
+            for(var index in data){
+                html = "<option value='"+data[index].id+"'>"+data[index].truename+"</option>";
+            if(uid != undefined && uid == data[index].id){
+                html = "<option selected='selected' value='"+data[index].id+"'>"+data[index].truename+"</option>";
             }
+            $("#deptpeople"+number).append(html);
+        }
         });
     }
-
     function save() {
+        var with_man = '';
+        var with_dept ='';
+        var dept = $("#dept0").val();
+        var deptpeople = $("#deptpeople0").val();
+        var car_number = $("#car_number").val();
+        var start_addr = $("#start_addr").val();
+        var end_addr = $("#end_addr").val();
+        var start_time = moment($("#start_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        var end_time = moment($("#end_time").val()).format("YYYY-MM-DD HH:mm:ss");
+        var start_mileage = $("#start_mileage").val();
+        var end_mileage = $("#end_mileage").val();
+        var mileage = end_mileage-start_mileage;
+        var reason = $("#reason").val();
+        var oil = $("#oil").val();
+        var driver = $("#driver").val();
+        var send_car_people = $("#deptpeople100").val();
+        if(i > 0){
+            for(var n= 1;n<i+1;n++){
+                if(n == 1){
+                    with_dept =$("#dept"+n).val();
+                    with_man = $("#deptpeople"+n).val();
+                }else{
+                    with_dept += ","+$("#dept"+n).val();
+                    with_man += ","+$("#deptpeople"+n).val();
+                }
+            }
+        }
         var data = {
-            "customer":"郭亮",
-            "car_number":"苏A89999",
-            "driver":200,
-            "id":1
+            "with_dept":with_dept,
+            "with_man":with_man,
+            "customer":deptpeople,
+            "car_id":car_number,
+            "driver":driver,
+            "start_addr":start_addr,
+            "end_addr":end_addr,
+             "end_time":end_time,
+             "start_time":start_time,
+            "mileage":mileage,
+            "end_mileage":end_mileage,
+            "start_mileage":start_mileage,
+            "oil":oil,
+            "send_car_people":send_car_people,
+            "dept":dept,
+            "reason":reason
         }  
-  
+        if(is_save == 0){
+            post_common_service('c/task/add', data, function(redata) {
+                  window.parent.location.reload();
+            });
+        }else{
+            data.id = is_save.split("_")[1];
             post_common_service('c/task/update', data, function(redata) {
-                // window.parent.location.reload();
+                  window.parent.location.reload();
             });
+        }
+    }
+
+    function addPerson(deptid,uid){
+        i++;
+        $("#peopleHead").show();
+        var html= '<div class="row">'+
+                   '<div class="form-group col-xs-5">'+
+                        '<label for="exampleInputAccount1" class="col-xs-3" style="text-align: left;padding:0">部门：</label>'+
+                        '<div class="col-xs-8">'+
+                            '<select class="form-control" id="dept'+i+'" onchange="getUser(\''+i+'\')">'+
+                                        '</select>'+
+                       '</div>'+
+                    '</div>'+
+                    '<div class="form-group col-xs-5">'+
+                        '<label for="exampleInputAccount1" class="col-xs-3">乘车人：</label>'+
+                        '<div class="col-xs-8">'+
+                           '<select class="form-control" id="deptpeople'+i+'">'+
+                           '</select>'+
+                       '</div>'+
+                    '</div>'+
+                    '</div>';
+         $("#townsman").append(html);
+         getdept(i,deptid);    
+         getUser(i,uid);          
     }
 </script>

VisualInspection/motorcade/view/carInfo.html

@@ -0,0 +1,54 @@
+<script src="/js/statistics/common_statistic.js?__inline"></script>
+<script src="/motorcade/js/carInfo.js"></script>
+<style>
+    .button_new {
+        width: 50px
+    }
+</style>
+<div class="container-fluid ">
+    <div class="row">
+        <form class="form-horizontal" style="margin:0px;">
+            <div class="form-group" style="margin:0px;">
+                <!-- <div class="form-group col-sm-3" id="isCompleteDiv">
+                    <label for="exampleInputAccount1" class="col-sm-4">车牌号：</label>
+                    <div class="col-sm-8">
+                        <select class="form-control" id="carNumber">
+                        </select>
+                    </div>
+                </div> -->
+                <!-- <div class="form-group col-sm-2">
+                    <button class="btn btn-info2 col-sm-1" style="width:80px;" type="button" onclick="queryTask()" style="">查询</button>
+                </div> -->
+                <div class="form-group col-sm-1" style="float: right">
+                    <button id="saveButton" class="btn btn-info2 col-sm-1" style="width:90px;" type="button" onclick="addTask()">新增</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <hr style="margin-top:0px;">
+
+    <div class="datatable" id="task_list_table"></div>
+</div>
+<script>
+    $(document).ready(function() {
+        initTaskPage();
+    });
+</script>
+
+<div class="modal fade" id="addModal" style="height: 800px">
+    <div class="modal-dialog" style="width:400px">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
+                <h4 class="modal-title"><span id="modalTitle">新增用车记录<span></h4>
+            </div>
+            <div class="modal-body">
+                <link id="addrecord" rel="import" href="/motorcade/view/addCar.html?__inline">
+                <!-- <link id="addrecord" rel="import" href="/motorcade/view/addMaintenance.html?__inline"> -->
+            </div>
+            <div class="modal-footer" style="border-color: white">
+                <!-- <button type="button" id="dept_add_btn" class="btn btn-primary" onclick="addDept()">添加</button> -->
+            </div>
+        </div>
+    </div>
+</div>

VisualInspection/motorcade/view/carTask.html

@@ -1,5 +1,5 @@
 <script src="/js/statistics/common_statistic.js?__inline"></script>
-<script src="/qzd/js/task/new.js"></script>
+<script src="/motorcade/js/carTask.js"></script>
 <style>
     .button_new {
         width: 50px
@@ -10,42 +10,30 @@
         <form class="form-horizontal" style="margin:0px;">
             <div class="form-group" style="margin:0px;">
                 <div class="form-group col-sm-2">
-                    <label for="exampleInputAccount1" class="col-sm-4" style="text-align: left;padding-right:0">时间：</label>
-                    <div class="col-sm-8">
-                        <input type="text" id="start_time" class="form-control form-date" placeholder="选择周期">
-                    </div>
+                        <label for="exampleInputAccount1" class="col-sm-4" style="text-align: left;padding-right:0">时间：</label>
+                        <div class="col-sm-8">
+                            <input type="text" id="searchTime" class="form-control form-date" placeholder="选择周期">
+                        </div>
                 </div>
-                <div class="form-group col-sm-2">
-                    <label for="exampleInputAccount1" class="col-sm-4">部门：</label>
+                <div class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="col-sm-4">驾驶员：</label>
                     <div class="col-sm-8">
-                        <select class="form-control" id="deptlist">
+                        <select class="form-control" id="driverlist">
                         </select>
                     </div>
                 </div>
                 <div class="form-group col-sm-3" id="isCompleteDiv">
-                    <label for="exampleInputAccount1" class="col-sm-4">是否完成</label>
+                    <label for="exampleInputAccount1" class="col-sm-4">车牌号：</label>
                     <div class="col-sm-8">
-                        <select class="form-control" id="isComplete">
-                            <option value="0">未完成</option>
-                            <option value="1">已完成</option>
+                        <select class="form-control" id="carNumber">
                         </select>
                     </div>
                 </div>
-                <div class="form-group col-sm-3" id="isApplyDiv">
-                    <label for="exampleInputAccount1" class="col-sm-4">是否放空</label>
-                    <div class="col-sm-5">
-                        <select class="form-control" id="isApply-select">
-                            <option value="0">否</option>
-                            <option value="1">是</option>
-                        </select>
-                    </div>
-                </div>
-
                 <div class="form-group col-sm-2">
                     <button class="btn btn-info2 col-sm-1" style="width:80px;" type="button" onclick="queryTask()" style="">查询</button>
                 </div>
                 <div class="form-group col-sm-1" style="float: right">
-                    <button id="saveButton" class="btn btn-info2 col-sm-1" style="width:90px;display: none" type="button" onclick="addTask()">新增</button>
+                    <button id="saveButton" class="btn btn-info2 col-sm-1" style="width:90px;" type="button" onclick="addTask()">新增</button>
                 </div>
             </div>
         </form>

VisualInspection/motorcade/view/car_collection.html

@@ -0,0 +1,82 @@
+<!--服务区-营运管理综合检查情况统计-->
+<script src="/motorcade/js/car_collection.js"></script>
+<link rel="stylesheet" type="text/css" href="/css/statistics/assess_situation.css?__inline">
+<div class="container-fluid ">
+    <div class="form-div">
+        <form class="form-horizontal">
+            <div class="form-group">
+                <div class="from-label"><label>查询日期</label></div>
+                <div class="col-sm-2">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="选择月份">
+                </div>
+                <!-- <div class="col-sm-2">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
+                </div> -->
+                <div class="col-sm-1">
+                    <button class="btn btn-primary " type="button" onclick="queryTypeClick()">查询</button>
+                </div>
+                <div class="col-sm-1">
+                    <button class="btn btn-primary " type="button" onclick="exportExcel()">导出Excel</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="table-title"><span>清障队考核情况汇总表</span></div>
+
+    <div class="row">
+        <!-- 使用一个div来显示数据表格 -->
+        <div class="datatable" data-checkable="false" data-sortable="false" style="margin-bottom:0px;">
+            <div class="table-head">
+                <table border="1" width="100%" height="90px" align="center">
+                    <thead>
+                        <tr>
+                            <!--<th rowspan="3" width="6%">排名</th><th rowspan="3" width="6%">道管</th>-->
+                            <th  width="8%">序号</th>
+                            <!--<th rowspan="3" width="6%">道管内排名</th>-->
+                            <th  width="8%">公务车牌号</th>
+                            <th  width="8%">驾驶人</th>
+                            <th  width="8%">车型</th>
+                            <!-- <th colspan="4" width="24%" height="40px">温馨服务</th> -->
+                            <th  width="8%" height="40px">本期里程数（km）</th>
+                            <th  width="8%" height="40px">上期里程数（km）</th>
+                            <th  width="8%" height="40px">本期行驶里程数（km）</th>
+                            <th  width="8%">耗油数量（L）</th>
+                            <th  width="8%">平均油耗（L/100km）</th>
+                            <th  width="8%">维保费用</th>
+                            <th  width="20%">备注</th>
+                            </tr>
+                            <tr> 
+        
+                            </tr>
+                    </thead>
+                    <!-- <tbody class="table-tbody" style="background:white" align="center">
+               
+                    </tbody> -->
+                </table>
+            </div>
+        </div>
+        <div id="scrollTable" style="height:300px;overflow:scroll;margin-right:-10px;">
+            <div class="table-head" style="margin:0px;">
+                <table border="1" width="100%" height="90px" align="center" style="border-top:0px;">
+                    <tbody class="table-tbody" style="background:white" align="center">
+
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    $(document).ready(function() {
+        // 设置滚动表格的高度
+        $("#scrollTable").height($(window).height() - 360);
+
+        // 仅选择日期
+        $.jeDate("#start-time", {
+            isinitVal: true,
+            format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+        });
+        $("#start-time").val(getCurrentTimeFormat());
+        initQueryType();
+    });
+</script>

VisualInspection/motorcade/view/main.html

@@ -0,0 +1,100 @@
+<!doctype html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>稽查</title>
+
+
+    <link rel="import" href="/view/common/commoncsslink.html?__inline">
+    <link rel="stylesheet" type="text/css" href="/css/main.css">
+
+    <!--<link rel="stylesheet" type="text/css" href="/js/lib/jedate/skin/jedate.css">
+    <script src="/js/lib/jedate/jedate.js"></script>-->
+    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
+
+    <style>
+        html {
+            overflow: auto;
+        }
+        
+        img.lightbox-img {
+            width: 600px;
+        }
+        
+        .navbar-inverse {
+            background-color: #366ca5;
+        }
+        
+        .file-list,
+        .uploader-files {
+            border: 0px;
+        }
+        
+        html {
+            overflow: hidden
+        }
+        
+        body {
+            font-family: 'Microsoft Yahei';
+            overflow: hidden
+        }
+        
+        .fullxtwen-canvas {
+            display: none;
+        }
+        /*.mum_left {
+            background-color: #2B7EB3;
+        }*/
+    </style>
+
+    <!--<script src="/js/teamClass/check_team_schedule.js"></script>-->
+
+</head>
+
+<body>
+    <link rel="import" href="/view/common/head.html?__inline">
+
+
+
+
+    <div id="main" class="container-fluid main">
+        <div class="row">
+            <div class="col-md-2" style="padding-right:0;z-index: 11;">
+                <div id="mum_left" class="mum_left">
+                    <link rel="import" href="/view/mum.html?__inline">
+                </div>
+            </div>
+            <div class="col-md-10">
+                <div id="mum_right" class="mum_right">
+
+                    <div class="panel" id="main_panel">
+                        <div class="panel-heading" id="main_content_title">
+                            <ol class="breadcrumb" id="breadcrumb_menu" style="margin-bottom: 0;padding:0px;">
+
+                            </ol>
+                        </div>
+                        <div class="panel-body" id="main_panel_body">
+                            <div id="main_content">
+                            </div>
+                            <!--<link rel="import" href="/view/mytask/unchecked.html?__inline">-->
+                        </div>
+                    </div>
+
+                    <link rel="import" href="/view/common/foot.html?__inline">
+                </div>
+
+            </div>
+
+        </div>
+    </div>
+
+    <script type="text/javascript" src="/js/lib/ckplayer/ckplayer/ckplayer.js"></script>
+    <script src="/js/teamClass/charge_team_schedule.js"></script>
+    <script src="/js/main.js"></script>
+
+</body>
+
+
+
+</html>

VisualInspection/motorcade/view/maintenanceInfo.html

@@ -0,0 +1,70 @@
+<script src="/js/statistics/common_statistic.js?__inline"></script>
+<script src="/motorcade/js/maintenanceInfo.js"></script>
+<style>
+    .button_new {
+        width: 50px
+    }
+</style>
+<div class="container-fluid ">
+    <div class="row">
+        <form class="form-horizontal" style="margin:0px;">
+            <div class="form-group" style="margin:0px;">
+                <div class="form-group col-sm-2">
+                        <label for="exampleInputAccount1" class="col-sm-4" style="text-align: left;padding-right:0">时间：</label>
+                        <div class="col-sm-8">
+                            <input type="text" id="searchTime" class="form-control form-date" placeholder="选择周期">
+                        </div>
+                </div>
+                <div class="form-group col-sm-3" id="isCompleteDiv">
+                    <label for="exampleInputAccount1" class="col-sm-4">车牌号：</label>
+                    <div class="col-sm-8">
+                        <select class="form-control" id="carNumber">
+                        </select>
+                    </div>
+                </div>
+                <div class="form-group col-sm-3" id="isCompleteDiv">
+                        <label for="exampleInputAccount1" class="col-sm-4">维保类型：</label>
+                        <div class="col-sm-6">
+                            <select class="form-control" id="maintenance_type">
+                                <option value="">全部</option>
+                                <option value="1">油耗</option>>
+                                <option value="2">维保</option>>
+                            </select>
+                        </div>
+                    </div>
+                <div class="form-group col-sm-2">
+                    <button class="btn btn-info2 col-sm-1" style="width:80px;" type="button" onclick="queryTask()">查询</button>
+                </div>
+                <div class="form-group col-sm-1" style="float: right">
+                    <button id="saveButton" class="btn btn-info2 col-sm-1" style="width:90px;" type="button" onclick="addTask()">新增</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <hr style="margin-top:0px;">
+
+    <div class="datatable" id="task_list_table"></div>
+</div>
+<script>
+    $(document).ready(function() {
+        initTaskPage();
+    });
+</script>
+
+<div class="modal fade" id="addModal" style="height: 800px">
+    <div class="modal-dialog" style="width:400px">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
+                <h4 class="modal-title"><span id="modalTitle">新增用车记录<span></h4>
+            </div>
+            <div class="modal-body">
+                <!-- <link id="addrecord" rel="import" href="/motorcade/view/addCar.html?__inline"> -->
+                <link id="addrecord" rel="import" href="/motorcade/view/addMaintenance.html?__inline">
+            </div>
+            <div class="modal-footer" style="border-color: white">
+                <!-- <button type="button" id="dept_add_btn" class="btn btn-primary" onclick="addDept()">添加</button> -->
+            </div>
+        </div>
+    </div>
+</div>

VisualInspection/qzd/js/statistics/assess_type.js

@@ -20,6 +20,7 @@ function queryTypeClick() {
         "start_date": start_date,
         "end_date": end_date,
     }
+    console.log(param);
     var url = "q/statistics/score/item/info";
     var strTbody = '';
     post_common_service(url, param, function(data) {
@@ -43,6 +44,7 @@ function initQueryType() {
         "start_date": start_date,
         "end_date": end_date,
     }
+    console.log(param);
     var url = "q/statistics/score/item/info";
     var strTbody = '';
 

VisualInspection/qzd/js/statistics/operation_management_integration.js

@@ -81,10 +81,10 @@ function gethtml(data, i, avg, lists) {
     qzdCheckPeople += data.check_t_num;
     qzdPeople += lists;
     qzdRecord += data.other_check_num;
-    var totalScore = data.company_total_score+data.third_total_score+data.onsite_total_score;
+    var totalScore =  (data.company_total_score/avg2*0.4-data.third_total_score*0.2-data.onsite_total_score*0.4).toFixed(2);
     var checkSCcore = (1000-data.company_total_score/avg2*0.4-data.third_total_score*0.2-data.onsite_total_score*0.4).toFixed(2);
     strTbody += "<tr><td width='8%'>" + i + "</td>";
-    strTbody += "<td width='8%'>" + data.name + "</td><td width='8%'>" + lists + "</td><td width='8%'>" + data.check_t_num + "</td><td width='6%'>" + data.other_check_num +
+    strTbody += "<td width='8%'>" + data.name + "</td><td width='8%'>" + lists + "</td><td width='8%'>" + (data.check_t_num+1) + "</td><td width='6%'>" + data.other_check_num +
         "</td><td width='6%'>" + data.company_check_num + "</td><td width='6%'>" + avg +"<td width='6%'>" + data.company_total_score + "</td>"+"<td width='6%'>" + data.third_check_num + "</td>"+
         "</td><td width='6%'>" + data.third_total_score + "</td><td width='6%'>" + data.onsite_check_num +
         "</td><td width='6%'>" + data.onsite_total_score + "</td><td width='8%'>" +
@@ -96,8 +96,8 @@ function gethtml(data, i, avg, lists) {
 
 function getTotalHtml(data) {
     var avg = (qzdCheck/qzdCheckPeople).toFixed(0);
-    var html = "<tr><td>合计</td><td></td><td width='8%'>" + qzdPeople + "</td><td width='8%'>" + qzdCheckPeople + "</td><td>" + qzdRecord + "</td><td>" + qzdCheck + "</td><td>" + avg + "</td><td>" + data.totalCompanyScore + "</td><td>" +
-        data.totalThirdNum + "</td><td>" + data.totalThirdScore + "</td><td>" + data.totalOnsiteNum + "</td><td>" + data.totalOnsiteScore +
+    var html = "<tr><td>合计</td><td></td><td width='8%'>" + qzdPeople + "</td><td width='8%'>" + qzdCheckPeople + "</td><td>" + qzdRecord + "</td><td>" + qzdCheck + "</td><td>" + "/" + "</td><td>" + data.totalCompanyScore + "</td><td>" +
+        "1" + "</td><td>" + data.totalThirdScore + "</td><td>" + "1" + "</td><td>" + data.totalOnsiteScore +
          "</td><td>-</td><td>-</td></tr>";
     return html;
 }

VisualInspection/qzd/js/task/add.js

@@ -69,9 +69,8 @@ function inittAreaable(time, dept) {
 
     layindex = layer.load(0, { shade: false });
     var t = time.replace("/", "-") + "";
-    var endtime = moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss");
-    var starttime = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
-
+    var endtime = moment(t + "-25T24:00:00", "YYYY-MM-DD HH:mm:ss");
+    var starttime = moment(moment(t + "-25T24:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
     var param1 = { "startTime": getMomentTimeFormat(starttime), "endTime": getMomentTimeFormat(endtime), "checked_dept": dept,"isComplete":1 }
     console.log(param1);
 
@@ -312,6 +311,7 @@ function changeListItem(id) {
 
 
 function addlisttable(record, id) {
+    console.log(record);
     var tempids = id.split("_");
     var t = stimemonth.replace("/", "-") + "";
     var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
@@ -324,7 +324,11 @@ function addlisttable(record, id) {
     }else if(record.type == 2){
         typename="事故";
     }
-    var taskname = currentday.format("YYYY-MM-DD") + " " + stime + "~" + etime + " " + record.addr+"号桩" + typename+"清障任务";
+    var direction = "";
+    if(record.direction == undefined){
+        direction=record.direction;
+    }
+    var taskname = currentday.format("YYYY-MM-DD") + " " + stime + "~" + etime + " " + record.addr+"号桩" +direction+ typename+"清障任务";
     record.rname = taskname;
 
     var feeList = $.zui.store.get("cache_wrecker_group_list");

VisualInspection/qzd/js/task/check.js

@@ -50,6 +50,7 @@ function videorecordstart(type) {
         var idss = videoid.split("/");
         var filename = idss[idss.length - 1];
         //开始截取视屏
+        console.log(currentTime);
         post_common_service_nohead(base_image_server_url + 'fileServer/file/videopiccut', {
             "targetfilename": filename,
             "filename": filename.split(".")[0],
@@ -152,6 +153,7 @@ function initCheck() {
                              '</div>';
             }
                   $('#imgCarousel').append(html);
+                  $('#picController').click();
                 //   $('#videoButton').hide();
                 //   $('#video_btn_start').hide();
                  // $("#picController").click();

VisualInspection/qzd/js/task/checked.js

@@ -1,7 +1,7 @@
 // var page_size=10;
 function queryCheckedTask() {
 
-    var t = getTimeByMonth(GV("#start_time"));
+    var t = getTimeByRMonth(GV("#start_time"));
 
     var data = {
         "start_time": getMomentTimeFormat(t.starttime),

VisualInspection/qzd/js/task/new.js

@@ -23,6 +23,7 @@ function initQueryParams() {
 
     $("#start_time").val(getCurrentTimeFormat());
     var page_params = $.zui.store.get("page_params");
+    console.log(page_params);
     if (page_params && page_params.status) {
         cur_status = page_params.status;
     }
@@ -79,7 +80,7 @@ function initTableRowBtn() {
 //查询任务
 function queryTask() {
 
-    var t = getTimeByMonth(GV("#start_time"));
+    var t = getTimeByRMonth(GV("#start_time"));
     var data = {
         "startTime": getMomentTimeFormat(t.starttime),
         "endTime": getMomentTimeFormat(t.endtime),
@@ -89,7 +90,6 @@ function queryTask() {
         // "check_status": cur_status
     };
 
-
     var hide = false;
     if (hasRole(ROLE_WRECKER_MANAGER) || hasRole(ROLE_WRECKER) || hasRole(ROLE_JICHA) || roleContains('ROLE_WRECKER')) {
         hide = true;

VisualInspection/qzd/js/task/task_list.js

@@ -45,8 +45,8 @@ function initQueryParams() {
         cur_page = store_params.currentpage;
     } else {
         var cm = getCurrentTimeFormat();
-        var tyt = getTimeByMonth(cm);
-        $("#start_time").val((tyt.starttime.add(1, "d")).format("YYYY-MM-DD"));
+        var tyt = getTimeByQMonth(cm);
+        $("#start_time").val(tyt.starttime.format("YYYY-MM-DD"));
         $("#end_time").val(tyt.endtime.format("YYYY-MM-DD"));
         // $("#start_time").val(getCurrentRealTimeFormat());
     }
@@ -101,9 +101,10 @@ function initTableRowBtn() {
 //查询任务
 function queryTask() {
     var start_time = "";
-    if ($("#start_time").val()) start_time = (moment($("#start_time").val()).subtract(1, "d")).format("YYYY-MM-DD") + " 23:00:00";
+    if ($("#start_time").val()) start_time = (moment($("#start_time").val()).subtract(1, "d")).format("YYYY-MM-DD") + " 24:00:00";
     var end_time = "";
-    if ($("#end_time").val()) end_time = $("#end_time").val() + " 23:00:00";
+    console.log($("#end_time").val());
+    if ($("#end_time").val()) end_time = $("#end_time").val() + " 24:00:00";
     var data = {
         "start_time": (start_time),
         "end_time": (end_time),

VisualInspection/view/home.html

@@ -127,7 +127,7 @@
                             </div>
                         </div>
                         <!-- <div class="row" id="" style="margin-top: 50px"> -->
-                        <div onclick="" class="appdiv" style="text-align: center;bottom: 6%;left: 0;height: 40%">
+                        <div onclick="opennew(3,null)" class="appdiv" style="text-align: center;bottom: 6%;left: 0;height: 40%">
                             <div class="colorbackground4">
                                 <p style="margin-right:40px;font-size:28px"><img class="imgsize" src="/images/car.png"></img><span>车队稽查</span></p>
                             </div>

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

@@ -161,6 +161,12 @@ public class DepartmentController extends BaseController {
         List<FeeStation> organs = departmentService.getAllSA();
         return returnResult(0, "获取成功", organs);
     }
+
+    @RequestMapping(value = "/getCarDept",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getCarDept(){
+        List<Organ> organs = departmentService.getCarDept();
+        return returnResult(0, "获取成功", organs);
+    }
     /**
      * 获取所有排障大队
      * @return

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/CarInfoController.java

@@ -0,0 +1,65 @@
+package com.xintong.visualinspection.controller.gettway;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.CarInfo;
+import com.xintong.visualinspection.bean.CarTask;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.controller.BaseController;
+import com.xintong.visualinspection.service.CarInfoService;
+import com.xintong.visualinspection.service.CarTaskService;
+import com.xintong.visualinspection.util.AuthorUtil;
+import com.xintong.visualinspection.util.Constants;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/c/info")
+public class CarInfoController extends BaseController {
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private CarInfoService carInfoService;
+
+    @RequestMapping(value = "/add")
+    public String addtask(HttpServletRequest request, @RequestBody CarInfo carInfo) {
+        try {
+            carInfoService.insert(carInfo);
+        } catch (Exception e) {
+            throw new BusinessException(21501);
+        }
+        return super.returnSuccessResult("添加成功", null);
+    }
+
+    @RequestMapping(value = "/update")
+    public String updatetask(HttpServletRequest request, @RequestBody CarInfo carInfo) {
+        try {
+            carInfoService.update(carInfo);
+        } catch (Exception e) {
+            throw new BusinessException(21501);
+        }
+        return super.returnSuccessResult("添加成功", null);
+    }
+
+    @RequestMapping(value = "/getall/{page}/{size}")
+    public String getall(HttpServletRequest request, @PathVariable Integer page, @PathVariable Integer size, @RequestBody CarInfo carInfo) {
+        User user = getCurrentUser(request);
+        Object ss = carInfoService.getAll(page,size,carInfo);
+        return super.returnSuccessResult("success",ss,"yyyy-MM-dd HH:mm:ss");
+    }
+
+    @RequestMapping(value = "/getone")
+    public String getone(HttpServletRequest request, @RequestBody CarInfo carInfo) {
+        User user = getCurrentUser(request);
+        CarInfo ss = carInfoService.getone(carInfo.getId());
+        return super.returnSuccessResult(ss);
+    }
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/CarStatisticController.java

@@ -0,0 +1,28 @@
+package com.xintong.visualinspection.controller.gettway;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.xintong.visualinspection.bean.CarStatistics;
+import com.xintong.visualinspection.controller.BaseController;
+import com.xintong.visualinspection.service.CarStatisticsService;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@RestController
+@RequestMapping("/c/collection")
+public class CarStatisticController extends BaseController {
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private CarStatisticsService carStatisticsService;
+
+    @RequestMapping(value = "/getCarList")
+    public String getall(HttpServletRequest request, @RequestBody CarStatistics carStatistics) {
+     List<CarStatistics>  list = carStatisticsService.getCarStatistics(carStatistics);
+        return super.returnSuccessResult("success",list,"yyyy-MM-dd HH:mm:ss");
+    }
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/CarTaskController.java

@@ -7,11 +7,13 @@ import com.xintong.visualinspection.controller.BaseController;
 import com.xintong.visualinspection.service.CarTaskService;
 import com.xintong.visualinspection.util.CacheUtil;
 import org.junit.Test;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,8 +27,6 @@ public class CarTaskController extends BaseController {
 
     @RequestMapping(value = "/add")
     public String addtask(HttpServletRequest request, @RequestBody CarTask carTask) {
-        carTask.setStart_addr("盐城");
-        carTask.setEnd_addr("南京");
         try {
             carTaskService.insert(carTask);
         } catch (Exception e) {
@@ -38,8 +38,6 @@ public class CarTaskController extends BaseController {
 
     @RequestMapping(value = "/update")
     public String updatetask(HttpServletRequest request, @RequestBody CarTask carTask) {
-        carTask.setStart_addr("南京");
-        carTask.setEnd_addr("盐城");
         try {
             carTaskService.update(carTask);
         } catch (Exception e) {
@@ -48,4 +46,28 @@ public class CarTaskController extends BaseController {
 
         return super.returnSuccessResult("添加成功", null);
     }
+
+    @RequestMapping(value = "/getone")
+    public String getone(HttpServletRequest request, @RequestBody CarTask carTask) {
+        CarTask ss = carTaskService.getone(carTask);
+        return super.returnSuccessResult(ss);
+    }
+
+    @RequestMapping(value = "/getall/{page}/{size}")
+    public String getall(HttpServletRequest request, @PathVariable Integer page, @PathVariable Integer size, @RequestBody CarTask carTask) {
+        Object ss = carTaskService.getAll(page, size, carTask);
+        return super.returnSuccessResult("success", ss, "yyyy-MM-dd HH:mm:ss");
+    }
+
+    @RequestMapping(value = "/delete")
+    public String delete(HttpServletRequest request, @RequestBody CarTask carTask) {
+        try {
+            carTaskService.delete(carTask.getId());
+        } catch (Exception e) {
+            throw new BusinessException(21501);
+        }
+
+        return super.returnSuccessResult("添加成功", null);
+    }
+
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/MaintenanceInfoController.java

@@ -0,0 +1,58 @@
+package com.xintong.visualinspection.controller.gettway;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.MaintenanceInfo;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.controller.BaseController;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import com.xintong.visualinspection.service.MaintenanceService;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/c/maintenance")
+public class MaintenanceInfoController extends BaseController {
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private MaintenanceService maintenanceService;
+
+    @RequestMapping(value = "/getall/{page}/{size}")
+    public String getall(HttpServletRequest request, @PathVariable Integer page, @PathVariable Integer size, @RequestBody MaintenanceInfo maintenanceInfo) {
+        User user = getCurrentUser(request);
+        Object ss = maintenanceService.getAll(page,size,maintenanceInfo);
+        return super.returnSuccessResult("success",ss,"yyyy-MM-dd HH:mm:ss");
+    }
+
+    @RequestMapping(value = "/add")
+    public String addtask(HttpServletRequest request, @RequestBody MaintenanceInfo maintenanceInfo) {
+        try {
+            maintenanceService.insert(maintenanceInfo);
+        } catch (Exception e) {
+            throw new BusinessException(21501);
+        }
+        return super.returnSuccessResult("添加成功", null);
+    }
+
+    @RequestMapping(value = "/update")
+    public String update(HttpServletRequest request, @RequestBody MaintenanceInfo maintenanceInfo) {
+        try {
+            maintenanceService.update(maintenanceInfo);
+        } catch (Exception e) {
+            throw new BusinessException(21501);
+        }
+        return super.returnSuccessResult("添加成功", null);
+    }
+
+    @RequestMapping(value = "/getone")
+    public String getone(HttpServletRequest request, @RequestBody MaintenanceInfo maintenanceInfo) {
+        User user = getCurrentUser(request);
+        MaintenanceInfo ss = maintenanceService.getone(maintenanceInfo);
+        return super.returnSuccessResult(ss);
+    }
+
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java

@@ -25,6 +25,7 @@ public interface DepartmentDao  {
     public List<FeeStation> getAllRM();
     public List<FeeStation> getAllWG();
     public List<FeeStation> getAllSA();
+    public List<Organ> getCarDept();
     public FeeStation getFsBydeptId(Integer id);
     
     public List<StatisticsBean> selectFeeStationGroup(User obj);

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -40,6 +40,11 @@
         FROM t_sys_organ
     </select>
 
+    <select id="getCarDept" resultMap="BaseResultMap"  >
+       SELECT * FROM t_sys_organ WHERE id not in
+(SELECT ID FROM t_sys_organ WHERE ID  in (SELECT PARENTID FROM t_sys_organ)) AND creattime is NOT NULL
+    </select>
+
     <!-- <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
         SELECT
         id,organname,remark,parentid,classtype,organcode,isshow,deptype,status

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

@@ -31,7 +31,7 @@ import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.CheckOtherService;
 import com.xintong.visualinspection.util.CodeUtil;
 import com.xintong.visualinspection.util.DateUtil;
-
+import com.google.common.collect.Maps;
 /**
  * 文件名：CheckOtherServiceImpl
  * 版本信息：日期：2017/8/11 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
@@ -152,7 +152,7 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
     @Override
     public Map<String,Object> getOtherCheckStatistics(String checktime, int checktype,Integer type) {
 
-	    Map<String,Object> datas = new HashMap<>();
+	    Map<String,Object> datas = Maps.newLinkedHashMap();
 
         List<OtherCheckStatistics> otherCheckStatistics = new ArrayList<>();
 
@@ -199,7 +199,9 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
                                 if (i == null) {
                                     i = 0;
                                 }
-                                s1.put(c.getPcheckname(), Integer.valueOf((int) (i + c.getCheck_score())));
+                                if(c.getUser_id() == 0){
+                                    s1.put(c.getPcheckname(), Integer.valueOf((int) (i + c.getCheck_score())));
+                                }
                                 totalcheck += 1;
                                 totalscore += c.getCheck_score();
                             }
@@ -208,7 +210,9 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
                                 if (i == null) {
                                     i = 0;
                                 }
-                                s2.put(c.getPcheckname(), Integer.valueOf((int) (i + c.getCheck_score())));
+                                if(c.getUser_id() == 0){
+                                    s2.put(c.getPcheckname(), Integer.valueOf((int) (i + c.getCheck_score())));
+                                }
                                 totalcheck += 1;
                                 totalscore += c.getCheck_score();
                             }
@@ -274,7 +278,9 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
                         Integer i = s.get(c.getPcheckname());
                         if(i==null){i=0;}
                         if(checktype==2){
-                            s.put(c.getPcheckname(), Integer.valueOf((int) (i+c.getCheck_score())));
+                            if(c.getUser_id() == 0) {
+                                s.put(c.getPcheckname(), Integer.valueOf((int) (i+c.getCheck_score())));
+                            }
                         }else{
                             if(c.getUsername() == null || "".equals(c.getUsername())){
                                 s.put(c.getPcheckname(), Integer.valueOf((int) (i+c.getCheck_score())));

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

@@ -93,6 +93,12 @@ public class DepartmentServiceImpl extends BaseService implements DepartmentServ
 	}
 
 	@Override
+	public List<Organ> getCarDept() {
+
+		return departmentDao.getCarDept();
+	}
+
+	@Override
 	public FeeStation getFSByDeptId(Integer id) {
 		return departmentDao.getFsBydeptId(id);
 	}

VisualInspection_server/src/main/resources/application.properties

@@ -4,8 +4,10 @@ context.listener.classes=com.xintong.SystemInit
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -14,8 +16,10 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 ## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url=jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
-cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -54,10 +58,10 @@ spring.datasource.useGlobalDataSourceStat=true
 
 # REDIS (RedisProperties)
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=0  
+#spring.redis.database=0
 # Redis\u670D\u52A1\u5668\u5730\u5740
-spring.redis.host=10.112.0.199
-#spring.redis.host=127.0.0.1
+#spring.redis.host=10.112.0.199
+spring.redis.host=127.0.0.1
 #spring.redis.host=192.168.45.158
 #spring.redis.host=xt.wenhq.top
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
@@ -67,7 +71,8 @@ spring.redis.port=6379
 #spring.redis.port=9004
 #spring.redis.port=7003
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-spring.redis.password=xintong
+#spring.redis.password=xintong
+spring.redis.password=123
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.pool.max-active=8  
 # \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09

Visuallnspection_fjq/visuallnspection_fjq/src/main/resources/application.properties

@@ -9,7 +9,7 @@ dubbo.scan.basePackages  =com.xintong.visualinspection.visuallnspection_fjq.serv
 dubbo.application.id = jicha_fjq-provider_consumer
 dubbo.application.name = jicha_fjq-provider_consumer
 
-# ProtocolConfig Bean
+# ProtocolConfig Beans
 dubbo.protocol.id = dubbo
 dubbo.protocol.name = dubbo
 dubbo.protocol.port = 7689
@@ -28,6 +28,7 @@ dubbo.consumer.check=false
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection_2?useUnicode=true&characterEncoding=utf-8
 master.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection_2?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection_2?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection_2?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/CarInfo.java

@@ -0,0 +1,22 @@
+package com.xintong.visualinspection.bean;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CarInfo implements Serializable {
+    private Integer id;
+
+    private String car_type;
+
+    private String car_number;
+
+    private Integer driver;
+
+    private String driver_name;
+
+    private Integer is_vaild;
+}

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/CarStatistics.java

@@ -0,0 +1,49 @@
+package com.xintong.visualinspection.bean;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CarStatistics implements Serializable {
+    private Integer id;
+
+    private String car_type;
+
+    private String car_number;
+
+    private Integer car_id;
+
+    private Integer driver;
+
+    private String driver_name;
+
+    private Integer is_vaild;
+
+    private Integer start_mileage;
+
+    private Integer end_mileage;
+
+    private Integer mileage;
+
+    private String remark;
+
+    private Integer oil;
+
+    private String avgOil;
+
+    private Integer maintenance_cost;
+
+    //出车时间
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date start_time;
+    //结束时间
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date end_time;
+
+    private Integer maintenance_type;
+}

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/CarTask.java

@@ -1,5 +1,6 @@
 package com.xintong.visualinspection.bean;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,15 +12,21 @@ import java.util.Date;
 public class CarTask implements Serializable {
     private Integer id;
 
-    private String customer;
+    private Integer customer;
+
+    private String customer_name;
+
+    private Integer car_id;
 
     private String car_number;
 
     private Integer driver;
 
     //出车时间
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date start_time;
     //结束时间
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date end_time;
 
     private String start_addr;
@@ -39,4 +46,32 @@ public class CarTask implements Serializable {
     private Integer travel_arrangements;
 
     private String advice;
+
+    private Integer oil;
+
+    private Integer send_car_people;
+
+    private String reason;
+
+    private String time;
+
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date startTime;
+
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date endTime;
+
+    private String driver_name;
+
+    private Integer send_dept;
+
+    private Integer is_vaild;
+
+    private Integer start_mileage;
+
+    private Integer end_mileage;
+
+    private String with_man;
+
+    private String with_dept;
 }

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Job.java

@@ -14,7 +14,6 @@ public class Job implements Serializable {
     private Integer id;
     //名称
     private String name;
-    
     // 部门id
     private Long dept_id;
 

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/MaintenanceInfo.java

@@ -0,0 +1,38 @@
+package com.xintong.visualinspection.bean;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class MaintenanceInfo implements Serializable {
+    private Integer id;
+
+    private Integer maintenance_number;
+
+    private Integer maintenance_type;
+
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date maintenance_time;
+
+    private String remark;
+
+    private Integer car_id;
+
+    private String car_number;
+
+    private String type_name;
+
+    private String number_type;
+
+    //出车时间
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date start_time;
+    //结束时间
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date end_time;
+
+    private Integer is_vaild;
+}

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CarInfoService.java

@@ -0,0 +1,13 @@
+package com.xintong.visualinspection.service;
+
+import com.xintong.visualinspection.bean.CarInfo;
+
+import java.util.List;
+
+public interface CarInfoService {
+    public void insert(CarInfo carInfo);
+    public void update(CarInfo carInfo);
+    public void delete(Integer id);
+    public Object getAll(Integer page, Integer size,CarInfo carInfo);
+    public  CarInfo getone(Integer id);
+}

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CarStatisticsService.java

@@ -0,0 +1,10 @@
+package com.xintong.visualinspection.service;
+
+import com.xintong.visualinspection.bean.CarStatistics;
+
+import java.util.List;
+
+public interface CarStatisticsService {
+
+    List<CarStatistics> getCarStatistics(CarStatistics obj);
+}

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CarTaskService.java

@@ -1,10 +1,14 @@
 package com.xintong.visualinspection.service;
 
 import com.xintong.visualinspection.bean.CarTask;
+import com.xintong.visualinspection.bean.Organ;
+
+import java.util.List;
 
 public interface CarTaskService {
     public void insert(CarTask carTask);
     public void update(CarTask checkAppeal);
     public void delete(Integer id);
-    public CarTask getAll(CarTask carTask);
+    public Object getAll(Integer page, Integer size,CarTask carTask);
+    public  CarTask getone(CarTask carTask);
 }

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/DepartmentService.java

@@ -28,6 +28,8 @@ public interface DepartmentService {
 	public List<FeeStation> getAllWG();
 
     public List<FeeStation> getAllSA();
+
+	public List<Organ> getCarDept();
 	
 	public FeeStation getFSByDeptId(Integer dept_id);
 	

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/MaintenanceService.java

@@ -0,0 +1,11 @@
+package com.xintong.visualinspection.service;
+
+import com.xintong.visualinspection.bean.MaintenanceInfo;
+
+public interface MaintenanceService {
+    public void insert(MaintenanceInfo m);
+    public void update(MaintenanceInfo m);
+    public void delete(Integer id);
+    public Object getAll(Integer page, Integer size,MaintenanceInfo m);
+    public  MaintenanceInfo getone(MaintenanceInfo m);
+}

Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Aug 30 14:59:41 CST 2018
+#Wed Nov 14 16:04:40 GMT+08:00 2018
 version=1.0-SNAPSHOT
 groupId=com.xintong.visuallnspection.inteface
 artifactId=visuallnspectioninteface

Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,54 +1,65 @@
-com/xintong/visualinspection/pojo/fwq/TaskData_F.class
-com/xintong/visualinspection/bean/CheckApply_F.class
-com/xintong/visualinspection/bean/CheckAppeal_F.class
-com/xintong/visualinspection/bean/Organ.class
-com/xintong/visualinspection/bean/FwqScore.class
-com/xintong/visualinspection/service/CheckAppealService_F.class
-com/xintong/visualinspection/service/CheckOtherService_F.class
-com/xintong/visualinspection/bean/FeeStation.class
-com/xintong/visualinspection/pojo/qzd/TaskDate_Q.class
-com/xintong/visualinspection/bean/Constant.class
-com/xintong/visualinspection/pojo/fwq/FwqRankingData.class
-com/xintong/visualinspection/bean/QzdCheckTask.class
-com/xintong/visualinspection/service/CheckAppealService_Q.class
-com/xintong/visualinspection/service/JobService.class
-com/xintong/visualinspection/bean/Job.class
-com/xintong/visualinspection/bean/WreckerGroup.class
-com/xintong/visualinspection/service/CheckOtherService_Q.class
-com/xintong/visualinspection/util/DateUtil.class
-com/xintong/visualinspection/bean/FwqStatisticsBean.class
-com/xintong/visualinspection/bean/Item.class
-com/xintong/visualinspection/service/ScoreService_F.class
-com/xintong/visualinspection/service/AreaInfoService_F.class
-com/xintong/visualinspection/bean/CheckTaskPeriod.class
-com/xintong/visualinspection/service/CheckApplyService_Q.class
-com/xintong/visualinspection/service/UserService.class
-com/xintong/visualinspection/bean/QzdRecord.class
-com/xintong/visualinspection/service/ItemService.class
-com/xintong/visualinspection/pojo/fwq/ServiceAreaStatistic.class
-com/xintong/visualinspection/util/AuthorUtil.class
-com/xintong/visualinspection/service/CommonService.class
-com/xintong/visualinspection/service/TaskService_Q.class
-com/xintong/visualinspection/bean/FwqCheckOtherStatistics.class
-com/xintong/visualinspection/bean/User.class
-com/xintong/visualinspection/service/StatisticsService_F.class
-com/xintong/visualinspection/pojo/fwq/CheckAreaData.class
-com/xintong/visualinspection/bean/FwqCheckOther.class
-com/xintong/visualinspection/service/TaskService_F.class
-com/xintong/visualinspection/service/RecordService_Q.class
-com/xintong/visualinspection/service/ThreadTaskService_F.class
-com/xintong/visualinspection/util/CacheUtil.class
-com/xintong/visualinspection/bean/Role.class
-com/xintong/visualinspection/service/ScoreService_Q.class
-com/xintong/visualinspection/pojo/fwq/FwqStatisiticPojo.class
-com/xintong/visualinspection/bean/FwqStatisticsBo.class
-com/xintong/visualinspection/bean/AreaInfo.class
-com/xintong/visualinspection/util/Constants.class
-com/xintong/visualinspection/service/DepartmentService.class
-com/xintong/visualinspection/util/CodeUtil.class
-com/xintong/visualinspection/bean/TaskStatus.class
-com/xintong/visualinspection/bean/FwqCheckTask.class
-com/xintong/visualinspection/util/CustomJsonDateDeserializer.class
-com/xintong/visualinspection/bean/FwqDeptStatistic.class
-com/xintong/visualinspection/service/CheckApplyService_F.class
-com/xintong/visualinspection/service/ConstantService.class
+com\xintong\visualinspection\bean\CarStatistics.class
+com\xintong\visualinspection\bean\WreckerGroup.class
+com\xintong\visualinspection\service\ConstantService.class
+com\xintong\visualinspection\util\CustomJsonDateDeserializer.class
+com\xintong\visualinspection\service\ScoreService_Q.class
+com\xintong\visualinspection\bean\CarInfo.class
+com\xintong\visualinspection\util\DateUtil.class
+com\xintong\visualinspection\pojo\fwq\ServiceAreaStatistic.class
+com\xintong\visualinspection\service\CheckOtherService_Q.class
+com\xintong\visualinspection\util\CacheUtil.class
+com\xintong\visualinspection\bean\CheckApply_F.class
+com\xintong\visualinspection\bean\CarTask.class
+com\xintong\visualinspection\pojo\fwq\FwqStatisiticPojo.class
+com\xintong\visualinspection\service\CheckOtherService_F.class
+com\xintong\visualinspection\bean\FwqStatisticsBean.class
+com\xintong\visualinspection\bean\Job.class
+com\xintong\visualinspection\util\Constants.class
+com\xintong\visualinspection\bean\FeeStation.class
+com\xintong\visualinspection\util\AuthorUtil.class
+com\xintong\visualinspection\service\CheckApplyService_Q.class
+com\xintong\visualinspection\util\CodeUtil.class
+com\xintong\visualinspection\service\ScoreService_F.class
+com\xintong\visualinspection\bean\AreaInfo.class
+com\xintong\visualinspection\bean\Organ.class
+com\xintong\visualinspection\bean\FwqCheckOther.class
+com\xintong\visualinspection\pojo\fwq\CheckAreaData.class
+com\xintong\visualinspection\bean\FwqStatisticsBo.class
+com\xintong\visualinspection\bean\CheckAppeal_F.class
+com\xintong\visualinspection\pojo\qzd\TaskDate_Q.class
+com\xintong\visualinspection\service\CheckAppealService_F.class
+com\xintong\visualinspection\pojo\fwq\FwqRankingData.class
+com\xintong\visualinspection\service\DepartmentService.class
+com\xintong\visualinspection\service\UserService.class
+com\xintong\visualinspection\service\ItemService.class
+com\xintong\visualinspection\service\CarStatisticsService.class
+com\xintong\visualinspection\pojo\fwq\TaskData_F.class
+com\xintong\visualinspection\service\StatisticsService_Q.class
+com\xintong\visualinspection\bean\FwqScore.class
+com\xintong\visualinspection\bean\FwqCheckOtherStatistics.class
+com\xintong\visualinspection\bean\User.class
+com\xintong\visualinspection\service\CommonService.class
+com\xintong\visualinspection\bean\CheckTaskPeriod.class
+com\xintong\visualinspection\service\JobService.class
+com\xintong\visualinspection\bean\Constant.class
+com\xintong\visualinspection\service\TaskService_Q.class
+com\xintong\visualinspection\service\ThreadTaskService_F.class
+com\xintong\visualinspection\service\CheckApplyService_F.class
+com\xintong\visualinspection\bean\FwqCheckTask.class
+com\xintong\visualinspection\bean\Item.class
+com\xintong\visualinspection\service\StatisticsService_F.class
+com\xintong\visualinspection\bean\MaintenanceInfo.class
+com\xintong\visualinspection\bean\WreckerStatisticsBO.class
+com\xintong\visualinspection\service\TaskService_F.class
+com\xintong\visualinspection\bean\QzdCheckTask.class
+com\xintong\visualinspection\bean\TaskStatus.class
+com\xintong\visualinspection\service\RecordService_Q.class
+com\xintong\visualinspection\service\AreaInfoService_F.class
+com\xintong\visualinspection\bean\Role.class
+com\xintong\visualinspection\service\CarInfoService.class
+com\xintong\visualinspection\service\CheckAppealService_Q.class
+com\xintong\visualinspection\bean\CheckNum.class
+com\xintong\visualinspection\service\CarTaskService.class
+com\xintong\visualinspection\service\MaintenanceService.class
+com\xintong\visualinspection\bean\QzdRecord.class
+com\xintong\visualinspection\bean\FwqDeptStatistic.class

Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,54 +1,65 @@
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckApplyService_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ConstantService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/User.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckAppealService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/CheckAppeal_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/RecordService_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckOther.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/DateUtil.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqStatisticsBean.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckAppealService_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqStatisticsBo.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/TaskData_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/WreckerGroup.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/AuthorUtil.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Job.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/FwqStatisiticPojo.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ThreadTaskService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/AreaInfoService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CustomJsonDateDeserializer.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/CheckApply_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Organ.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Item.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/DepartmentService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/QzdCheckTask.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/AreaInfo.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/qzd/TaskDate_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/UserService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/TaskService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckOtherStatistics.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/JobService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CodeUtil.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqScore.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/FwqRankingData.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CommonService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/CheckTaskPeriod.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckOtherService_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/TaskService_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/ServiceAreaStatistic.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/QzdRecord.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ScoreService_Q.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqDeptStatistic.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Role.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckApplyService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/TaskStatus.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/Constants.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ScoreService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/CheckAreaData.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/StatisticsService_F.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CacheUtil.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ItemService.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Constant.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FeeStation.java
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckOtherService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckAppealService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\CarStatistics.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\fwq\ServiceAreaStatistic.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\AreaInfoService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckApplyService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\MaintenanceInfo.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\User.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\ScoreService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\UserService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\CarInfo.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\WreckerStatisticsBO.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Role.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqCheckOther.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\CodeUtil.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqScore.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqCheckTask.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckApplyService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\Constants.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\QzdCheckTask.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckAppealService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\fwq\FwqRankingData.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\ItemService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\CheckApply_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CarStatisticsService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckOtherService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FeeStation.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Item.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\StatisticsService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CarTaskService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Organ.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\RecordService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\JobService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CommonService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckOtherService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\DepartmentService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\ThreadTaskService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\CheckNum.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\MaintenanceService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqCheckOtherStatistics.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\WreckerGroup.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\fwq\CheckAreaData.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\AuthorUtil.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\TaskService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\TaskStatus.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Job.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqStatisticsBo.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\TaskService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\AreaInfo.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\CarTask.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\DateUtil.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqDeptStatistic.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\CacheUtil.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\CheckAppeal_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\util\CustomJsonDateDeserializer.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\QzdRecord.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CarInfoService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\qzd\TaskDate_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\FwqStatisticsBean.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\ScoreService_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\fwq\TaskData_F.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\CheckTaskPeriod.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\pojo\fwq\FwqStatisiticPojo.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\StatisticsService_Q.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\ConstantService.java
+D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Constant.java

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/controller/FileExcelController_Q.java

@@ -1,9 +1,11 @@
 package com.xintong.visualinspection.visuallnspection_qzd.controller;
 
+import com.xintong.visualinspection.bean.CarStatistics;
 import com.xintong.visualinspection.bean.FwqCheckOther;
 import com.xintong.visualinspection.bean.FwqDeptStatistic;
 import com.xintong.visualinspection.bean.FwqStatisticsBean;
 import com.xintong.visualinspection.util.DateUtil;
+import com.xintong.visualinspection.visuallnspection_qzd.service.CarExcelService;
 import com.xintong.visualinspection.visuallnspection_qzd.service.CheckOtherService_Q;
 import com.xintong.visualinspection.visuallnspection_qzd.service.StatisticsService_F;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,8 @@ public class FileExcelController_Q extends BaseController {
     private CheckOtherService_Q checkOtherService_f;
     @Autowired
     private StatisticsService_F statisticsService_f;
+    @Autowired
+    private CarExcelService carExcelService;
 
     /**
      * 稽查管理导出
@@ -122,4 +126,16 @@ public class FileExcelController_Q extends BaseController {
         return super.returnSuccessResult(null);
     }
 
+    @RequestMapping(value = "/car/excel",method=RequestMethod.GET)
+    public String getCarExcel(HttpServletRequest req, HttpServletResponse resp,
+                                    @RequestParam String start_date, @RequestParam String end_date){
+        CarStatistics obj = new CarStatistics();
+        Date start = DateUtil.strParseDate(start_date);
+        Date end = DateUtil.strParseDate(end_date);
+        obj.setStart_time(start);
+        obj.setEnd_time(end);
+        carExcelService.getCarExcel(obj, req, resp);
+        return super.returnSuccessResult(null);
+    }
+
 }

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/CarInfoDao.java

@@ -0,0 +1,18 @@
+package com.xintong.visualinspection.visuallnspection_qzd.dao;
+
+import com.xintong.visualinspection.bean.CarInfo;
+import com.xintong.visualinspection.bean.CarStatistics;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface CarInfoDao {
+    public void insert(CarInfo carInfo);
+    public void update(CarInfo carInfo);
+    public void delete(Integer id);
+    public List<CarInfo> getAll(CarInfo carInfo);
+    public CarInfo getone(Integer id);
+    public List<CarStatistics> getTaskList(CarStatistics obj);
+    public CarStatistics getMaintenanceList(CarStatistics obj);
+}

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/CarStatisticsDao.java

@@ -0,0 +1,14 @@
+package com.xintong.visualinspection.visuallnspection_qzd.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+import com.xintong.visualinspection.bean.CarStatistics;
+
+import java.util.List;
+
+@Mapper
+public interface CarStatisticsDao {
+    public List<CarStatistics> getTaskList(CarStatistics obj);
+
+    public CarStatistics getMaintenanceList(CarStatistics obj);
+
+}

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/CarTaskDao.java

@@ -1,11 +1,16 @@
 package com.xintong.visualinspection.visuallnspection_qzd.dao;
 
 import com.xintong.visualinspection.bean.CarTask;
+import com.xintong.visualinspection.bean.Organ;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface CarTaskDao {
     public void insert(CarTask carTask);
     public void update(CarTask carTask);
     public void delete(Integer id);
+    public List<CarTask> getAll(CarTask carTask);
+    public CarTask getone(Integer id);
 }

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/dao/MaintenanceDao.java

@@ -0,0 +1,23 @@
+package com.xintong.visualinspection.visuallnspection_qzd.dao;
+
+import com.xintong.visualinspection.bean.CarStatistics;
+import com.xintong.visualinspection.bean.MaintenanceInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface MaintenanceDao {
+
+    public void insert(MaintenanceInfo m);
+
+    public void update(MaintenanceInfo m);
+
+    public void delete(Integer id);
+
+    public List<MaintenanceInfo> getAll(MaintenanceInfo m);
+
+    public  MaintenanceInfo getone(MaintenanceInfo m);
+
+    public List<CarStatistics> getRemark(CarStatistics carStatistics);
+}

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CarInfoMapper.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.CarInfoDao">
+    <insert id="insert" parameterType="com.xintong.visualinspection.bean.CarInfo" >
+        INSERT INTO
+           car_info
+        (car_number,driver,car_type,update_time)
+        VALUES
+        (#{car_number},#{driver},#{car_type},now())
+    </insert>
+
+    <update id="update" parameterType="com.xintong.visualinspection.bean.CarInfo">
+        update
+        car_info
+        set
+        <if test="car_type != null">car_type = #{car_type},</if>
+        <if test="car_number != null">car_number = #{car_number},</if>
+        <if test="driver != null">driver = #{driver},</if>
+        <if test="is_vaild != null">is_vaild = #{is_vaild},</if>
+        id = #{id},
+        update_time = now()
+        WHERE
+        id = #{id}
+    </update>
+
+    <select id="getAll" parameterType="com.xintong.visualinspection.bean.CarInfo" resultType="com.xintong.visualinspection.bean.CarInfo">
+        select
+          *
+        from
+        car_info
+        where
+          1=1
+        and is_vaild = 0
+    </select>
+
+    <select id="getone" parameterType="com.xintong.visualinspection.bean.CarInfo" resultType="com.xintong.visualinspection.bean.CarInfo">
+        select
+          *
+        from
+        car_info
+        where
+         id = #{id}
+    </select>
+
+    <select id="getTaskList" parameterType="com.xintong.visualinspection.bean.CarStatistics" resultType="com.xintong.visualinspection.bean.CarStatistics">
+        SELECT
+        i.*,
+        min( t.start_mileage ) AS start_mileage,
+        max( t.end_mileage ) as end_mileage
+        FROM
+        `car_info` i
+        LEFT JOIN car_task t ON i.id = t.car_id
+        WHERE
+        t.is_vaild = 0
+        and i.is_vaild = 0
+        <if test="start_time != null and end_time != null">and t.start_time between #{start_time} and #{end_time}</if>
+        GROUP BY
+        i.id
+    </select>
+
+    <select id="getMaintenanceList" parameterType="com.xintong.visualinspection.bean.CarStatistics" resultType="com.xintong.visualinspection.bean.CarStatistics">
+            SELECT
+                sum( m.maintenance_number) as maintenance_cost
+            FROM
+                `car_info` c
+                LEFT JOIN maintenance_info m ON c.id = m.car_id
+            WHERE
+                1 = 1
+        <if test="start_time != null and end_time != null">and m.maintenance_time between #{start_time} and #{end_time}</if>
+        <if test="id != null">and c.id = #{id}</if>
+        <if test="maintenance_type != null">and m.maintenance_type = #{maintenance_type}</if>
+    </select>
+</mapper>

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CarStatisticsMapper

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.CarStatisticsDao">
+    <select id="getTaskList" parameterType="com.xintong.visualinspection.bean.CarStatistics" resultType="com.xintong.visualinspection.bean.CarStatistics">
+            SELECT
+                i.*,
+                 min( t.start_mileage ) AS start_mileage,
+                max( t.end_mileage ) as end_mileage
+            FROM
+                `car_info` i
+                LEFT JOIN car_task t ON i.id = t.car_id
+            WHERE
+                t.is_vaild = 0
+            and i.is_vaild = 0
+        <if test="start_time != null and end_time != null">and t.start_time between #{start_time} and #{end_time}</if>
+            GROUP BY
+                i.id
+    </select>
+
+    <select id="getMaintenanceList" parameterType="com.xintong.visualinspection.bean.CarStatistics" resultType="com.xintong.visualinspection.bean.CarStatistics">
+        select
+          *
+        from
+        car_info
+        where
+         id = #{id}
+    </select>
+</mapper>

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/CarTaskMapper.xml

@@ -4,9 +4,10 @@
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.CarTask" >
         INSERT INTO
            car_task
-        (customer,car_number,driver,start_time,end_time,start_addr,end_addr,mileage,dept,train_safe,service_quality,car_capacity,travel_arrangements,advice)
+        (customer,car_id,driver,start_time,end_time,start_addr,end_addr,mileage,dept,train_safe,service_quality,car_capacity,travel_arrangements,advice,reason,oil,send_car_people,start_mileage,end_mileage,with_man,with_dept)
         VALUES
-        (#{customer}, #{car_number},#{driver},#{start_time},#{end_time},#{start_addr},#{end_addr},#{mileage},#{dept},#{train_safe},#{service_quality},#{car_capacity},#{travel_arrangements},#{advice})
+        (#{customer}, #{car_id},#{driver},#{start_time},#{end_time},#{start_addr},#{end_addr},#{mileage},#{dept},#{train_safe},#{service_quality},#{car_capacity},#{travel_arrangements},#{advice},#{reason}
+        ,#{oil},#{send_car_people},#{start_mileage},#{end_mileage},#{with_man},#{with_dept})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.CarTask">
@@ -14,7 +15,7 @@
         car_task
         set
         <if test="customer != null">customer = #{customer},</if>
-        <if test="car_number != null">car_number = #{car_number},</if>
+        <if test="car_id != null">car_id = #{car_id},</if>
         <if test="driver != null">driver = #{driver},</if>
         <if test="start_time != null">start_time = #{start_time},</if>
         <if test="end_time != null">end_time = #{end_time},</if>
@@ -27,20 +28,46 @@
         <if test="car_capacity != null">car_capacity = #{car_capacity},</if>
         <if test="travel_arrangements != null">travel_arrangements = #{travel_arrangements},</if>
         <if test="advice != null">advice = #{advice},</if>
+        <if test="send_car_people != null">send_car_people = #{send_car_people},</if>
+        <if test="reason != null">reason = #{reason},</if>
+        <if test="start_mileage != null">start_mileage = #{start_mileage},</if>
+        <if test="end_mileage != null">end_mileage = #{end_mileage},</if>
+        <if test="with_man != null">with_man = #{with_man},</if>
+        <if test="with_dept != null">with_dept = #{with_dept},</if>
         id = #{id}
         WHERE
         id = #{id}
     </update>
 
     <select id="getAll" parameterType="com.xintong.visualinspection.bean.CarTask" resultType="com.xintong.visualinspection.bean.CarTask">
+       select
+          t.*,c.car_number as car_number
+        from
+         car_task t
+         left join
+         car_info c
+				 on t.car_id = c.id
+        where
+          1=1
+        <if test="driver != null">and t.driver = #{driver}</if>
+        <if test="car_id != null">and t.car_id = #{car_id}</if>
+        <if test="startTime != null and endTime != null">and t.start_time between #{startTime} and #{endTime}</if>
+    </select>
+
+    <select id="getDept" parameterType="com.xintong.visualinspection.bean.Organ" resultType="com.xintong.visualinspection.bean.Organ">
+     select  * from dept_table
+    </select>
+
+    <select id="getone" parameterType="com.xintong.visualinspection.bean.CarTask" resultType="com.xintong.visualinspection.bean.CarTask">
         select
           *
         from
-         car_task
+        car_task
         where
-          1=1
-        <if test="startTime != null and endTime != null">and start_time between #{startTime} and #{endTime}</if>
-        <if test="driver != null">and driver = #{driver}</if>
-        <if test="car_number != null">car_number = #{car_number}</if>
+         id = #{id}
     </select>
+
+    <delete id="delete" parameterType="Integer">
+            delete  from  car_task where id = #{id}
+    </delete>
 </mapper>

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/MaintenanceMapper.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.MaintenanceDao">
+    <insert id="insert" parameterType="com.xintong.visualinspection.bean.MaintenanceInfo" >
+        INSERT INTO
+           maintenance_info
+        (maintenance_number,maintenance_type,maintenance_time,car_id,remark,update_time)
+        VALUES
+        (#{maintenance_number},#{maintenance_type},#{maintenance_time},#{car_id},#{remark},now())
+    </insert>
+
+    <update id="update" parameterType="com.xintong.visualinspection.bean.MaintenanceInfo">
+        update
+        maintenance_info
+        set
+        <if test="maintenance_number != null">maintenance_number = #{maintenance_number},</if>
+        <if test="maintenance_type != null">maintenance_type = #{maintenance_type},</if>
+        <if test="maintenance_time != null">maintenance_time = #{maintenance_time},</if>
+        <if test="car_id != null">car_id = #{car_id},</if>
+        <if test="remark != null">remark = #{remark},</if>
+        <if test="is_vaild != null">is_vaild = #{is_vaild},</if>
+        id = #{id},
+        update_time = now()
+        WHERE
+        id = #{id}
+    </update>
+
+    <select id="getAll" parameterType="com.xintong.visualinspection.bean.MaintenanceInfo" resultType="com.xintong.visualinspection.bean.MaintenanceInfo">
+        select
+          m.*,c.car_number
+        from
+        maintenance_info m left  join car_info c on  m.car_id = c.id
+        where
+         m.is_vaild = 0
+        <if test="car_id != null">and m.car_id = #{car_id}</if>
+        <if test="start_time != null and end_time != null">and m.maintenance_time between #{start_time} and #{end_time}</if>
+        <if test="maintenance_type != null">and m.maintenance_type = #{maintenance_type}</if>
+    </select>
+
+    <select id="getone" parameterType="Integer" resultType="com.xintong.visualinspection.bean.MaintenanceInfo">
+        select
+          *
+        from
+        maintenance_info
+        where
+         id = #{id}
+    </select>
+
+        <delete id="delete" parameterType="java.lang.Integer" >
+        DELETE FROM maintenance_info WHERE id =#{id}
+    </delete>
+
+    <select id="getRemark" parameterType="com.xintong.visualinspection.bean.CarStatistics" resultType="com.xintong.visualinspection.bean.CarStatistics">
+        SELECT remark
+		FROM maintenance_info
+		WHERE remark!=''
+        <if test="id != null">and car_id = #{id}</if>
+        <if test="start_time != null and end_time != null">and maintenance_time between #{start_time} and #{end_time}</if>
+		GROUP BY remark
+    </select>
+</mapper>

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

@@ -48,10 +48,10 @@
                 IF(t.id IS NOT NULL, COUNT( w.user_id )  , 0 ) as age
             FROM
                 wg_user w
-                LEFT JOIN (SELECT * FROM check_task WHERE  1=1
+                LEFT JOIN (SELECT * FROM view_check_task WHERE  1=1
         <if test="period_id != null and period_id != ''">
         AND period_id = #{period_id}
-    </if>)t ON INSTR( t.checked_users, w.user_id ) = 1
+    </if>)t ON INSTR( t.checked_users, w.user_id ) > 0
             WHERE
                 1=1
             GROUP BY
@@ -72,7 +72,7 @@
         FROM
             wg_user w
             LEFT JOIN (SELECT * FROM record_info WHERE  1=1
-        <if test="start_date != null and end_date != null">and received_time between #{start_date} and #{end_date}</if>)t ON INSTR( t.users, w.user_id ) = 1
+        <if test="start_date != null and end_date != null">and received_time between #{start_date} and #{end_date}</if>)t ON INSTR( t.users, w.user_id ) > 0
         WHERE
            1=1
         GROUP BY
@@ -491,7 +491,7 @@
     t.period_id as period_id
     FROM
     wg_user w
-    LEFT JOIN check_task t ON INSTR(t.checked_users,w.user_id) = 1
+    LEFT JOIN view_check_task t ON INSTR(t.checked_users,w.user_id) > 0
     WHERE
     t.id IS NOT NULL
         <if test="dept_id != null">and t.checked_dept = #{dept_id}</if>

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/CarExcelService.java

@@ -0,0 +1,14 @@
+package com.xintong.visualinspection.visuallnspection_qzd.service;
+
+import com.xintong.visualinspection.bean.CarStatistics;
+import com.xintong.visualinspection.bean.FwqDeptStatistic;
+import com.xintong.visualinspection.bean.FwqStatisticsBean;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public interface CarExcelService {
+
+    void getCarExcel(CarStatistics obj, HttpServletRequest req, HttpServletResponse resp);
+
+}

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CarExcelServiceImpl.java

@@ -0,0 +1,136 @@
+package com.xintong.visualinspection.visuallnspection_qzd.service.impl;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.alibaba.dubbo.config.annotation.Service;
+import com.xintong.visualinspection.bean.CarStatistics;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.CommonService;
+import com.xintong.visualinspection.visuallnspection_qzd.dao.CarInfoDao;
+import com.xintong.visualinspection.visuallnspection_qzd.dao.MaintenanceDao;
+import com.xintong.visualinspection.visuallnspection_qzd.service.CarExcelService;
+import org.jxls.common.Context;
+import org.jxls.util.JxlsHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.text.DecimalFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class CarExcelServiceImpl implements CarExcelService {
+    private static final Logger logger = LoggerFactory.getLogger(CarStatisticsServiceImpl.class);
+
+    @Autowired
+    private CarInfoDao carInfo;
+
+    @Autowired
+    private MaintenanceDao maintenanceDao;
+
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private CommonService commonService;
+
+    public List<CarStatistics> getCarStatistics(CarStatistics obj){
+        List<CarStatistics> list = carInfo.getTaskList(obj);
+        Map<Long, User> userMap = commonService.getUserMap();
+        for(CarStatistics c:list){
+            obj.setId(c.getId());
+            List<CarStatistics> remarkList = maintenanceDao.getRemark(obj);
+            String remark = "";
+            for(int i=0;i<remarkList.size();i++){
+                if(i == 0){
+                    remark = remarkList.get(i).getRemark();
+                }else{
+                    remark += "+"+remarkList.get(i).getRemark();
+                }
+            }
+            c.setMileage(c.getEnd_mileage()-c.getStart_mileage());
+            DecimalFormat df = new DecimalFormat("0.00");
+            c.setRemark(remark);
+            obj.setMaintenance_type(2);
+            if(carInfo.getMaintenanceList(obj) != null){
+                c.setMaintenance_cost(carInfo.getMaintenanceList(obj).getMaintenance_cost());
+            }else{
+                c.setMaintenance_cost(0);
+            }
+            obj.setMaintenance_type(1);
+            if(carInfo.getMaintenanceList(obj) != null){
+                c.setOil(carInfo.getMaintenanceList(obj).getMaintenance_cost());
+            }else{
+                c.setOil(0);
+            }
+            if(c.getMileage()>0){
+                double oil = c.getOil();
+                double mileage = c.getMileage();
+                double avgOil = oil/mileage*100;
+                c.setAvgOil(df.format(avgOil));
+            }else{
+                c.setAvgOil("0.00");
+            }
+            String id = c.getDriver().toString();
+            long ids = Long.parseLong(id);
+            c.setDriver_name(userMap.get(ids).getTruename());
+        }
+        return list;
+    }
+
+    public void getCarExcel(CarStatistics obj, HttpServletRequest req, HttpServletResponse resp) {
+        List<CarStatistics> lists = getCarStatistics(obj);
+        Map<String, Object> map = new HashMap<>(1);
+        map.put("list", lists);
+        exportExcel("公司本部公务车辆使用运行情况统计汇总", "car_statistic", map, resp);
+    }
+
+    private void exportExcel(String fileName, String excelTemplateName, Map<String, Object> map,
+                             HttpServletResponse resp) {
+        String path = "./" + fileName + ".xls";
+        try (InputStream is = this.getClass().getResourceAsStream("/" + excelTemplateName + ".xls")) {
+            try (OutputStream os = new FileOutputStream(path)) {
+                Context context = new Context();
+                // context.putVar("list", map.get("list"));
+                // context.putVar("totalMan", map.get("totalMan"));
+                for (String key : map.keySet()) {
+                    System.out.println(key);
+                    context.putVar(key, map.get(key));
+                }
+                JxlsHelper.getInstance().processTemplate(is, os, context);
+            }
+            Thread.sleep(1000);
+            // path是指欲下载的文件的路径。
+            File file = new File(path);
+            // 取得文件名。
+            String filename = file.getName();
+            // 以流的形式下载文件。
+            InputStream bis = new BufferedInputStream(new FileInputStream(file));
+            byte[] buffer = new byte[bis.available()];
+            bis.read(buffer);
+            bis.close();
+            // 清空response
+            resp.reset();
+            // 设置response的Header
+            resp.addHeader("Content-Disposition",
+                    "attachment;filename=" + new String(filename.getBytes("gb2312"), "ISO8859-1"));
+            resp.addHeader("Content-Length", "" + file.length());
+            OutputStream toClient = new BufferedOutputStream(resp.getOutputStream());
+            resp.setContentType("application/vnd.ms-excel;charset=gb2312");
+            toClient.write(buffer);
+            toClient.flush();
+            toClient.close();
+            // 删除生成的临时文件
+            if (file.exists()) {
+                file.delete();
+            }
+
+        } catch (Exception e) {
+            logger.error(e.toString());
+        }
+    }
+}

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CarInfoServiceImpl.java

@@ -0,0 +1,67 @@
+package com.xintong.visualinspection.visuallnspection_qzd.service.impl;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.CarInfo;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.CarInfoService;
+import com.xintong.visualinspection.service.CommonService;
+import com.xintong.visualinspection.visuallnspection_qzd.dao.CarInfoDao;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+import java.util.Map;
+
+@com.alibaba.dubbo.config.annotation.Service(
+        version = "1.0.0",
+        application = "${dubbo.application.id}",
+        protocol = "${dubbo.protocol.id}",
+        registry = "${dubbo.registry.id}"
+)
+public class CarInfoServiceImpl implements CarInfoService {
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(CarInfoServiceImpl.class);
+
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private CommonService commonService;
+
+    @Autowired
+    private CarInfoDao carInfoDao;
+
+    public void insert(CarInfo carInfo){
+        carInfoDao.insert(carInfo);
+    }
+    public void update(CarInfo carInfo){
+        carInfoDao.update(carInfo);
+    }
+    public void delete(Integer id){
+        carInfoDao.delete(id);
+    }
+    public Object getAll(Integer page, Integer size, CarInfo carInfo){
+        Map<Long, User> userMap = commonService.getUserMap();
+        if (!(page.equals(0) && size.equals(0))) {
+            PageHelper.startPage(page, size);
+        }
+        List<CarInfo> list = carInfoDao.getAll(carInfo);
+        for (CarInfo carInfo1 : list) {
+            if(carInfo1.getDriver() != null){
+            String id = carInfo1.getDriver().toString();
+            long ids = Long.parseLong(id);
+            String username = userMap.get(ids).getTruename();
+            carInfo1.setDriver_name(username);
+            }else{
+                carInfo1.setDriver_name("");
+            }
+            }
+        if (!(page.equals(0) && size.equals(0))) {
+            return new PageInfo<CarInfo>(list);
+        }
+        return list;
+    }
+    public CarInfo getone(Integer id){
+        return carInfoDao.getone(id);
+    }
+}

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CarStatisticsServiceImpl.java

@@ -0,0 +1,132 @@
+package com.xintong.visualinspection.visuallnspection_qzd.service.impl;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.xintong.visualinspection.bean.CarInfo;
+import com.xintong.visualinspection.bean.CarStatistics;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.CarStatisticsService;
+import com.xintong.visualinspection.service.CommonService;
+import com.xintong.visualinspection.visuallnspection_qzd.dao.CarInfoDao;
+import com.xintong.visualinspection.visuallnspection_qzd.dao.MaintenanceDao;
+import org.apache.xmlbeans.impl.xb.xsdschema.Public;
+import org.jxls.common.Context;
+import org.jxls.util.JxlsHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@com.alibaba.dubbo.config.annotation.Service(
+        version = "1.0.0",
+        application = "${dubbo.application.id}",
+        protocol = "${dubbo.protocol.id}",
+        registry = "${dubbo.registry.id}"
+)
+public class CarStatisticsServiceImpl implements CarStatisticsService {
+
+    private static final Logger logger = LoggerFactory.getLogger(CarStatisticsServiceImpl.class);
+
+    @Autowired
+    private CarInfoDao carInfo;
+
+    @Autowired
+    private MaintenanceDao maintenanceDao;
+
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private CommonService commonService;
+
+    @Override
+    public List<CarStatistics> getCarStatistics(CarStatistics obj){
+        List<CarStatistics> list = carInfo.getTaskList(obj);
+        Map<Long, User> userMap = commonService.getUserMap();
+        for(CarStatistics c:list){
+            obj.setId(c.getId());
+            List<CarStatistics> remarkList = maintenanceDao.getRemark(obj);
+            String remark = "";
+           for(int i=0;i<remarkList.size();i++){
+               if(i == 0){
+                   remark = remarkList.get(i).getRemark();
+               }else{
+                   remark += "+"+remarkList.get(i).getRemark();
+               }
+           }
+           c.setRemark(remark);
+            obj.setMaintenance_type(2);
+            if(carInfo.getMaintenanceList(obj) != null){
+                c.setMaintenance_cost(carInfo.getMaintenanceList(obj).getMaintenance_cost());
+            }else{
+                c.setMaintenance_cost(0);
+            }
+            obj.setMaintenance_type(1);
+            if(carInfo.getMaintenanceList(obj) != null){
+                c.setOil(carInfo.getMaintenanceList(obj).getMaintenance_cost());
+            }else{
+                c.setOil(0);
+            }
+           String id = c.getDriver().toString();
+           long ids = Long.parseLong(id);
+            c.setDriver_name(userMap.get(ids).getTruename());
+        }
+        return list;
+    }
+
+    public void getOperationInfo(CarStatistics obj, HttpServletRequest req, HttpServletResponse resp) {
+        List<CarStatistics> lists = getCarStatistics(obj);
+        Map<String, Object> map = new HashMap<>(1);
+        map.put("list", lists);
+        exportExcel("运营管理综合检查情况统计表", "car_statistic", map, resp);
+    }
+
+    private void exportExcel(String fileName, String excelTemplateName, Map<String, Object> map,
+                             HttpServletResponse resp) {
+        String path = "./" + fileName + ".xls";
+        try (InputStream is = this.getClass().getResourceAsStream("/" + excelTemplateName + ".xls")) {
+            try (OutputStream os = new FileOutputStream(path)) {
+                Context context = new Context();
+                // context.putVar("list", map.get("list"));
+                // context.putVar("totalMan", map.get("totalMan"));
+                for (String key : map.keySet()) {
+                    System.out.println(key);
+                    context.putVar(key, map.get(key));
+                }
+                JxlsHelper.getInstance().processTemplate(is, os, context);
+            }
+            Thread.sleep(1000);
+            // path是指欲下载的文件的路径。
+            File file = new File(path);
+            // 取得文件名。
+            String filename = file.getName();
+            // 以流的形式下载文件。
+            InputStream bis = new BufferedInputStream(new FileInputStream(file));
+            byte[] buffer = new byte[bis.available()];
+            bis.read(buffer);
+            bis.close();
+            // 清空response
+            resp.reset();
+            // 设置response的Header
+            resp.addHeader("Content-Disposition",
+                    "attachment;filename=" + new String(filename.getBytes("gb2312"), "ISO8859-1"));
+            resp.addHeader("Content-Length", "" + file.length());
+            OutputStream toClient = new BufferedOutputStream(resp.getOutputStream());
+            resp.setContentType("application/vnd.ms-excel;charset=gb2312");
+            toClient.write(buffer);
+            toClient.flush();
+            toClient.close();
+            // 删除生成的临时文件
+            if (file.exists()) {
+                file.delete();
+            }
+
+        } catch (Exception e) {
+            logger.error(e.toString());
+        }
+    }
+}

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/CarTaskServiceImpl.java

@@ -1,11 +1,21 @@
 package com.xintong.visualinspection.visuallnspection_qzd.service.impl;
 
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.CarInfo;
 import com.xintong.visualinspection.bean.CarTask;
+import com.xintong.visualinspection.bean.Organ;
+import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.CarTaskService;
+import com.xintong.visualinspection.service.CommonService;
 import com.xintong.visualinspection.visuallnspection_qzd.dao.CarTaskDao;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+import java.util.Map;
+
 @com.alibaba.dubbo.config.annotation.Service(
         version = "1.0.0",
         application = "${dubbo.application.id}",
@@ -14,11 +24,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 )
 public class CarTaskServiceImpl implements CarTaskService {
 
-    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(RecordServiceImpl.class);
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(CarTaskServiceImpl.class);
 
     @Autowired
     private CarTaskDao carTaskDao;
 
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private CommonService commonService;
+
     @Override
     public void insert(CarTask carTask){
         carTaskDao.insert(carTask);
@@ -31,5 +46,37 @@ public class CarTaskServiceImpl implements CarTaskService {
     public void delete(Integer id){
         carTaskDao.delete(id);
     }
-
+    @Override
+    public Object getAll(Integer page, Integer size, CarTask carTask){
+        Map<Long, User> userMap = commonService.getUserMap();
+        if (!(page.equals(0) && size.equals(0))) {
+            PageHelper.startPage(page, size);
+        }
+        List<CarTask> list = carTaskDao.getAll(carTask);
+        for(CarTask c : list){
+            String id = c.getCustomer().toString();
+            long ids = Long.parseLong(id);
+            String username = userMap.get(ids).getTruename();
+            c.setCustomer_name(username);
+            id = c.getDriver().toString();
+            ids = Long.parseLong(id);
+            c.setDriver_name(userMap.get(ids).getTruename());
+            id = c.getSend_car_people().toString();
+            ids = Long.parseLong(id);
+           c.setSend_dept(userMap.get(ids).getOrganid());
+        }
+        if (!(page.equals(0) && size.equals(0))) {
+            return new PageInfo<CarTask>(list);
+        }
+        return list;
+    }
+    @Override
+    public CarTask getone(CarTask carTask){
+        Map<Long, User> userMap = commonService.getUserMap();
+        CarTask c = carTaskDao.getone(carTask.getId());
+        String id = c.getCustomer().toString();
+        long ids = Long.parseLong(id);
+        c.setSend_dept(userMap.get(ids).getOrganid());
+        return c;
+    }
 }

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/MaintenanceInfoServiceImpl.java

@@ -0,0 +1,58 @@
+package com.xintong.visualinspection.visuallnspection_qzd.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.MaintenanceInfo;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.MaintenanceService;
+import com.xintong.visualinspection.visuallnspection_qzd.dao.MaintenanceDao;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+import java.util.Map;
+
+@com.alibaba.dubbo.config.annotation.Service(
+        version = "1.0.0",
+        application = "${dubbo.application.id}",
+        protocol = "${dubbo.protocol.id}",
+        registry = "${dubbo.registry.id}"
+)
+public class MaintenanceInfoServiceImpl implements MaintenanceService{
+    @Autowired
+    private MaintenanceDao maintenanceDao;
+
+    public void insert(MaintenanceInfo m){
+        maintenanceDao.insert(m);
+    }
+    public void update(MaintenanceInfo m){
+        maintenanceDao.update(m);
+    }
+    public void delete(Integer id){
+        maintenanceDao.delete(id);
+    }
+    public Object getAll(Integer page, Integer size,MaintenanceInfo m){
+        //Map<Long, User> userMap = commonService.getUserMap();
+        if (!(page.equals(0) && size.equals(0))) {
+            PageHelper.startPage(page, size);
+        }
+        List<MaintenanceInfo> list = maintenanceDao.getAll(m);
+        for(MaintenanceInfo mt:list){
+            if(mt.getMaintenance_type() == 1){
+                  mt.setType_name("油耗");
+                  mt.setNumber_type(mt.getMaintenance_number().toString()+"L");
+            }else if(mt.getMaintenance_type() == 2){
+                 mt.setType_name("维保");
+                mt.setNumber_type(mt.getMaintenance_number().toString()+"元");
+            }
+        }
+        if (!(page.equals(0) && size.equals(0))) {
+            return new PageInfo<MaintenanceInfo>(list);
+        }
+        return list;
+    }
+    public  MaintenanceInfo getone(MaintenanceInfo m){
+        return maintenanceDao.getone(m);
+    }
+
+
+}

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/StatisticsServiceImpl.java

@@ -115,14 +115,18 @@ public class StatisticsServiceImpl implements StatisticsService_Q {
             FwqStatisticsBean value = station.getValue();
             value.setThird_check_num(1);
             value.setOnsite_check_num(1);
-            int avgNum = 0;
-            if(value.getCheck_t_num() != 0){
-                avgNum =(int)Math.ceil(value.getCompany_check_num()/value.getCheck_t_num());
-            }
-            value.setChecked_num(avgNum);
+//            int avgNum = 0;
+//            if(value.getCheck_t_num() != 0){
+//                avgNum =(int)Math.ceil(value.getCompany_check_num()/value.getCheck_t_num());
+//            }
+           // value.setChecked_num(avgNum);
             int checkScore = 0;
-            if(avgNum != 0){
-                checkScore = value.getCompany_total_score()/avgNum;
+            Double a = 1000.00;
+            double num1 = value.getCheck_t_num();
+            double num2 = value.getCompany_check_num();
+            if(value.getCheck_t_num() != 0){
+                //checkScore = value.getCompany_total_score()/avgNum;
+                 a =1000-value.getCompany_total_score()/(num2/num1)*0.4-value.getOnsite_total_score()*0.4-value.getThird_total_score()*0.2;
             }
             // 设置总平均扣分
 //            if (value.getCompany_check_num() > 0 || value.getThird_check_num() > 0) {
@@ -134,9 +138,9 @@ public class StatisticsServiceImpl implements StatisticsService_Q {
             Integer scoreTotal = value.getCompany_total_score()+value.getThird_total_score()+value.getThird_total_score();
             value.setCheck_total_avg(scoreTotal.toString());
             // 设置平均得分
-            Double a =1000-checkScore*0.4-value.getOnsite_total_score()*0.4-value.getThird_total_score()*0.2;
+            //Double a =1000-checkScore*0.4-value.getOnsite_total_score()*0.4-value.getThird_total_score()*0.2;
             // Float score_avg = 1000 - (float)checkScore*0.4;
-            value.setScore_avg(a.toString());
+            value.setScore_avg(df.format(a));
         }
         List<FwqStatisticsBean> sortList = new ArrayList<>(mapStationInfos.values());
         sortList.sort(new Comparator<FwqStatisticsBean>() {
@@ -176,7 +180,7 @@ public class StatisticsServiceImpl implements StatisticsService_Q {
 
         CheckTaskPeriod period = commonService.getCheckTaskPeriod(obj.getStart_date().getTime()+1 * 1000 * 60 * 60, obj.getEnd_date().getTime()+1 * 1000 * 60 * 60);
 
-        if (period.getId() != null) {
+        if (period != null) {
             for (FwqStatisticsBean s : sortList) {
                 FwqDeptStatistic ss = new FwqDeptStatistic();
                 ss.setScore(Double.parseDouble(s.getScore_avg()));
@@ -186,7 +190,12 @@ public class StatisticsServiceImpl implements StatisticsService_Q {
                 fwqCheckDeptStatisticsDao.saveandupdate(ss);
             }
         }
-
+        sortList.sort(new Comparator<FwqStatisticsBean>() {
+            @Override
+            public int compare(FwqStatisticsBean o1, FwqStatisticsBean o2) {
+                return o1.getDept_id() > o2.getDept_id() ? 1 : -1;
+            }
+        });
         return sortList;
     }
 

Visuallnspection_qzd/src/main/resources/application.properties

@@ -12,7 +12,7 @@ dubbo.application.name = jicha_qzd-provider_consumer
 # ProtocolConfig Bean
 dubbo.protocol.id = dubbo
 dubbo.protocol.name = dubbo
-dubbo.protocol.port = 7685
+dubbo.protocol.port = 7688
 dubbo.protocol.status = server
 
 ## RegistryConfig Bean
@@ -25,10 +25,12 @@ dubbo.consumer.check=false
 
 
 
-#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection_3?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection_3?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection_3?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection_3?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection_3?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection_3?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver