Просмотр исходного кода

Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/VisualInspection

# Conflicts:
#	VisualInspection/view/common/commoncsslink.html
#	VisualInspection_server/src/main/resources/application.properties
#	Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties
#	Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
#	Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
MSI\liwei 7 лет назад
Родитель
Сommit
d9feb37b8d
19 измененных файлов с 705 добавлено и 484 удалено
  1. 5 0
      VisualInspection/package-lock.json
  2. 1 0
      VisualInspection/package.json
  3. 315 271
      VisualInspection/qzd/js/task/add.js
  4. 46 48
      VisualInspection/qzd/js/task/new.js
  5. 9 9
      VisualInspection/qzd/js/task/task_list.js
  6. 79 27
      VisualInspection/qzd/view/task/add.html
  7. 7 2
      VisualInspection/view/common/commoncsslink.html
  8. 4 0
      VisualInspection/view/common/commonscriptlink.html
  9. 19 2
      VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/RecordController_Q.java
  10. 20 3
      VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/TaskController_Q.java
  11. 28 0
      Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/QzdRecord.java
  12. 2 1
      Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/qzd/TaskDate_Q.java
  13. 1 1
      Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/TaskService_Q.java
  14. 1 0
      Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties
  15. 52 54
      Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  16. 6 0
      Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst.rej
  17. 48 5
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/TaskMapper.xml
  18. 19 26
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/RecordServiceImpl.java
  19. 43 35
      Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/TaskService_QImpl.java

+ 5 - 0
VisualInspection/package-lock.json

@@ -65,6 +65,11 @@
       "resolved": "http://registry.npm.taobao.org/dom-walk/download/dom-walk-0.1.1.tgz",
       "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg="
     },
