温红权 пре 7 година
родитељ
комит
7768d12ab0

+ 94 - 237
VisualInspection/qzd/js/task/add.js

@@ -21,7 +21,7 @@ $(document).ready(function() {
     if ($("#qzd").val() != "") {
     if ($("#qzd").val() != "") {
         dd = $("#qzd").val();
         dd = $("#qzd").val();
     }
     }
-    inittAreaable($("#month_date").val(), $("#qzd").val(),$("#qzdpeople").val());
+    inittAreaable($("#month_date").val(), $("#qzd").val());
 
 
     initselecttable();
     initselecttable();
 
 
@@ -52,7 +52,6 @@ function initselecttable() {
 }
 }
 
 
 function reloadtable() {
 function reloadtable() {
-
     $('#selected_table').datagrid({
     $('#selected_table').datagrid({
         dataSource: selectedData,
         dataSource: selectedData,
         states: { fixedTopUntil: 0 },
         states: { fixedTopUntil: 0 },
@@ -64,22 +63,21 @@ function reloadtable() {
 var layindex = null;
 var layindex = null;
 var taskMap = new HashMap();
 var taskMap = new HashMap();
 
 
-function inittAreaable(time, dept, people) {
+function inittAreaable(time, dept) {
     layindex = layer.load(0, { shade: false });
     layindex = layer.load(0, { shade: false });
     var t = time.replace("/", "-") + "";
     var t = time.replace("/", "-") + "";
     var endtime = moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss");
     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 starttime = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
 
 
-
-    var param1 = { "startTime":new Date(starttime), "endTime": new Date(endtime), "dept": dept }
+    var param1 = { "startTime": new Date(starttime), "endTime": new Date(endtime), "dept": dept }
     post_common_service("/q/record/getall/0/0", param1, function(taskdata) {
     post_common_service("/q/record/getall/0/0", param1, function(taskdata) {
         taskMap = new HashMap();
         taskMap = new HashMap();
         recordlist = taskdata;
         recordlist = taskdata;
         taskdata.forEach(t => {
         taskdata.forEach(t => {
             var user = t.users.split(",");
             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) {
+            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);
                     var list = taskMap.get(key);
                     list.push(t);
                     list.push(t);
                     taskMap.set(key, list);
                     taskMap.set(key, list);
@@ -88,168 +86,35 @@ function inittAreaable(time, dept, people) {
                     list.push(t);
                     list.push(t);
                     taskMap.set(key, list);
                     taskMap.set(key, list);
                 }
                 }
-              }
+            }
         });
         });
-
         var userData = {
         var userData = {
             "organid": dept
             "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
-                    });
-                    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
-                    });
-                }
-            
-            });
+        };
+        UserGetList(userData, function(redata) {
+            layer.close(layer.index);
+            var 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" });
+            }
         });
         });
     });
     });
 }
 }
 
 