+    "fixed-header-table": {
+      "version": "1.3.0",
+      "resolved": "http://registry.npm.taobao.org/fixed-header-table/download/fixed-header-table-1.3.0.tgz",
+      "integrity": "sha1-YmqUZWrQGAo0d4PsizqLk0QOG+E="
+    },
     "for-each": {
       "version": "0.3.3",
       "resolved": "http://registry.npm.taobao.org/for-each/download/for-each-0.3.3.tgz",

+ 1 - 0
VisualInspection/package.json

@@ -22,6 +22,7 @@
     "homepage": "https://github.com/fis-scaffold/default",
     "dependencies": {
         "blueimp-md5": "^2.10.0",
+        "fixed-header-table": "^1.3.0",
         "hashmap": "^2.3.0",
         "moment": "^2.22.2",
         "video.js": "^7.2.0",

+ 315 - 271
VisualInspection/qzd/js/task/add.js

@@ -21,7 +21,7 @@ $(document).ready(function() {
     if ($("#qzd").val() != "") {
         dd = $("#qzd").val();
     }
-    inittAreaable($("#month_date").val(), $("#qzd").val(),$("#qzdpeople").val());
+    inittAreaable($("#month_date").val(), $("#qzd").val());
 
     initselecttable();
 
@@ -44,15 +44,14 @@ var stimemonth = null;
 
 function initselecttable() {
     selectedData = { cols: [], array: [], cache: false };
-    selectedData.cols.push({ width: 0.2, name: "name", label: '人员', style: { 'text-align': 'center', 'line-height': '34px' } });
-    selectedData.cols.push({ width: 0.4, name: "car", label: '任务名称', style: { 'text-align': 'center', 'line-height': '34px' } });
-    selectedData.cols.push({ width: 0.3, name: "option", label: '操作', html: true, style: { 'text-align': 'center', 'line-height': '34px' } });
+    selectedData.cols.push({ width: 0.3, name: "usernames", label: '人员', style: { 'text-align': 'center', 'line-height': '34px' } });
+    selectedData.cols.push({ width: 0.5, name: "taskname", label: '任务名称', style: { 'text-align': 'center', 'line-height': '34px' } });
+    selectedData.cols.push({ width: 0.1, name: "option", label: '操作', html: true, style: { 'text-align': 'center', 'line-height': '34px' } });
     reloadtable();
 
 }
 
 function reloadtable() {
-
     $('#selected_table').datagrid({
         dataSource: selectedData,
         states: { fixedTopUntil: 0 },
@@ -64,192 +63,136 @@ function reloadtable() {
 var layindex = null;
 var taskMap = new HashMap();
 
-function inittAreaable(time, dept, people) {
+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 param1 = { "start_time": starttime.format("YYYY-MM-DD HH:mm:ss"), "end_time": endtime.format("YYYY-MM-DD HH:mm:ss"), "checked_dept": dept }
+
+
+
+    //获取排班情况
+    post_common_service("/q/record/getall/0/0", param1, function(redatatemp) {
 
-    var param1 = { "startTime":new Date(starttime), "endTime": new Date(endtime), "dept": dept }
-    post_common_service("/q/record/getall/0/0", param1, function(taskdata) {
-        taskMap = new HashMap();
-        recordlist = taskdata;
-        taskdata.forEach(t => {
-            var user = t.users.split(",");
-              for(var i=0;i<user.length;i++){
-                   var key = user[i]+"_"+moment(t.received_time).format("YYYY-MM-DD");
-                   if (taskMap.get(key) != null) {
-                    var list = taskMap.get(key);
-                    list.push(t);
-                    taskMap.set(key, list);
-                } else {
-                    var list = [];
-                    list.push(t);
-                    taskMap.set(key, list);
+        console.log(redatatemp)
+        var recodedata = redatatemp.records;
+
+        //获取任务情况
+        post_common_service("/q/task/getall/0/0", param1, function(taskdata) {
+            taskMap = new HashMap();
+            recodedata.forEach(r => {
+                taskdata.forEach(t => {
+                    if (r.id == t.record_id) {
+                        //该记录的任务
+                        r["task"] = t;
+                    }
+                });
+                var user = r.users.split(",");
+                for (var i = 0; i < user.length; i++) {
+                    var key = user[i] + "_" + "" + moment(r.received_time).format("YYYY-MM-DD");
+                    if (taskMap.get(key) != null) {
+                        var list = taskMap.get(key);
+                        list.push(r);
+                        taskMap.set(key, list);
+                    } else {
+                        var list = [];
+                        list.push(r);
+                        taskMap.set(key, list);
+                    }
                 }
-              }
+            });
+
         });
 
+        checkuserlist = redatatemp.checkusers;
+
+
         var userData = {
             "organid": dept
-        }
-            UserGetList(userData, function(redata) { 
-                layer.close(layer.index);
-                var data ;
-                var people = $("#qzdpeople").val();
-                if( people != "全部"){
-                    for(var i in redata){
-                        if(people == redata[i].id){
-                            data = new Array();
-                            data[0]=redata[i];
-                        }
-                    }
-                }else{
-                    data = redata;
-                    rowsDate = redata;
-                }
-              //  checkuserlist = redata.checkusers;
-                var datac = { cols: [], array: [] };
-    
-                var days = endtime.diff(starttime, 'days');
-    
-                datac.cols.push({ width: 120, name: 'type', label: "", });
-    
-                for (var i = 1; i <= days; i++) {
-                    var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
-                    var currentday = temp.add(i, "day");
-                    var day = currentday.date();
-                    datac.cols.push({ width: 80, name: "day_" + i, label: currentday.format("MM-DD"), html: true, className: "table_content" });
-                }
-               // arealist = data;
-                stimemonth = time;
-                var timedate = [
-                    {},
-                ]
-                var dataconfigs =  {
-                    C1: { className: "datagrid-cell-index", style: { 'text-align': 'center', } },               
-                    R0: { style: { 'text-align': 'center', 'line-height': '36px' } }
-                } 
-                var row = 1;
-                for (var index in rowsDate) {
-                    var people = rowsDate[index];
-                    var data_table = {};
-                    data_table.type = people.truename;
-                    var maxsize = 0;
-                    for (var i = 1; i <= days; i++) {
-                        //内容
-                        var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
-                        var currentday = temp.add(i, "day");
-                        var key = people.id + "_" + currentday.format("YYYY-MM-DD");
-                        var temphtml = "";
-                        if(taskMap.get(key) != null){
-                            if(taskMap.get(key).length > maxsize){
-                                 maxsize = taskMap.get(key).length;
-                            }
-                             for(var k in taskMap.get(key)){
-                                var record = taskMap.get(key)[k];
-                                var stime = moment(record.received_time).format("HH:mm");
-                                var etime = moment(record.back_time).format("HH:mm");
-                                if(record.check_status == 2){
-                                    temphtml = temphtml+'<div class="" data-toggle="buttons" id="div_' + people.id+ '_' + i + '" >' +
-                                    '<label class="btn btn-info3" style="font-size:10px;padding:5%;width:90%;margin:5%">' +
-                                    '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + people.id+'_' + i +'_'+k+'">'+stime+'-'+etime+
-                                    '</label>'+
-                                    "</div>";
-                                }else{
-                                temphtml = temphtml+'<div class="" data-toggle="buttons" id="div_' + people.id+ '_' + i + '" >' +
-                                           '<label class="btn btn-info2" style="font-size:10px;padding:5%;width:90%;margin:5%">' +
-                                           '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + people.id+'_' + i +'_'+k+'">'+stime+'-'+etime+
-                                           '</label>'+
-                                           "</div>";
-                            }
-                             }  
-                        }
-                       
-                        //eval("dataconfigs."+dkey+"="+cssValue);
-                        // if(i == 4 ){
-                        //     temphtml = '<div class="" data-toggle="buttons" id="div_' + people.id + '_' + i + '" >' +
-                        //      '<label class="btn btn-info2" style="font-size:10px;padding:5%;width:90%;margin:5%">' +
-                        //      "10:00-12:00"+
-                        //      '</label>'+
-                        //     "</div>";
-                        //     temphtml = temphtml+'<div class="" data-toggle="buttons" id="div_' + people.id + '_' + i + '" >' +
-                        //     '<label class="btn btn-info2" style="font-size:10px;padding:5%;width:90%;margin:5%">' +
-                        //     '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + people.id + '_' + i + '"> 10:00-12:00'+
-                        //     '</label>'+
-                        //    "</div>";
-                        // }else{
-                        //     //不存在稽查
-                        //     temphtml = '<div class="" data-toggle="buttons" id="div_' + people.id + '_' + i + '" >' +
-                        //     // '<label class="btn btn-info2" style="font-size:10px">' +
-                        //     // "10:00-12:00"+
-                        //     // '</label>';
-                        //     "</div>";
-                        // }
-                        data_table["day_" + i] = temphtml;
-                    }
-                    if(maxsize > 1){ 
-                        var dkey = "R"+maxsize;
-                        var cssValue = {'rowspan': maxsize};
-                        eval("dataconfigs.R"+row+"="+"{'rowspan': "+maxsize+"}");
-                        rowsDate.splice(row,0,"无效");
-                        row = row+1;
-                    }else{
-                        row = row+1;
-                    }
-                    datac.array.push(data_table);
-                }
-                if (tabledatagride != null) {
-                    tabledatagride.dataSource.data = null;
-                    tabledatagride.setDataSource(datac);
-                    tabledatagride.setPager(1, datac.array.length, datac.array.length);
-                    tabledatagride.setConfigs(dataconfigs);
-                    tabledatagride.render();
-                } else {
-                    $('#table_s').datagrid({
-                        dataSource: datac,
-                        states: { fixedLeftUntil: 1, fixedTopUntil: 0 },
-                        showRowIndex: false,
-    
-                        onRender: function() {
-                        },
-                        configs: dataconfigs
+        };
+        UserGetList(userData, function(redata) {
+            layer.close(layer.index);
+            var data = redata;
+
+
+            datatemp = {
+                data: data,
+                t: t,
+                starttime: starttime,
+                endtime: endtime,
+                time: time,
+                records: recodedata
+            };
+            reloadtableData();
+
+            if (tabledatagride != null) {
+                tabledatagride.dataSource.data = null;
+                tabledatagride.setDataSource(datac);
+                tabledatagride.setPager(1, datac.array.length, datac.array.length);
+                tabledatagride.render();
+            } else {
+
+                $(".completec").mouseover(function() {
+                    var titlehtml = "稽查完成";
+                    layer.tips(titlehtml, "#" + this.id, {
+                        tips: [1, '#8e8e8e'],
+                        time: 0,
+                        width: '240px'
                     });
-                    tabledatagride = $('#table_s').data('zui.datagrid');
-                }
-    
-                var jcb = {
-                    "organid":"29"
-                }
-                UserGetList(jcb, function(jcbdata) { 
-                    console.log(jcbdata);
-                   // checkuserlist = jcbdata;
-                for (var index in jcbdata) {
-                    var p = jcbdata[index];
-                    if(p.roles[0].id == 5){
-                        p.title = p.truename;
-                        checkuserlist.push(p);
-                    }
-                }
-                console.log(checkuserlist);
-    
-                if (checkusersselect != null) {
-                    reset();
-                } else {
-                    checkusersselect = $('#check_users').comboTree({
-                        source: checkuserlist,
-                        isMultiple: true
+                });
+                $(".doingc").mouseover(function() {
+                    var titlehtml = "稽查中";
+                    layer.tips(titlehtml, "#" + this.id, {
+                        tips: [1, '#8e8e8e'],
+                        time: 0,
+                        width: '240px'
                     });
-                }
-            
+                });
+                $(".unusec").mouseover(function() {
+                    var titlehtml = "无效";
+                    layer.tips(titlehtml, "#" + this.id, {
+                        tips: [1, '#8e8e8e'],
+                        time: 0,
+                        width: '240px'
+                    });
+                });
+                $(".novideoc").mouseover(function() {
+                    var titlehtml = "未上传视屏";
+                    layer.tips(titlehtml, "#" + this.id, {
+                        tips: [1, '#8e8e8e'],
+                        time: 0,
+                        width: '240px'
+                    });
+                });
+
+
+                $(".btn,.btc").mouseout(function() {
+                    layer.close(layer.index);
+                });
+
+                $('#myTable05').fixedHeaderTable({ altClass: 'odd', footer: false, fixedColumns: 1 });
+            }
+
+            for (var index in checkuserlist) {
+                var p = checkuserlist[index];
+                p.title = p.truename;
+            }
+
+            if (checkusersselect != null) {
+                reset();
+            }
+            checkusersselect = $('#check_users').comboTree({
+                source: checkuserlist,
+                isMultiple: true
             });
         });
     });
 }
 
-function setdatagrid(){
-    
+function setdatagrid() {
+
 }
 
 function reset() {
@@ -272,14 +215,12 @@ function reset() {
     $("#starttime").val("");
     $("#endtime").val("");
 
-
-
 }
 
 
 function selectedTask(obj) {
+
     changeListItem(obj.id);
-  
 }
 
 function removeListItem(obj) {
@@ -290,47 +231,60 @@ function removeListItem(obj) {
 }
 
 function changeListItem(id) {
-    console.log(taskMap);
     var cobj;
     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'));
-     var currentday = temp.add(tempids[1], "day");
-    var taskMapid = tempids[0]+"_"+currentday.format("YYYY-MM-DD");
+    var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+    var currentday = temp.add(tempids[1], "day");
+    var taskMapid = tempids[0] + "_" + currentday.format("YYYY-MM-DD");
     var cpeople;
-    for(var index in rowsDate){
-       var  obj = rowsDate[index];
-       if(obj.id == tempids[0]){
-           cpeople = obj;
-           // truename = obj.truename; 
-       }
+
+    for (var index in datatemp.data) {
+        var user = datatemp.data[index];
+        if (user.id == tempids[0]) {
+            cpeople = user;
+        }
     }
-    for(var i in recordlist){ 
-        if(taskMap.get(taskMapid)[id.split("_")[2]].id == recordlist[i].id){
-           cobj = recordlist[i];
+
+    for (var i in taskMap.get(taskMapid)) {
+        if (taskMap.get(taskMapid)[i].id == tempids[2]) {
+            cobj = taskMap.get(taskMapid)[i];
         }
     }
 
     if ($("#" + id).prop('checked')) {
-        activteChange(cobj,tempids);
-       addlisttable(cobj, taskMapid,id);
+        activteChange(cobj, tempids);
+        addlisttable(cobj, id);
     } else {
-        activteRemove(cobj,tempids);
-        removelisttable(cobj, currentday.format("YYYY-MM-DD"));
+        activteRemove(cobj, tempids);
+        removelisttable(cobj);
     }
 }
 
 
-function addlisttable(people, id,arryid) {
+function addlisttable(record, id) {
+    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'));
+    var currentday = temp.add(tempids[1], "day");
+
+    var stime = moment(record.received_time).format("HH:mm");
+    var etime = moment(record.back_time).format("HH:mm");
+
+    var taskname = currentday.format("YYYY-MM-DD") + " " + stime + "~" + etime + " " + record.car_info + "清障任务";
+    record.rname = taskname;
+
+    var feeList = $.zui.store.get("cache_wrecker_group_list");
     var dept_info = null;
+    for (var index in feeList) {
+        var dept = feeList[index];
+        if (record.dept == dept.deptid) {
+            dept_info = dept;
+        }
+    }
     id = trim(id);
-    var time = id.split("_")[1];
-    var record =  taskMap.get(id)[arryid.split("_")[2]];
-    var date = moment(record.received_time).format("MM/DD");
-    var stime = moment(record.received_time).format("HH:mm");
-     var etime = moment(record.back_time).format("HH:mm");
-    var btn = '<button class="btn btn-primary" type="button" onclick="removeListItem(this)" id="delete_' + arryid + '">删除</button>';
-    selectedData.array.push({"name": people.userNames, "car": date+' '+stime+"-"+etime+record.car_info+"清障任务", "option": btn, peopleinfo:people,time:time});
+    var btn = '<button class="btn btn-primary" type="button" onclick="removeListItem(this)" id="delete_' + id + '">删除</button>';
+    selectedData.array.push({ "usernames": record.userNames, "time": currentday.format("YYYY-MM-DD"), "dept_name": dept_info.name, "taskname": taskname, "option": btn, recordInfo: record, deptInfo: dept_info });
 
     var myDataGrid = $('#selected_table').data('zui.datagrid');
     myDataGrid.dataSource.data = null;
@@ -338,18 +292,19 @@ function addlisttable(people, id,arryid) {
     myDataGrid.setPager(1, selectedData.array.length, selectedData.array.length);
     myDataGrid.render();
 
-    // $('#selected_table').data('zui.datagrid').setDataSource(selectedData);
-    // $('#selected_table').data('zui.datagrid').renderData();
 }
 
-function removelisttable(people,time) {
-     for (var index in selectedData.array) {
-         var o = selectedData.array[index];
-         if (o != null && o.peopleinfo.id == people.id && time.format("YYYY-MM-DD") == o.time) {
-             selectedData.array.splice(index, 1);
-         }
-     }
-     var myDataGrid = $('#selected_table').data('zui.datagrid');
+function removelisttable(record) {
+
+    console.log(record)
+
+    for (var index in selectedData.array) {
+        var o = selectedData.array[index];
+        if (o != null && o.recordInfo.id == record.id) {
+            selectedData.array.splice(index, 1);
+        }
+    }
+    var myDataGrid = $('#selected_table').data('zui.datagrid');
     myDataGrid.dataSource.data = null;
     myDataGrid.setDataSource(selectedData);
     myDataGrid.setPager(1, selectedData.array.length, selectedData.array.length);
@@ -361,7 +316,7 @@ function removelisttable(people,time) {
 
 
 function search() {
-    inittAreaable($("#month_date").val(), $("#qzd").val(),$("#qzdpeople").val());
+    inittAreaable($("#month_date").val(), $("#qzd").val());
 
 }
 
@@ -369,7 +324,6 @@ function search() {
 function addTask() {
     //获取列表
     var tasklist = selectedData.array;
-    console.log(tasklist);
     if (tasklist.length < 1) {
         layer.msg('未选择清障记录!', {
             time: 2000, //20s后自动关闭
@@ -377,34 +331,35 @@ function addTask() {
         return;
     }
     var check_user_list = checkusersselect.getSelectedItemsId();
-    var count = tasklist.length / check_user_list.length;
-    var u_index = 0;
-    var index = 0;
-    for(var i in tasklist){
-        var obj = tasklist[i];
-        if (index++ == count) {
-            u_index++;
-            if (u_index == check_user_list.length) {
-                u_index--;
-            }
-        }
-          var param = {
-               "name": obj.car,
-              "check_status": 2,
-             "start_time" :moment(obj.peopleinfo.received_time).format("YYYY-MM-DD HH:mm:ss"),
-               "end_time" : moment(obj.peopleinfo.back_time).format("YYYY-MM-DD HH:mm:ss"),
-               "checked_dept": obj.peopleinfo.dept,
-             "checkman" : parseInt(check_user_list[u_index]),
-              "record_id" : parseInt(obj.peopleinfo.id),
-               "checked_users" : obj.peopleinfo.users,
-               "rule_id" : 6      
-            }
-            console.log(param);
-         post_common_service('/q/task/add', param, function(redata) {
-         layer.msg('已添加', { icon: 1 });
-        //inittAreaable($("#month_date").val(), $("#qzd").val());
+
+    // var param = {
+    //     "name": obj.car,
+    //     "check_status": 2,
+    //     "start_time": moment(obj.peopleinfo.received_time).format("YYYY-MM-DD HH:mm:ss"),
+    //     "end_time": moment(obj.peopleinfo.back_time).format("YYYY-MM-DD HH:mm:ss"),
+    //     "checked_dept": obj.peopleinfo.dept,
+    //     "checkman": parseInt(check_user_list[u_index]),
+    //     "record_id": parseInt(obj.peopleinfo.id),
+    //     "checked_users": obj.peopleinfo.users,
+    //     "rule_id": 6
+    // }
+    // console.log(param);
+
+
+
+    var check_user_list = checkusersselect.getSelectedItemsId();
+    var plist = []
+    tasklist.forEach(t => {
+        plist.push(t.recordInfo);
     });
-    }
+    console.log(plist)
+    var param = { "userids": check_user_list, "qzdRecord": plist };
+
+    post_common_service('/q/task/add', param, function(redata) {
+        layer.msg('已添加', { icon: 1 });
+        inittAreaable($("#month_date").val(), $("#qzd").val());
+    });
+
     // post_common_service('/f/task/add', param, function(redata) {
     //     // layer.msg('已添加', { icon: 1 });
     //     inittAreaable($("#month_date").val(), $("#qzd").val());
@@ -413,43 +368,132 @@ function addTask() {
 
 }
 
-function getpeople(){
-    var orginid = $("#qzd").val();
-    var userData = {
-        "organid": orginid
-    }
-    UserGetList(userData, function(data) {
-        var opstr ='<option>全部</option>';
-        for(var i in data){
-            opstr += "<option value='"+data[i].id+"'>"+data[i].truename+"</option>";
-        }
-        $(qzdpeople).html('');
-        $(qzdpeople).html(opstr);
-    });
+function getpeople() {
+    // var orginid = $("#qzd").val();
+    // var userData = {
+    //     "organid": orginid
+    // }
 }
 
-function activteChange(cobj,tempids){
+function activteChange(cobj, tempids) {
     var usersids = cobj.users.split(",");
-        if(usersids.length >1){
-            for(var j in usersids){
-                var objid = usersids[j]+"_"+tempids[1]+"_"+tempids[2];
-                if($("#" + objid).prop('checked') == false){
-                   $("#" + objid).parent().addClass("active");
-                   $("#" + objid).prop("checked", true);
-                }
-           }
+    if (usersids.length > 1) {
+        for (var j in usersids) {
+            var objid = usersids[j] + "_" + tempids[1] + "_" + tempids[2];
+            if ($("#" + objid).prop('checked') == false) {
+                $("#" + objid).parent().addClass("active");
+                $("#" + objid).prop("checked", true);
+            }
         }
+    }
 }
 
-function activteRemove(cobj,tempids){
+function activteRemove(cobj, tempids) {
     var usersids = cobj.users.split(",");
-        if(usersids.length >1){
-            for(var j in usersids){
-                var objid = usersids[j]+"_"+tempids[1]+"_"+tempids[2];
-                if($("#" + objid).prop('checked')){
-                   $("#" + objid).parent().removeClass("active");
-                   $("#" + objid).prop("checked", false);
-                }
-           }
+    if (usersids.length > 1) {
+        for (var j in usersids) {
+            var objid = usersids[j] + "_" + tempids[1] + "_" + tempids[2];
+            if ($("#" + objid).prop('checked')) {
+                $("#" + objid).parent().removeClass("active");
+                $("#" + objid).prop("checked", false);
+            }
         }
+    }
 }
+
+
+
+var userlist = null;
+var stimemonth = null;
+var datatemp = {};
+
+function reloadtableData() {
+    var data = datatemp.data;
+    var t = datatemp.t;
+    var starttime = datatemp.starttime;
+    var endtime = datatemp.endtime;
+    var time = datatemp.time;
+
+    datac = { cols: [], array: [] };
+
+    var days = endtime.diff(starttime, 'days');
+
+    datac.cols.push({ width: 200, name: 'type', label: "", });
+
+    var tbhtml = "";
+    var thhtml = "<thead><tr>";
+    var tbodyhtml = "<tbody>";
+
+    thhtml += "<th>" + "<button class='datatime' onclick='selectedall(this)' id='datatimebtn_" + i + "' style='width:100px;height:100%;background:rgba(0,0,0,0)'></button>" + "</th>";
+
+    for (var i = 1; i <= days; i++) {
+        var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+        var currentday = temp.add(i, "day");
+        var day = currentday.date();
+        thhtml += "<th>" + "<button class='datatime' onclick='selectedall(this)' id='datatimebtn_" + i + "' style='width:100px;height:100%;background:rgba(0,0,0,0)'>" + currentday.format("MM-DD") + "</button>" + "</th>";
+        // datac.cols.push({ width: 80, name: "day_" + i, label: "<button class='datatime' onclick='selectedall(this)' id='datatimebtn_" + i + "' style='width:100%;height:100%;background:rgba(0,0,0,0)'>" + currentday.format("MM-DD") + "</button>", html: true, className: "table_content" });
+    }
+    thhtml += "</tr></thead>";
+    tbhtml += thhtml;
+    userlist = data;
+    stimemonth = time;
+
+
+    for (var index in data) {
+        var user = data[index];
+
+        tbodyhtml += "<tr>";
+        tbodyhtml += "<td style='vertical-align:middle'><label style='width:100px;margin:0'>" + user.truename + "</label></td>";
+
+        for (var i = 1; i <= days; i++) {
+            //内容
+            var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+            var currentday = temp.add(i, "day");
+            var key = user.id + "_" + currentday.format("YYYY-MM-DD");
+
+            var temphtml = "";
+            tbodyhtml += "<td>";
+
+            if (taskMap.get(key) != null) {
+                //存在稽查记录
+                var list = taskMap.get(key);
+
+                list.forEach(r => {
+                    var t = r.task;
+                    //未生成任务
+                    if (t == null) {
+                        if (r.videos == null || r.videos == undefined || r.videos == "") {
+                            temphtml += '<button data-toggle="button" class="btc novideoc" style="margin:10px;background:#fff;border-color:#fff;color:#03b8cf"  type="button" id="' + user.id + '_' + i + '_' + r.id + '">' + moment(r.received_time).format("HH:mm") + "~" + moment(r.back_time).format("HH:mm") + '</button>';
+
+                        } else {
+                            temphtml += '<div class="btn-group normal" style="margin:10px;" data-toggle="buttons" id="btn_u_' + user.id + '_r_' + r.id + '"> <label class="btn btn-info2 "> <input type="checkbox"  onchange="selectedTask(this)" id="' + user.id + '_' + i + '_' + r.id + '">' + moment(r.received_time).format("HH:mm") + "~" + moment(r.back_time).format("HH:mm") + '</label></div>';
+                            //temphtml += '<button data-toggle="button" class="btc normal" style="margin:10px" onclick="selectedTask(this)" type="button" id="' + user.id + '_' + i + '_' + r.id + '">' + moment(r.received_time).format("HH:mm") + "~" + moment(r.back_time).format("HH:mm") + '</button>';
+
+                        }
+
+                    } else
+                    if (t.check_status == 4 || t.check_status == 16 || t.check_status == 6) {
+                        //完成稽查
+                        temphtml += '<button data-toggle="button" class="btc completec" style="margin:10px"  type="button" id="' + user.id + '_' + i + '_' + r.id + '">' + moment(r.received_time).format("HH:mm") + "~" + moment(r.back_time).format("HH:mm") + '</button>';
+
+                    } else
+                    if (t.check_status == 22) {
+                        //存在无效任务
+                        temphtml += '<button data-toggle="button" class="btc unusec" style="margin:10px"  type="button" id="' + user.id + '_' + i + '_' + r.id + '">' + moment(r.received_time).format("HH:mm") + "~" + moment(r.back_time).format("HH:mm") + '</button>';
+
+                    } else {
+                        //考核进行中
+                        temphtml += '<button data-toggle="button" class="btc doingc" style="margin:10px;" type="button" id="' + user.id + '_' + i + '_' + r.id + '">' + moment(r.received_time).format("HH:mm") + "~" + moment(r.back_time).format("HH:mm") + '</button>';
+                    }
+                });
+            }
+            tbodyhtml += temphtml;
+            tbodyhtml += "</td>";
+        }
+        tbodyhtml += "</tr>";
+    }
+    tbodyhtml += "</tbody>";
+    tbhtml += tbodyhtml;
+    $("#table_html").html('<table class="fancyTable" id="myTable05" cellpadding="0" cellspacing="0"> </table>');
+    $("#myTable05").html(tbhtml)
+}

+ 46 - 48
VisualInspection/qzd/js/task/new.js

@@ -11,7 +11,7 @@ function initTaskPage() {
     initQueryParams();
     initTableRowBtn();
     queryTask();
-    getRecord();
+    // getRecord();
 }
 
 function initQueryParams() {
@@ -51,9 +51,9 @@ function initQueryParams() {
 }
 //初始化表行按钮
 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_1", [{ func: 'checkUpdate', text: '修改', icon_class: '' },
+        { func: 'deleteRecord', text: '删除', icon_class: 'text-center' }
+    ]);
     $.zui.store.set("task_table_btn_2", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
     // $.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' }]);
@@ -70,9 +70,9 @@ function queryTask() {
     console.log(user.roles[0]);
     var t = getTimeByMonth(GV("#start_time"));
     var data = {
-          "startTime": new Date(getMomentTimeFormat(t.starttime)),
-          "endTime":new Date(getMomentTimeFormat(t.endtime)),
-          "dept": $("#deptlist").val(),
+        "startTime": getMomentTimeFormat(t.starttime),
+        "endTime": getMomentTimeFormat(t.endtime),
+        "dept": $("#deptlist").val(),
         // "check_status": cur_status
     };
     var hide = false;
@@ -81,22 +81,22 @@ function queryTask() {
     }
     var cols = [
         { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
-        { width: 80, text: '清障队', type: 'string', flex: true,colClass: 'text-center', sort: 'down', field: 'deptName' },
-        { width: 80, text: '桩号', type: 'string', flex: true, colClass: 'text-center',sort: 'down', field: 'addr' },
+        { width: 80, text: '清障队', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'deptName' },
+        { width: 80, text: '桩号', type: 'string', flex: true, colClass: 'text-center', sort: 'down', field: 'addr' },
         { width: 80, text: '车牌号', type: 'string', flex: true, hide: hide, colClass: 'text-center', field: 'car_info' },
-        { width: 80, text: '客户信息', type: 'string', flex: true, sort: 'down',colClass: 'text-center', field: 'car_user_info' },
-        { width: 120, text: '接警时间', type: 'string', flex: true, sort: 'down',colClass: 'text-center', field: 'received_time' },
-        { width: 160, text: '出勤人员', type: 'string', flex: true, sort: 'down',colClass: 'text-center', field: 'userNames' },
+        { width: 80, text: '客户信息', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'car_user_info' },
+        { width: 120, text: '接警时间', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'received_time' },
+        { width: 160, text: '出勤人员', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'userNames' },
         // {width: 120, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'}
     ];
     user.roles[0].id = 1;
-    if(user.roles[0].id == 1){
-        var colFunc = { width: 160, text: '操作', type: 'string', flex: true, field: 'id',colClass: 'text-center' };
+    if (user.roles[0].id == 1) {
+        var colFunc = { width: 160, text: '操作', type: 'string', flex: true, field: 'id', colClass: 'text-center' };
         colFunc.oper = $.zui.store.get("task_table_btn_1");
         cols.push(colFunc);
         $("#saveButton").show();
-    }else if(user.roles[0].id == 16 || user.roles[0].id == 17){
-        var colFunc = { width: 160, text: '操作', type: 'imagebutton', flex: true, field: 'pics',colClass: 'text-center' };
+    } else if (user.roles[0].id == 16 || user.roles[0].id == 17) {
+        var colFunc = { width: 160, text: '操作', type: 'imagebutton', flex: true, field: 'pics', colClass: 'text-center' };
         colFunc.oper = $.zui.store.get("task_table_btn_1");
         cols.push(colFunc);
     }
@@ -124,7 +124,7 @@ function queryTask() {
 }
 
 
-function addTask(){
+function addTask() {
     is_save = 0;
     resert();
     // var contenthtml =  base_ui_url+'qzd/view/task/addtask.html';
@@ -132,7 +132,7 @@ function addTask(){
     $('#addModal').modal('show');
 }
 
-function openUpload(){
+function openUpload() {
     return $("#fileupload").click();
 }
 
@@ -151,10 +151,10 @@ function UpladFile() {
     }, "task");
 }
 
-function checkUpdate(id){
-    is_save = "_"+id;
-    var data ={
-        "id":id
+function checkUpdate(id) {
+    is_save = "_" + id;
+    var data = {
+        "id": id
     };
     post_common_service('q/record/one', data, function(redata) {
         $('#addModal').modal('show');
@@ -182,44 +182,42 @@ function checkUpdate(id){
         $("#dept").val(redata.dept);
         $("#carUserSatisfaction").val(redata.car_user_satisfaction);
         var userids = redata.users.split(",");
-        for(var i in userids){
-            $('span[data-id="'+userids[i]+'"] input').click();
+        for (var i in userids) {
+            $('span[data-id="' + userids[i] + '"] input').click();
         }
         $("#recordUser").val(redata.userNames);
         $("#addr").val(redata.addr);
- })
+    })
 }
 
-function deleteRecord(id){
-    var data ={
-        "id":id
+function deleteRecord(id) {
+    var data = {
+        "id": id
     };
     post_common_service('q/record/delete', data, function(redata) {
         queryTask();
- });
-} 
-
-function resert(){
-        $("#type").val('1');
-        $("#carinfo").val('');
-        $("#startTime").val('');
-        $("#carUserinfo").val('');
-        $("#dept").val('');
-        $("#carUserSatisfaction").val('');
-        $(".ComboTreeItemChlid").find("input").prop('checked', false);
-        $("#recordUser").val('');
-        $("#addr").val('');
+    });
+}
+
+function resert() {
+    $("#type").val('1');
+    $("#carinfo").val('');
+    $("#startTime").val('');
+    $("#carUserinfo").val('');
+    $("#dept").val('');
+    $("#carUserSatisfaction").val('');
+    $(".ComboTreeItemChlid").find("input").prop('checked', false);
+    $("#recordUser").val('');
+    $("#addr").val('');
 }
 
-function getRecord(){
+function getRecord() {
     var data = {
         // "startTime": new Date(getMomentTimeFormat(t.starttime)),
         // "endTime":new Date(getMomentTimeFormat(t.endtime)),
         "dept": $("#deptlist").val(),
-      // "check_status": cur_status
-      
-  };
-  post_common_service('q/record/getall/0/0', data, function(redata) {
-      console.log(redata);
-});
+        // "check_status": cur_status
+
+    };
+
 }

+ 9 - 9
VisualInspection/qzd/js/task/task_list.js

@@ -102,16 +102,16 @@ function queryTask() {
         "checked_dept": $("#qzd").val(),
         "check_status": cur_status
     };
-     console.log(data);
+    console.log(data);
     var hide = false;
     if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
         hide = true;
     }
     var cols = [
         { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
-        { width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down', field: 'name' },
-        { width: 80, text: '考核人员', type: 'string', flex: true, sort: 'down', field: 'checked_users_name' },
-        { width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down', field: 'checked_dept_name' },
+        { width: 200, text: '任务名称', type: 'string', flex: true, sort: 'down', field: 'name' },
+        { width: 80, text: '考核部门', type: 'string', flex: true, sort: 'down', field: 'checked_dept_name' },
+        { width: 80, text: '考核人员', type: 'string', flex: true, colClass: '', field: 'checked_users_name' },
         { width: 80, text: '稽查人员', type: 'string', flex: true, hide: hide, colClass: '', field: 'checkman_name' },
         { width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down', field: 'check_period' },
         // {width: 120, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'}
@@ -270,10 +270,10 @@ function confirmTaskPatch() {
 }
 
 
-function gettask(){
-    param={"check_status":2};
+function gettask() {
+    param = { "check_status": 2 };
     post_common_service('/q/task/getall/0/0', param, function(redata) {
-      console.log(redata);
-       //inittAreaable($("#month_date").val(), $("#qzd").val());
-   });
+        console.log(redata);
+        //inittAreaable($("#month_date").val(), $("#qzd").val());
+    });
 }

+ 79 - 27
VisualInspection/qzd/view/task/add.html

@@ -10,6 +10,7 @@
     .table_content {
         padding: 0;
     }
+    
     .btn_c,
     .btn_c label {
         width: 80% !important;
@@ -21,18 +22,64 @@
     table th {
         text-align: center;
     }
-    .divstyle{
-        width: 60px;
+    
+    .btc {
+        padding: 5px 12px !important;
+        border: 1px solid;
+    }
+    
+    .doingc {
+        color: #fff;
+        background-color: #2EA98C;
+        border-radius: 4px;
+        border-color: #2EA98C;
+        text-shadow: none;
+    }
+    
+    .unusec {
+        color: #fff;
+        background-color: #ed980f;
+        border-radius: 4px;
+        border-color: #ed980f;
+        text-shadow: none;
+    }
+    
+    .completec {
+        color: #fff;
+        background-color: #ea644a;
+        border-radius: 4px;
+        border-color: #ea644a;
+        text-shadow: none;
+    }
+    
+    .normal {
+        color: #fff;
+        background-color: #03b8cf;
+        border-radius: 4px;
+        border-color: #03b8cf;
+        text-shadow: none;
+    }
+    
+    .novideoc {
+        color: #03b8cf;
+        background-color: #fff;
+        border-radius: 4px;
+        border-color: #fff;
+        text-shadow: none;
+    }
+    
+    .divstyle {
+        width: 30px;
         height: 20px;
         float: left;
     }
 </style>
 
 <div class="container-fluid ">
-    <div class="row" >
+    <div class="row">
 
         <span style="float: left;
-        padding-top: 5px;">时间:</span>
+        padding-top: 5px;">周期:</span>
         <div class="div-month">
             <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
         </div>
@@ -41,11 +88,11 @@
         <div class="div-station">
             <select class="form-control" id="qzd" onchange="getpeople()"></select>
         </div>
-        <span style="float: left;
+        <!-- <span style="float: left;
         padding-top: 5px;">人员:</span>
         <div class="div-station">
             <select class="form-control" id="qzdpeople"></select>
-        </div>
+        </div> -->
 
         <div class="col-xs-1">
             <div class="input-group">
@@ -54,33 +101,38 @@
         </div>
     </div>
 
-    <div class="row" style="height: 400px;">
-        <div class="datagrid" id="table_s" data-checkable="false" data-sortable="false"></div>
+    <div class="row" style="height: 390px;" id="table_html">
+        <!-- <div class="datagrid" id="table_s" data-checkable="false" data-sortable="false"> -->
+
+        <table class="fancyTable" id="myTable05" cellpadding="0" cellspacing="0">
+
+        </table>
+
+
+        <!-- </div> -->
     </div>
-    <br/>
-    <div class="row">
+
+    <div class="row" style="margin-top: 5px">
         <div class="col-xs-2">
-             <div class="divstyle" style="background-color: white"></div><span style="float: left;">&nbsp;&nbsp;未上传视频</span>
-        </div> 
+            <div class="divstyle" style="background-color: white"></div><span style="float: left;">&nbsp;&nbsp;未上传视频</span>
+        </div>
         <div class="col-xs-2">
-                <div class="divstyle" style="background-color: #03b8cf"></div><span style="float: left;">&nbsp;&nbsp;上传视频未稽查</span>
-        </div> 
+            <div class="divstyle" style="background-color: #03b8cf"></div><span style="float: left;">&nbsp;&nbsp;未稽查</span>
+        </div>
         <div class="col-xs-2">
             <div class="divstyle" style="background-color: gray"></div><span style="float: left;">&nbsp;&nbsp;已选任务</span>
-        </div> 
-    </div>
-    <br/>
-    <div class="row">
-            <div class="col-xs-2">
-                 <div class="divstyle" style="background-color: red"></div><span style="float: left;">&nbsp;&nbsp;已稽查</span>
-            </div> 
-            <div class="col-xs-2">
-                    <div class="divstyle" style="background-color: green"></div><span style="float: left;">&nbsp;&nbsp;稽查中</span>
-            </div> 
-            <div class="col-xs-2">
-                <div class="divstyle" style="background-color: blue"></div><span style="float: left;">&nbsp;&nbsp;无效</span>
-            </div> 
         </div>
+        <div class="col-xs-2">
+            <div class="divstyle" style="background-color: #ea644a"></div><span style="float: left;">&nbsp;&nbsp;已稽查</span>
+        </div>
+        <div class="col-xs-2">
+            <div class="divstyle" style="background-color:#2EA98C"></div><span style="float: left;">&nbsp;&nbsp;稽查中</span>
+        </div>
+        <div class="col-xs-2">
+            <div class="divstyle" style="background-color: #ed980f"></div><span style="float: left;">&nbsp;&nbsp;无效</span>
+        </div>
+    </div>
+
     <div class="row">
         <div class="col-xs-6" style="">
             <div class="row">

+ 7 - 2
VisualInspection/view/common/commoncsslink.html

@@ -7,9 +7,14 @@
 <link rel="stylesheet" type="text/css" href="/js/lib/kkpager_green.css">
 <link rel="stylesheet" type="text/css" href="/js/lib/slide/css/bootstrap-slider.min.css">
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">
-<link rel="stylesheet" type="text/css" href="/js/lib/webuploader/webuploader.css">  
-<link rel="stylesheet" type="text/css" href="/js/lib/tags/jquery.tagsinput.min.css"> 
+<link rel="stylesheet" type="text/css" href="/js/lib/webuploader/webuploader.css">
+<link rel="stylesheet" type="text/css" href="/js/lib/tags/jquery.tagsinput.min.css">
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/uploader/zui.uploader.min.css">
 <link href="/node_modules/zui/dist/lib/chosen/chosen.min.css" rel="stylesheet">
 <link rel="stylesheet" type="text/css" href="/js/lib/jedate/skin/jedate.css">
 <link rel="stylesheet" type="text/css" href="/node_modules/video.js/dist/video-js.min.css">
+
+<link rel="stylesheet" type="text/css" href="/node_modules/fixed-header-table/css/defaultTheme.css">
+
+<link href="/node_modules/fixed-header-table/demo/css/960.css" rel="stylesheet" media="screen" />
+<link href="/node_modules/fixed-header-table/demo/css/myTheme.css" rel="stylesheet" media="screen" />

+ 4 - 0
VisualInspection/view/common/commonscriptlink.html

@@ -32,6 +32,10 @@
 <script src="/js/util/video.js"></script>
 <script src="/js/util/media.js"></script>
 
+<script src="/node_modules/fixed-header-table/jquery.fixedheadertable.min.js"></script>
+
+
+
 <script type="text/javascript">
     $(document).ready(function() {
         // getServerTime();

+ 19 - 2
VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/RecordController_Q.java

@@ -8,9 +8,11 @@ import com.xintong.visualinspection.pojo.fwq.TaskData_F;
 import com.xintong.visualinspection.service.CheckAppealService_F;
 import com.xintong.visualinspection.service.RecordService_Q;
 import com.xintong.visualinspection.service.TaskService_F;
+import com.xintong.visualinspection.service.UserService;
 import com.xintong.visualinspection.util.AuthorUtil;
 import com.xintong.visualinspection.util.CacheUtil;
 import com.xintong.visualinspection.util.Constants;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +21,9 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/q/record")
@@ -30,7 +34,8 @@ public class RecordController_Q extends BaseController {
             registry = "${dubbo.registry.address}")
     private RecordService_Q recordService_q;
 
-
+    @Autowired
+    private UserService userService;
 
     @RequestMapping(value = "/getall/{page}/{size}")
     public String getall(HttpServletRequest request, @PathVariable Integer page, @PathVariable Integer size, @RequestBody QzdRecord qzdRecord) {
@@ -41,7 +46,19 @@ public class RecordController_Q extends BaseController {
             qzdRecord.setDept(user.getOrganid());
         }
         Object ss = recordService_q.getAllRecord(page, size, qzdRecord);
-        return super.returnSuccessResult(ss);
+
+        if(page==0&&size==0) {
+            Map<String, Object> u = new HashMap<String, Object>();
+            User us = new User();
+            us.setOrganid(29);
+            List<Integer> pos = new ArrayList<>();
+            pos.add(2);
+            us.setPosition_ids(pos);
+            u.put("checkusers", userService.getUsers(us));
+            u.put("records", ss);
+            return super.returnSuccessResult("success",u,"yyyy-MM-dd HH:mm:ss");
+        }
+        return super.returnSuccessResult("success",ss,"yyyy-MM-dd HH:mm:ss");
     }
 
 

+ 20 - 3
VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/gettway/TaskController_Q.java

@@ -5,9 +5,11 @@ import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.*;
 import com.xintong.visualinspection.controller.BaseController;
 import com.xintong.visualinspection.pojo.fwq.TaskData_F;
+import com.xintong.visualinspection.pojo.qzd.TaskDate_Q;
 import com.xintong.visualinspection.service.CheckAppealService_F;
 import com.xintong.visualinspection.service.TaskService_Q;
 import com.xintong.visualinspection.util.AuthorUtil;
+import com.xintong.visualinspection.util.CacheUtil;
 import com.xintong.visualinspection.util.Constants;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -33,13 +36,26 @@ public class TaskController_Q extends BaseController {
 
 
     @RequestMapping(value = "/add")
+    public String addtask(HttpServletRequest request, @RequestBody TaskDate_Q taskData_q) {
+        if (taskData_q == null || taskData_q.getQzdRecord() == null || taskData_q.getUserids() == null || taskData_q.getUserids().size() < 1 || taskData_q.getQzdRecord().size() < 1) {
+            throw new BusinessException(21502);
+        }
+        List<User> us = new ArrayList<>();
+        for (String u : taskData_q.getUserids()
+                ) {
+            User user = CacheUtil.userMap.get(Long.valueOf(u));
+            us.add(user);
+        }
+        taskData_q.setUsers(us);
 
-    public String addtask(HttpServletRequest request, @Valid @RequestBody QzdCheckTask task) {
+        User user = getCurrentUser(request);
+        taskData_q.setUser_id(user.getId());
         try {
-            taskService_q.addTask(task);
-        }catch (Exception e) {
+            taskService_q.addTask(taskData_q);
+        } catch (Exception e) {
             throw new BusinessException(21501);
         }
+
         return super.returnSuccessResult("添加成功", null);
     }
 
@@ -54,6 +70,7 @@ public class TaskController_Q extends BaseController {
             qzdCheckTask.setCheckman(new Long(user.getId()));
         }
         Object ss = taskService_q.getAllTask(page, size, qzdCheckTask);
+
         return super.returnSuccessResult(ss);
     }
 

+ 28 - 0
Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/QzdRecord.java

@@ -1,6 +1,8 @@
 package com.xintong.visualinspection.bean;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -12,16 +14,26 @@ import java.util.Date;
 @Data
 public class QzdRecord implements Serializable {
     private Integer id;  //编号
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date creat_time; //创建时间
     private Integer type;//'类型 1 抛锚  2 事故'
     private String users;//'清障员'
     private Integer dept;//'部门'
     private String addr;//'桩号'
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date received_time;//'接警时间'
     private String car_info;//'车辆信息'
     private String car_user_info;//'车主信息'
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date start_time;//'出警时间'
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date arrive_time;//'到达时间'
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date back_time;//'撤离时间'
     private Integer record_user;//'值机员'
     private Integer arrive_in_time;//'N分钟到达 1到达 0否'
@@ -37,14 +49,30 @@ public class QzdRecord implements Serializable {
     private String remarks;//'备注'
     private String deptName;//'部门名称'
     private String userNames;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date startTime;//'开始时间'
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date endTime;//'结束时间'
     private Integer check_status;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date delivery_time;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date accept_time;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date rescue_time;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date relief_time;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date backfield_time;
 
+    private String rname;
+
 
 }

+ 2 - 1
Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/qzd/TaskDate_Q.java

@@ -4,9 +4,10 @@ import com.xintong.visualinspection.bean.QzdRecord;
 import com.xintong.visualinspection.bean.User;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 @Data
-public class TaskDate_Q {
+public class TaskDate_Q implements Serializable {
     private List<User> users;
     private List<QzdRecord> qzdRecord;
     private Integer user_id;

+ 1 - 1
Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/TaskService_Q.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 public interface TaskService_Q {
     public Object getAllTask(Integer page,Integer size,QzdCheckTask qzdCheckTask);
-    public void addTask(QzdCheckTask qzdCheckTask);
+//    public void addTask(QzdCheckTask qzdCheckTask);
     public void updateStatus(QzdCheckTask qzdCheckTask);
     public QzdCheckTask getTask(QzdCheckTask qzdCheckTask);
     public void addTask(TaskDate_Q taskDate_q)  throws Exception;

+ 1 - 0
Visuallnspection_fjq/visuallnspectioninteface/target/maven-archiver/pom.properties

@@ -1,5 +1,6 @@
 #Generated by Maven
 #Sat Aug 11 15:17:02 GMT+08:00 2018
+#Sat Aug 11 16:35:06 CST 2018
 version=1.0-SNAPSHOT
 groupId=com.xintong.visuallnspection.inteface
 artifactId=visuallnspectioninteface

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

@@ -1,54 +1,52 @@
-D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckAppealService_F.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\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\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\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\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\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\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\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\ConstantService.java
-D:\沿海高速\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\bean\Constant.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/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

+ 6 - 0
Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst.rej

@@ -0,0 +1,6 @@
+diff a/Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/Visuallnspection_fjq/visuallnspectioninteface/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst	(rejected hunks)
+@@ -2,3 +3,4 @@
++<<<<<<< HEAD
+ D:\�غ�����\Visuallnspection_fjq\visuallnspectioninteface\src\main\java\com\xintong\visualinspection\service\CheckAppealService_F.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

+ 48 - 5
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/mapper/master/TaskMapper.xml

@@ -30,20 +30,63 @@
         ORDER BY start_time DESC
     </select>
 
-    <select id="getall" parameterType="com.xintong.visualinspection.bean.QzdCheckTask" resultType="com.xintong.visualinspection.bean.QzdCheckTask">
-      select  t.*,CONCAT(substr(t.start_time,1,16),'-',substr(t.end_time,12,5)) as check_period,r.videos as videos,r.pics as pics from  check_task t left join  record_info r on r.id = t.record_id
-      where 1=1
+    <select id="getall" parameterType="com.xintong.visualinspection.bean.FwqCheckTask" resultType="com.xintong.visualinspection.bean.QzdCheckTask">
+        select t.*,CONCAT(substr(t.start_time,1,16),'-',substr(t.end_time,12,5)) as check_period
+        ,ca.appeal_result as appeal_result
+        from check_task t
+        left join check_appeal ca on t.id=ca.task_id
+        where 1=1
+        <if test="period_id != null">AND t.period_id = #{period_id}</if>
+
         <if test="checked_dept != null">AND t.checked_dept = #{checked_dept}</if>
         <if test="start_time != null and end_time != null">AND t.start_time >= #{start_time} <![CDATA[ AND t.end_time < #{end_time}]]> </if>
         <choose>
             <when test="check_status_end != null and check_status != null">
-                AND check_status &gt;= #{check_status} AND t.check_status &lt;= #{check_status_end}
+                AND t.check_status &gt;= #{check_status} AND t.check_status &lt;= #{check_status_end}
+
             </when>
             <otherwise>
                 <if test="check_status != null"> AND t.check_status = #{check_status}</if>
             </otherwise>
         </choose>
-        <if test="checked_users != null">AND t.checked_users like #{checked_users}</if>
+
+
+        <if test="checkman != null">AND t.checkman = #{checkman}</if>
+        <if test="record_id != null">AND t.record_id = #{record_id}</if>
+        <if test="check_status_arr != null and check_status_arr.length > 0">AND
+            t.check_status in
+            <foreach collection="check_status_arr" item="status" index="index"
+                     open="(" close=")" separator=",">
+                #{status}
+            </foreach>
+        </if>
+        <if test="record_id != null">AND t.record_id = #{record_id}</if>
+        <if test="hasScore != null ">
+
+            <!--有扣分-->
+            <if test="hasScore == 1 ">
+                AND t.id in (select task_id from check_score where check_item_score>0 )
+            </if>
+            <!--无扣分-->
+            <if test="hasScore == 2 ">
+                AND t.id not in (select task_id from check_score where check_item_score>0 )
+            </if>
+
+        </if>
+        <if test="invalidFrom == -1">AND
+            ( t.invalid_from = 0 OR t.invalid_from = 1)
+        </if>
+
+        <if test="invalidFrom != null  and invalidFrom != -1">AND
+            t.invalid_from = #{invalidFrom}
+        </if>
+        <if test="dispatch_ids != null and dispatch_ids.length > 0">AND
+            t.id in
+            <foreach collection="dispatch_ids" item="dispatch_id" index="index"
+                     open="(" close=")" separator=",">
+                #{dispatch_id}
+            </foreach>
+        </if>
         ORDER BY t.start_time DESC
     </select>
 

+ 19 - 26
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/RecordServiceImpl.java

@@ -38,45 +38,38 @@ public class RecordServiceImpl implements RecordService_Q {
             application = "${dubbo.application.id}",
             registry = "${dubbo.registry.address}")
     private CommonService commonService;
+    private List<QzdRecord> qzdRecordList;
 
     @Override
     public Object getAllRecord(Integer page, Integer size, QzdRecord qzdRecord) {
         if (!(page.equals(0) && size.equals(0))) {
             PageHelper.startPage(page, size);
         }
-
         List<QzdRecord> qzdRecordList = qzdRecordDao.getall(qzdRecord == null ? new QzdRecord() : qzdRecord);
-
         Map<Long, Organ> deptMap = commonService.getDeptMap();
         Map<Long, User> userMap = commonService.getUserMap();
         Map<String, Constant> codeMap = commonService.getCodeMap();
-       for(QzdRecord qzdRecord1 : qzdRecordList){
+        for (QzdRecord qzdRecord1 : qzdRecordList) {
             String users = qzdRecord1.getUsers();
-            if(users != null && users != ""){
+            if (users != null && users != "") {
                 String[] usersdata = users.split(",");
                 String names = "";
-                for(int i=0;i<usersdata.length;i++){
+                for (int i = 0; i < usersdata.length; i++) {
                     String ids = usersdata[i];
                     long id = Long.parseLong(ids);
-                    String username = "";
-                   // System.out.printf("=========================================", userMap.get("2732"));
-                   try {
-                       username = userMap.get(id).getTruename();
-                   }catch (Exception e){
-                       logger.error(e.getMessage());
-                   }
-                    names  = names + username;
-                    if(i<usersdata.length-1){
-                        names =  names + ",";
+                    String username = userMap.get(id).getTruename();
+                    username = username != null ? username : "";
+                    names += username;
+                    if (i < usersdata.length - 1) {
+                        names += ",";
                     }
                 }
                 qzdRecord1.setUserNames(names);
             }
-            if(qzdRecord1.getDept() != null){
-                     long a = (long)qzdRecord1.getDept();
-                     qzdRecord1.setDeptName(deptMap.get(a).getOrganname());
-            }
+            if (qzdRecord1.getDept() != null) {
+                qzdRecord1.setDeptName(deptMap.get(Long.valueOf(qzdRecord1.getDept())).getOrganname());
             }
+        }
         if (!(page.equals(0) && size.equals(0))) {
             return new PageInfo<QzdRecord>(qzdRecordList);
         }
@@ -99,22 +92,22 @@ public class RecordServiceImpl implements RecordService_Q {
         QzdRecord qzdRecordList = qzdRecordDao.getone(qzdRecord);
         Map<Long, User> userMap = commonService.getUserMap();
         String users = qzdRecordList.getUsers();
-        if(users != null && users != ""){
+        if (users != null && users != "") {
             String[] usersdata = users.split(",");
             String names = "";
-            for(int i=0;i<usersdata.length;i++){
+            for (int i = 0; i < usersdata.length; i++) {
                 String ids = usersdata[i];
                 long id = Long.parseLong(ids);
                 String username = "";
                 // System.out.printf("=========================================", userMap.get("2732"));
                 try {
                     username = userMap.get(id).getTruename();
-                }catch (Exception e){
+                } catch (Exception e) {
                     logger.error(e.getMessage());
                 }
-                names  = names + username;
-                if(i<usersdata.length-1){
-                    names =  names + ",";
+                names = names + username;
+                if (i < usersdata.length - 1) {
+                    names = names + ",";
                 }
             }
             qzdRecordList.setUserNames(names);
@@ -123,7 +116,7 @@ public class RecordServiceImpl implements RecordService_Q {
     }
 
     @Override
-    public void deleteRecord(QzdRecord qzdRecord){
+    public void deleteRecord(QzdRecord qzdRecord) {
         qzdRecordDao.deleteRecord(qzdRecord);
     }
 }

+ 43 - 35
Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/TaskService_QImpl.java

@@ -91,25 +91,21 @@ public  class TaskService_QImpl implements TaskService_Q {
                 q.setAppeal_result_name(codeMap.get("appeal_result" + "_" + q.getAppeal_result() + "").getCode_name());
             }
             String users = q.getChecked_users();
-            if(users != null && users != ""){
+            if (users != null && users != "") {
                 String[] usersdata = users.split(",");
                 String names = "";
-                for(int i=0;i<usersdata.length;i++){
+                for (int i = 0; i < usersdata.length; i++) {
                     String ids = usersdata[i];
                     long id = Long.parseLong(ids);
-                    String username = "";
-                    // System.out.printf("=========================================", userMap.get("2732"));
-                    try {
-                        username = userMap.get(id).getTruename();
-                    }catch (Exception e){
-                        logger.error(e.getMessage());
-                    }
-                    names  = names + username;
-                    if(i<usersdata.length-1){
-                        names =  names + ",";
+                    String username = userMap.get(id).getTruename();
+                    username = username != null ? username : "";
+                    names += username;
+                    if (i < usersdata.length - 1) {
+                        names += ",";
                     }
                 }
-               q.setChecked_users_name(names);
+                q.setChecked_users_name(names);
+
             }
         }
 
@@ -119,23 +115,19 @@ public  class TaskService_QImpl implements TaskService_Q {
         return QzdCheckTaskList;
     }
 
-    @Override
-    public void addTask(QzdCheckTask qzdCheckTask) {
-        CheckTaskPeriod p = commonService.getCheckTaskPeriod(qzdCheckTask.getStart_time().getTime(), qzdCheckTask.getEnd_time().getTime());
-        if (p != null) {
-            qzdCheckTask.setPeriod_id(p.getId());
-        }
-        qzdTaskDao.addtask(qzdCheckTask);
-        TaskStatus taskStatus = new TaskStatus();
-        taskStatus.setCheck_status(qzdCheckTask.getCheck_status());
-        taskStatus.setCheck_status_name((commonService.getCodeMap().get("task_status_" + qzdCheckTask.getCheck_status())).getCode_name());
-        User u = commonService.getUserMap().get((long) qzdCheckTask.getCheckman());
-        if (u != null) {
-            taskStatus.setUpdate_username(u.getTruename());
-        }
-        taskStatus.setTask_id((long) qzdCheckTask.getId());
-        qzdTaskDao.insertStatus(taskStatus);
-    }
+//    @Override
+//    public void addTask(QzdCheckTask qzdCheckTask) {
+//        qzdTaskDao.addtask(qzdCheckTask);
+//        TaskStatus taskStatus = new TaskStatus();
+//        taskStatus.setCheck_status(qzdCheckTask.getCheck_status());
+//        taskStatus.setCheck_status_name((commonService.getCodeMap().get("task_status_" + qzdCheckTask.getCheck_status())).getCode_name());
+//        User u = commonService.getUserMap().get((long) qzdCheckTask.getCheckman());
+//        if (u != null) {
+//            taskStatus.setUpdate_username(u.getTruename());
+//        }
+//        taskStatus.setTask_id((long) qzdCheckTask.getId());
+//        qzdTaskDao.insertStatus(taskStatus);
+//    }
 
     @Override
     public void updateStatus(QzdCheckTask qzdCheckTask) {
@@ -190,10 +182,10 @@ public  class TaskService_QImpl implements TaskService_Q {
     public void addTask(TaskDate_Q taskData_f) throws Exception {
         List<QzdRecord> qzdRecord = taskData_f.getQzdRecord();
         List<User> users = taskData_f.getUsers();
-        //CheckTaskPeriod p = commonService.getCheckTaskPeriod();
-//        if (p == null) {
-//            throw new Exception("所选任务超出当前稽查周期内!");
-//        }
+        CheckTaskPeriod p = commonService.getCheckTaskPeriod(qzdRecord.get(0).getReceived_time().getTime(), qzdRecord.get(0).getBack_time().getTime());
+        if (p == null) {
+            throw new Exception("所选任务超出当前稽查周期内!");
+        }
         try{
             List<QzdCheckTask> tasklist = new ArrayList<>();
             int count = tasklist.size() / users.size();
@@ -208,15 +200,31 @@ public  class TaskService_QImpl implements TaskService_Q {
                     }
                 }
                 try {
+
                     QzdCheckTask q = new QzdCheckTask();
-                    q.setName(s.getDeptName()+s.getAddr()+"号桩"+s.getCar_info());
+                    q.setName(s.getRname());
                     q.setCheck_status(Constants.STATUS_ASSIGN);
                     q.setStart_time(s.getReceived_time());
+                    q.setRecord_id(s.getId());
                     q.setEnd_time(s.getBack_time());
                     q.setCheckman((long) users.get(u_index).getId());
                     q.setChecked_dept((long) s.getDept());
                     q.setRule_id(6);
+                    q.setChecked_users(s.getUsers());
+                    q.setUpdate_user((long) taskData_f.getUser_id());
+                    if (p != null && p.getEndtime().getTime() > s.getStart_time().getTime()) {
+                        q.setPeriod_id(p.getId());
+                    }
                     qzdTaskDao.addtask(q);
+                    TaskStatus taskStatus = new TaskStatus();
+                    taskStatus.setCheck_status(q.getCheck_status());
+                    taskStatus.setCheck_status_name((commonService.getCodeMap().get("task_status_" + q.getCheck_status())).getCode_name());
+                    User u = commonService.getUserMap().get((long) taskData_f.getUser_id());
+                    if (u != null) {
+                        taskStatus.setUpdate_username(u.getTruename());
+                    }
+                    taskStatus.setTask_id((long) q.getId());
+                    qzdTaskDao.insertStatus(taskStatus);
                 }catch (Exception e){
                     logger.error(e.getMessage());
                 }