-function setdatagrid(){
-    
+function setdatagrid() {
+
 }
 }
 
 
 function reset() {
 function reset() {
@@ -279,7 +144,7 @@ function reset() {
 
 
 function selectedTask(obj) {
 function selectedTask(obj) {
     changeListItem(obj.id);
     changeListItem(obj.id);
-  
+
 }
 }
 
 
 function removeListItem(obj) {
 function removeListItem(obj) {
@@ -294,43 +159,43 @@ function changeListItem(id) {
     var cobj;
     var cobj;
     var tempids = id.split("_");
     var tempids = id.split("_");
     var t = stimemonth.replace("/", "-") + "";
     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;
     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 rowsDate) {
+        var obj = rowsDate[index];
+        if (obj.id == tempids[0]) {
+            cpeople = obj;
+            // truename = obj.truename;
+        }
     }
     }
-    for(var i in recordlist){ 
-        if(taskMap.get(taskMapid)[id.split("_")[2]].id == recordlist[i].id){
-           cobj = recordlist[i];
+    for (var i in recordlist) {
+        if (taskMap.get(taskMapid)[id.split("_")[2]].id == recordlist[i].id) {
+            cobj = recordlist[i];
         }
         }
     }
     }
 
 
     if ($("#" + id).prop('checked')) {
     if ($("#" + id).prop('checked')) {
-        activteChange(cobj,tempids);
-       addlisttable(cobj, taskMapid,id);
+        activteChange(cobj, tempids);
+        addlisttable(cobj, taskMapid, id);
     } else {
     } else {
-        activteRemove(cobj,tempids);
+        activteRemove(cobj, tempids);
         removelisttable(cobj, currentday.format("YYYY-MM-DD"));
         removelisttable(cobj, currentday.format("YYYY-MM-DD"));
     }
     }
 }
 }
 
 
 
 
-function addlisttable(people, id,arryid) {
+function addlisttable(people, id, arryid) {
     var dept_info = null;
     var dept_info = null;
     id = trim(id);
     id = trim(id);
     var time = id.split("_")[1];
     var time = id.split("_")[1];
-    var record =  taskMap.get(id)[arryid.split("_")[2]];
+    var record = taskMap.get(id)[arryid.split("_")[2]];
     var date = moment(record.received_time).format("MM/DD");
     var date = moment(record.received_time).format("MM/DD");
     var stime = moment(record.received_time).format("HH:mm");
     var stime = moment(record.received_time).format("HH:mm");
-     var etime = moment(record.back_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>';
     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});
+    selectedData.array.push({ "name": people.userNames, "car": date + ' ' + stime + "-" + etime + record.car_info + "清障任务", "option": btn, peopleinfo: people, time: time });
 
 
     var myDataGrid = $('#selected_table').data('zui.datagrid');
     var myDataGrid = $('#selected_table').data('zui.datagrid');
     myDataGrid.dataSource.data = null;
     myDataGrid.dataSource.data = null;
@@ -342,14 +207,14 @@ function addlisttable(people, id,arryid) {
     // $('#selected_table').data('zui.datagrid').renderData();
     // $('#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(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');
     myDataGrid.dataSource.data = null;
     myDataGrid.dataSource.data = null;
     myDataGrid.setDataSource(selectedData);
     myDataGrid.setDataSource(selectedData);
     myDataGrid.setPager(1, selectedData.array.length, selectedData.array.length);
     myDataGrid.setPager(1, selectedData.array.length, selectedData.array.length);
@@ -361,7 +226,7 @@ function removelisttable(people,time) {
 
 
 
 
 function search() {
 function search() {
-    inittAreaable($("#month_date").val(), $("#qzd").val(),$("#qzdpeople").val());
+    inittAreaable($("#month_date").val(), $("#qzd").val());
 
 
 }
 }
 
 
@@ -380,7 +245,7 @@ function addTask() {
     var count = tasklist.length / check_user_list.length;
     var count = tasklist.length / check_user_list.length;
     var u_index = 0;
     var u_index = 0;
     var index = 0;
     var index = 0;
-    for(var i in tasklist){
+    for (var i in tasklist) {
         var obj = tasklist[i];
         var obj = tasklist[i];
         if (index++ == count) {
         if (index++ == count) {
             u_index++;
             u_index++;
@@ -388,22 +253,22 @@ function addTask() {
                 u_index--;
                 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);
+        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) {
     // post_common_service('/f/task/add', param, function(redata) {
     //     // layer.msg('已添加', { icon: 1 });
     //     // layer.msg('已添加', { icon: 1 });
@@ -413,43 +278,35 @@ function addTask() {
 
 
 }
 }
 
 
-function getpeople(){
+function getpeople() {
     var orginid = $("#qzd").val();
     var orginid = $("#qzd").val();
     var userData = {
     var userData = {
         "organid": orginid
         "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 activteChange(cobj,tempids){
+function activteChange(cobj, tempids) {
     var usersids = cobj.users.split(",");
     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(",");
     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);
+            }
         }
         }
-}
+    }
+}

+ 21 - 19
VisualInspection/qzd/view/task/add.html

@@ -10,6 +10,7 @@
     .table_content {
     .table_content {
         padding: 0;
         padding: 0;
     }
     }
+    
     .btn_c,
     .btn_c,
     .btn_c label {
     .btn_c label {
         width: 80% !important;
         width: 80% !important;
@@ -21,7 +22,8 @@
     table th {
     table th {
         text-align: center;
         text-align: center;
     }
     }
-    .divstyle{
+    
+    .divstyle {
         width: 60px;
         width: 60px;
         height: 20px;
         height: 20px;
         float: left;
         float: left;
@@ -29,10 +31,10 @@
 </style>
 </style>
 
 
 <div class="container-fluid ">
 <div class="container-fluid ">
-    <div class="row" >
+    <div class="row">
 
 
         <span style="float: left;
         <span style="float: left;
-        padding-top: 5px;">时间:</span>
+        padding-top: 5px;">周期:</span>
         <div class="div-month">
         <div class="div-month">
             <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
             <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
         </div>
         </div>
@@ -41,11 +43,11 @@
         <div class="div-station">
         <div class="div-station">
             <select class="form-control" id="qzd" onchange="getpeople()"></select>
             <select class="form-control" id="qzd" onchange="getpeople()"></select>
         </div>
         </div>
-        <span style="float: left;
+        <!-- <span style="float: left;
         padding-top: 5px;">人员:</span>
         padding-top: 5px;">人员:</span>
         <div class="div-station">
         <div class="div-station">
             <select class="form-control" id="qzdpeople"></select>
             <select class="form-control" id="qzdpeople"></select>
-        </div>
+        </div> -->
 
 
         <div class="col-xs-1">
         <div class="col-xs-1">
             <div class="input-group">
             <div class="input-group">
@@ -60,27 +62,27 @@
     <br/>
     <br/>
     <div class="row">
     <div class="row">
         <div class="col-xs-2">
         <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="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="col-xs-2">
             <div class="divstyle" style="background-color: gray"></div><span style="float: left;">&nbsp;&nbsp;已选任务</span>
             <div class="divstyle" style="background-color: gray"></div><span style="float: left;">&nbsp;&nbsp;已选任务</span>
-        </div> 
+        </div>
     </div>
     </div>
     <br/>
     <br/>
     <div class="row">
     <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 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>
+        <div class="col-xs-2">
+            <div class="divstyle" style="background-color: blue"></div><span style="float: left;">&nbsp;&nbsp;无效</span>
+        </div>
+    </div>
     <div class="row">
     <div class="row">
         <div class="col-xs-6" style="">
         <div class="col-xs-6" style="">
             <div class="row">
             <div class="row">

+ 1 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/DepartmentController.java

@@ -170,7 +170,7 @@ public class DepartmentController extends BaseController {
      */
      */
     @RequestMapping(value = "/getAllWG",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
     @RequestMapping(value = "/getAllWG",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
     public String getAllWG(){
     public String getAllWG(){
-    	List<WreckerGroup> organs = departmentService.getAllWG();
+    	List<FeeStation> organs = departmentService.getAllWG();
     	return returnResult(0, "获取成功", organs);
     	return returnResult(0, "获取成功", organs);
     }
     }
     
     

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