add 清障队

VisualInspection/fwq/js/other_check/other_check.js

@@ -46,7 +46,7 @@ function init() {
     setRoadManagerSelect("#first", road_manager, true);
     // 设置服务区
     var checked_dept = null;
-    if (roleContains("SERVICEAREA")) {
+    if (roleContains("FWQ")) {
         checked_dept = getCurrentUser().organid;
     }
     setSASelect("#fsList", checked_dept);
@@ -426,13 +426,13 @@ function getOrganList(select_road) {
         // if (check_type == 5) {
         //     organList = cache_road_manager_wrecker_group_map.get(select_road);
         // } else {
-            organList = cache_service_area_map.get(select_road);
+        organList = cache_service_area_map.get(select_road);
         // }
     } else {
         // if (check_type == 5) {
         //     organList = $.zui.store.get("cache_wrecker_group_list");
         // } else {
-            organList = $.zui.store.get("cache_service_area_list");
+        organList = $.zui.store.get("cache_service_area_list");
         // }
     }
     return organList;

VisualInspection/fwq/js/task/add.js

@@ -9,7 +9,7 @@ $(document).ready(function() {
     });
     $("#month_date").val(getCurrentTimeFormat());
     var checked_dept = null;
-    if (roleContains("SERVICEAREA")) {
+    if (roleContains("FWQ")) {
         checked_dept = getCurrentUser().organid;
     }
     setSASelecttemp("#fwq", checked_dept);

VisualInspection/fwq/js/task/task_list.js

@@ -21,7 +21,7 @@ function initQueryParams() {
     }
 
     var checked_dept = null;
-    if (roleContains("SERVICEAREA")) {
+    if (roleContains("FWQ")) {
         checked_dept = getCurrentUser().organid;
     }
     setSASelect("#fsList", checked_dept);

VisualInspection/js/util/const.js

@@ -64,4 +64,6 @@ var ROLE_STATION_AGENT = "ROLE_STATION_AGENT";
 var ROLE_ADMIN = "ROLE_ADMIN";
 var ROLE_ROAD_MANAGER = "ROLE_ROAD_MANAGER";
 var ROLE_FWQ_ADMIN = "ROLE_FWQ_ADMIN";
-var ROLE_FWQ = "ROLE_FWQ";
+var ROLE_FWQ = "ROLE_FWQ";
+var ROLE_QZD_ADMIN = "ROLE_QZD_ADMIN";
+var ROLE_QZD = "ROLE_QZD";

VisualInspection/js/util/util.js

@@ -301,6 +301,18 @@ function setSASelectValueNoAll(data, div, selectId) {
     $(div).html(optStr);
 }
 
+function setSASelectValueNoAll_name(data, div, selectId, name) {
+    var optStr = '<option value="">' + name + '</option>';
+    for (var i in data) {
+        if (data[i].deptid == selectId)
+            optStr += '<option value="' + data[i].deptid + '" selected="selected">' + data[i].name + '</option>';
+        else
+            optStr += '<option value="' + data[i].deptid + '">' + data[i].name + '</option>';
+    }
+    $(div).html('');
+    $(div).html(optStr);
+}
+
 function setSASelectValueNoAll2(data, div, selectId) {
     var optStr = '';
     for (var i in data) {

VisualInspection/qzd/css/record/record.css

@@ -0,0 +1,11 @@
+.ll {
+    display: inline;
+}
+
+.v_r {
+    text-align: right;
+}
+
+.llbtn {
+    margin-left: 40px;
+}

VisualInspection/qzd/js/appeal_management/appeal_checked.js

@@ -11,7 +11,7 @@ function queryCheckedAppealTask() {
     }
     var hide = false;
 
-    if (hasRole(ROLE_FWQ_ADMIN) || hasRole(ROLE_FWQ) || hasRole(ROLE_JICHA) || roleContains('FWQ')) {
+    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
         hide = true;
     }
     var cols = [
@@ -56,7 +56,7 @@ function showTaskDetail(id) {
     post_common_service("/f/checkAppeal/getByTaskId", { "task_id": rowData.id }, function(data) {
         $.checkTask = rowData;
         $.checkTask.appeal = data;
-        changePage("/fwq/view/task/taskDetail.html", checkedAppealTableObj);
+        changePage("/qzd/view/task/taskDetail.html", checkedAppealTableObj);
     });
     // changePage("/view/mytask/taskDetail.html",checkedAppealTableObj);
 }

VisualInspection/qzd/js/appeal_management/appeal_list.js

@@ -66,7 +66,7 @@ function queryAppeal() {
         "appeal_result": $("#appealResultSelect").val()
     }
     var hide = false;
-    if (hasRole(ROLE_FWQ_ADMIN) || hasRole(ROLE_FWQ) || hasRole(ROLE_JICHA) || roleContains('FWQ')) {
+    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
         hide = true;
     }
 
@@ -116,7 +116,7 @@ function seeCheckAudit(id, task_id) {
         }
         $.checkTask = rowData;
         $.checkTask.appeal = data;
-        changePage("/fwq/view/task/taskDetail.html", appealTableObj);
+        changePage("/qzd/view/task/taskDetail.html", appealTableObj);
     });
     // }
 }
@@ -137,7 +137,7 @@ function queryUnAssignedTable() {
         "checked_dept": $("#dept_select").val(),
     }
     var hide = false;
-    if (hasRole(ROLE_FWQ_ADMIN) || hasRole(ROLE_FWQ)) {
+    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD)) {
         hide = true;
     }
     var cols = [
@@ -189,7 +189,7 @@ function showAppealCheck(id) {
         // console.log(data);
         // console.log("申诉："+$.checkTask.appeal.id);
         no_return_common_service('/f/task/update', { "id": id, "check_status": 13 })
-        changePage("/fwq/view/task/check.html", appealTableObj);
+        changePage("/qzd/view/task/check.html", appealTableObj);
     });
 }
 //进入继续稽查页面
@@ -205,7 +205,7 @@ function showAppealContinueCheck(id) {
         }
         $.checkTask = rowData;
         $.checkTask.appeal = data;
-        changePage("/fwq/view/mytask/check.html", appealTableObj);
+        changePage("/qzd/view/mytask/check.html", appealTableObj);
     });
 }
 

VisualInspection/qzd/js/appeal_management/appeal_submited.js

@@ -10,7 +10,7 @@ function querySubmitedAppealTask() {
         "check_status_end": 14
     }
     var hide = false;
-    if (hasRole(ROLE_FWQ_ADMIN) || hasRole(ROLE_FWQ) || hasRole(ROLE_JICHA) || roleContains('FWQ')) {
+    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
         hide = true;
     }
     var cols = [
@@ -55,6 +55,6 @@ function showTaskDetail(id) {
         $.checkTask = rowData;
         $.checkTask.appeal = data;
         console.log("申诉：" + $.checkTask.appeal.id);
-        changePage("/fwq/view/task/taskDetail.html", submitedAppealTableObj);
+        changePage("/qzd/view/task/taskDetail.html", submitedAppealTableObj);
     });
 }

VisualInspection/qzd/js/other_check/other_check.js

@@ -46,7 +46,7 @@ function init() {
     setRoadManagerSelect("#first", road_manager, true);
     // 设置服务区
     var checked_dept = null;
-    if (roleContains("SERVICEAREA")) {
+    if (roleContains("FWQ")) {
         checked_dept = getCurrentUser().organid;
     }
     setSASelect("#fsList", checked_dept);
@@ -426,13 +426,13 @@ function getOrganList(select_road) {
         // if (check_type == 5) {
         //     organList = cache_road_manager_wrecker_group_map.get(select_road);
         // } else {
-            organList = cache_service_area_map.get(select_road);
+        organList = cache_service_area_map.get(select_road);
         // }
     } else {
         // if (check_type == 5) {
         //     organList = $.zui.store.get("cache_wrecker_group_list");
         // } else {
-            organList = $.zui.store.get("cache_service_area_list");
+        organList = $.zui.store.get("cache_service_area_list");
         // }
     }
     return organList;

VisualInspection/qzd/js/record/record.js

@@ -0,0 +1,51 @@
+$(document).ready(function() {
+
+    $.jeDate("#start_time", {
+        isinitVal: true,
+        format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+    });
+    $("#start_time").val(getCurrentTimeFormat());
+
+    var checked_dept = null;
+    if (roleContains("QZD")) {
+        checked_dept = getCurrentUser().organid;
+    }
+    setSASelectValueNoAll_name(getOrganList(null), "#fsList", checked_dept, "请选择清障队");
+
+
+
+    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: 160, text: '考核部门', type: 'string', flex: true, sort: 'down', field: 'checked_dept_name' },
+        { width: 80, text: '稽查人员', type: 'string', flex: true, hide: false, 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'}
+    ];
+    var colFunc = { width: 120, text: '操作', type: 'string', flex: true, field: 'id' };
+
+    // cols.push(colFunc);
+    var t = getTimeByMonth(GV("#start_time"));
+    var data = {
+
+    };
+    taskTableObj = $('#record_list_table').mytable({
+        'cols': cols,
+        'checkable': false,
+        'url': "/q/record/getall/",
+        'param': data,
+
+    });
+});
+
+
+
+function getOrganList(select_road) {
+    var organList;
+    if (select_road) {
+        organList = cache_road_manager_wrecker_group_map.get(select_road);
+    } else {
+        organList = $.zui.store.get("cache_wrecker_group_list");
+    }
+    return organList;
+}

VisualInspection/qzd/js/statistics/service_area_check_statistics.js

@@ -60,8 +60,8 @@ function getscore(starttime, endtime, limitnumber, limitscore, limitscore2) {
         for (var i in data) {
             var ss = data[i];
             var dat = "";
-            for (var j in ss.fwqStatistics) {
-                var po = ss.fwqStatistics[j];
+            for (var j in ss.qzdStatistics) {
+                var po = ss.qzdStatistics[j];
                 dat += po.p_str + "月、";
             }
             dat = dat.substring(0, dat.length - 1);
@@ -91,7 +91,7 @@ function jumpuser(deptid) {
     }
     $.zui.store.set('store_param_' + current_url, param);
 
-    url = "/fwq/view/statistics/service_area_data_statistics.html?deptid=" + deptid + "&jump=1"
+    url = "/qzd/view/statistics/service_area_data_statistics.html?deptid=" + deptid + "&jump=1"
 
     isnew = false;
     changePage(url);

VisualInspection/qzd/js/statistics/total_company_statistics.js

@@ -319,7 +319,7 @@ $(function() {
             var organList = data.organList;
             var organArray = new Array();
             var organCount = 0;
-            for (h=0;h<organList.length;h++) {
+            for (h = 0; h < organList.length; h++) {
                 organCount += organList[h].sacount;
                 organArray.push(organCount);
             }
@@ -469,7 +469,7 @@ $(function() {
         var Pmth = data.list.Pmth;
 
         for (var i = 0; i < name.length; i++) {
-            
+
             for (var j = 0; j < Tmth.length; j++) {
                 flag = false;
                 if (array_all_deptname.length > 0) {
@@ -531,7 +531,7 @@ $(function() {
                     }
                 }
             }
-        }       
+        }
     }
 
     /**
@@ -1227,7 +1227,7 @@ function point_c(param) {
 
         $.zui.store.set('store_param_' + current_url, pdata);
         isnew = false;
-        changePage("/fwq/view/statistics/assess_situation.html");
+        changePage("/qzd/view/statistics/assess_situation.html");
 
     }
 }
@@ -1247,7 +1247,7 @@ function score_c(param) {
 
         $.zui.store.set('store_param_' + current_url, pdata);
         isnew = false;
-        changePage("/fwq/view/statistics/road_manage_statistics.html");
+        changePage("/qzd/view/statistics/road_manage_statistics.html");
     }
 }
 
@@ -1280,6 +1280,6 @@ function station_c(param) {
         $.zui.store.set('page_data_param_station_p', param.data.name);
         $.zui.store.set('store_param_' + current_url, pdata);
         isnew = false;
-        changePage("/fwq/view/statistics/toll_station_statistics.html");
+        changePage("/qzd/view/statistics/toll_station_statistics.html");
     }
 }

VisualInspection/qzd/js/task/add.js

@@ -9,15 +9,15 @@ $(document).ready(function() {
     });
     $("#month_date").val(getCurrentTimeFormat());
     var checked_dept = null;
-    if (roleContains("SERVICEAREA")) {
+    if (roleContains("FWQ")) {
         checked_dept = getCurrentUser().organid;
     }
-    setSASelecttemp("#fwq", checked_dept);
+    setSASelecttemp("#qzd", checked_dept);
 
-    //默认值 $("#fwq").val()
+    //默认值 $("#qzd").val()
     var dd = 89;
-    if ($("#fwq").val() != "") {
-        dd = $("#fwq").val();
+    if ($("#qzd").val() != "") {
+        dd = $("#qzd").val();
     }
     inittAreaable($("#month_date").val(), dd);
 
@@ -360,7 +360,7 @@ function removelisttable(area, time) {
 
 
 function search() {
-    inittAreaable($("#month_date").val(), $("#fwq").val());
+    inittAreaable($("#month_date").val(), $("#qzd").val());
 
 }
 
@@ -400,7 +400,7 @@ function addTask() {
     var param = { "userids": check_user_list, "checkAreaData": tasklist };
     post_common_service('/f/task/add', param, function(redata) {
         // layer.msg('已添加', { icon: 1 });
-        inittAreaable($("#month_date").val(), $("#fwq").val());
+        inittAreaable($("#month_date").val(), $("#qzd").val());
     });
 
 

VisualInspection/qzd/js/task/apply_task.js

@@ -52,7 +52,7 @@ function queryUnexaminedTask() {
 
 
     var hide = false;
-    if (hasRole(ROLE_FWQ_ADMIN) || hasRole(ROLE_FWQ) || hasRole(ROLE_JICHA) || roleContains('FWQ')) {
+    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
         hide = true;
     }
     var cols = [
@@ -99,7 +99,7 @@ function showCheck(id) {
 
     //开始稽查
     no_return_common_service('/f/task/update', { "id": $.checkTask.id, "check_status": 21, "record_status": 1, "check_status_name": "复查" });
-    changePage("/fwq/view/task/check.html");
+    changePage("/qzd/view/task/check.html");
 }
 
 function showApplyDetail1(id) {

VisualInspection/qzd/js/task/check.js

@@ -1,5 +1,5 @@
 function initCheck() {
-    addBreadMenu("/fwq/view/task/check.html", "服务区视频稽查");
+    addBreadMenu("/qzd/view/task/check.html", "服务区视频稽查");
     $('#ex1').slider({ tooltip: 'hide' });
     $("#ex1").on("slideStop", function(slideEvt) {
         setVideoProcess(slideEvt.value);
@@ -810,7 +810,7 @@ function showPre(id) {
     // $('#myModal').modal({name:"dd"});
     //预览提交把任务状态改为待提交
     no_return_common_service('/f/task/update', { "id": $.checkTask.id, "check_status": 7 })
-    changePage("/fwq/view/task/taskDetail.html");
+    changePage("/qzd/view/task/taskDetail.html");
 }
 
 var isappeal = false;
@@ -875,7 +875,7 @@ function showPre4Appeal(id) {
     // $('#myModal').modal({name:"dd"});
     //预览提交把任务状态改为待提交
     no_return_common_service('/f/task/update', { "id": $.checkTask.id, "check_status": 17 })
-    changePage("/fwq/view/task/taskDetail.html");
+    changePage("/qzd/view/task/taskDetail.html");
 }
 
 function saveValidReason() {

VisualInspection/qzd/js/task/checked.js

@@ -11,7 +11,7 @@ function queryCheckedTask() {
         "check_status_arr": [4, 5, 6]
     };
     var hide = false;
-    if (hasRole(ROLE_FWQ_ADMIN) || hasRole(ROLE_FWQ) || hasRole(ROLE_JICHA) || roleContains('FWQ')) {
+    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
         hide = true;
     }
     var cols = [
@@ -52,5 +52,5 @@ function queryCheckedTask() {
 function showTaskDetail(id) {
     var rowData = getItemByIdFromArr(id, $('#checked_datatable').mytable('getTableData'));
     $.checkTask = rowData;
-    changePage("/fwq/view/task/taskDetail.html", checkedTaskTableObj);
+    changePage("/qzd/view/task/taskDetail.html", checkedTaskTableObj);
 }

VisualInspection/qzd/js/task/task_list.js

@@ -21,7 +21,7 @@ function initQueryParams() {
     }
 
     var checked_dept = null;
-    if (roleContains("SERVICEAREA")) {
+    if (roleContains("FWQ")) {
         checked_dept = getCurrentUser().organid;
     }
     setSASelect("#fsList", checked_dept);
@@ -65,7 +65,7 @@ function queryTask() {
     };
     // console.log(data);
     var hide = false;
-    if (hasRole(ROLE_FWQ_ADMIN) || hasRole(ROLE_FWQ) || hasRole(ROLE_JICHA) || roleContains('FWQ')) {
+    if (hasRole(ROLE_QZD_ADMIN) || hasRole(ROLE_QZD) || hasRole(ROLE_JICHA) || roleContains('QZD')) {
         hide = true;
     }
     var cols = [
@@ -110,7 +110,7 @@ function showCheck(id) {
     //开始稽查
     no_return_common_service('/f/task/update', { "id": $.checkTask.id, "check_status": 3 });
 
-    changePage("/fwq/view/task/check.html", taskTableObj);
+    changePage("/qzd/view/task/check.html", taskTableObj);
 }
 
 //任务详情页面
@@ -121,7 +121,7 @@ function showTaskDetail(id) {
         $.checkTask.appeal = null;
     }
 
-    changePage("/fwq/view/task/taskDetail.html", taskTableObj);
+    changePage("/qzd/view/task/taskDetail.html", taskTableObj);
 }
 
 //进入继续稽查页面
@@ -129,7 +129,7 @@ function showContinueCheck(id) {
     // $('#myModal').modal({name:"dd"});
     $.checkTask = getItemByIdFromArr(id, $('#task_list_table').mytable('getTableData'));
     $.checkTask.appeal = null;
-    changePage("/fwq/view/task/check.html", taskTableObj);
+    changePage("/qzd/view/task/check.html", taskTableObj);
 }
 
 //下发所有任务

VisualInspection/qzd/view/appeal_management/appeal_checked.html

@@ -1,4 +1,4 @@
-<script src="/fwq/js/appeal_management/appeal_checked.js?__inline"></script>
+<script src="/qzd/js/appeal_management/appeal_checked.js?__inline"></script>
 <div class="container-fluid ">
     <div class="row">
         <form class="form-horizontal">

VisualInspection/qzd/view/appeal_management/appeal_list.html

@@ -49,7 +49,7 @@
 
 </div>
 <!--  end -->
-<script src="/fwq/js/appeal_management/appeal_list.js?_inline"></script>
+<script src="/qzd/js/appeal_management/appeal_list.js?_inline"></script>
 
 <script type="text/javascript">
     $(document).ready(function() {

VisualInspection/qzd/view/appeal_management/appeal_submited.html

@@ -1,4 +1,4 @@
-<script src="/fwq/js/appeal_management/appeal_submited.js?__inline"></script>
+<script src="/qzd/js/appeal_management/appeal_submited.js?__inline"></script>
 <div class="container-fluid ">
     <div class="row">
         <form class="form-horizontal">

VisualInspection/qzd/view/main.html

@@ -41,7 +41,7 @@
             background-color: #2B7EB3;
         }*/
     </style>
-    <script src="/fwq/js/task/check.js"></script>
+    <script src="/qzd/js/task/check.js"></script>
     <!--<script src="/js/teamClass/check_team_schedule.js"></script>-->
     <script src="/js/teamClass/charge_team_schedule.js"></script>
 </head>

VisualInspection/qzd/view/other_check/onsite_check.html

@@ -1,6 +1,6 @@
 <!--现场稽查-->
 <link rel="stylesheet" type="text/css" href="/css/other_check/other_check.css">
-<script src="/fwq/js/other_check/other_check.js?_inline"></script>
+<script src="/qzd/js/other_check/other_check.js?_inline"></script>
 <!--  start -->
 <div class="container-fluid ">
     <div class="row">

VisualInspection/qzd/view/other_check/third_unannounced_check.html

@@ -1,5 +1,5 @@
 <link rel="stylesheet" type="text/css" href="/css/other_check/other_check.css">
-<script src="/fwq/js/other_check/other_check.js?_inline"></script>
+<script src="/qzd/js/other_check/other_check.js?_inline"></script>
 <!--  start -->
 <div class="container-fluid ">
     <div class="row">

VisualInspection/qzd/view/record/record_list.html

@@ -0,0 +1,31 @@
+<link href="/qzd/css/record/record.css?__inline" rel="stylesheet" />
+<script src="/qzd/js/record/record.js?__inline"></script>
+
+<div class="container-fluid ">
+    <div class="row">
+        <form class="form-horizontal" style="margin:0px;">
+            <div class="form-group" style="margin:0px;">
+                <div class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="ll" style="text-align: left;padding-right:0">月份:</label>
+                    <input type="text" id="start_time" class="form-control form-date ll" placeholder="选择月份">
+                </div>
+                <div class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="ll">部门:</label>
+                    <select class="form-control ll" id="fsList"></select>
+                    <button class="btn btn-primary llbtn" type="button" onclick="">查询</button>
+                </div>
+
+                <div class="col-sm-6 v_r">
+                    <button class="btn btn-primary " type="button" onclick="">新增清障记录</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <div class="row" style="margin-top: 20px;">
+
+        <div class="datatable" id="record_list_table"></div>
+
+    </div>
+
+</div>

VisualInspection/qzd/view/statistics/assess_type.html

@@ -1,11 +1,11 @@
 <!--考核问题分布报表-->
-<script src="/fwq/js/statistics/assess_type.js?__inline"></script>
+<script src="/qzd/js/statistics/assess_type.js?__inline"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/assess_situation.css?__inline">
 <div class="container-fluid ">
     <div class="form-div">
-        <form  class="form-horizontal">
+        <form class="form-horizontal">
             <div class="form-group">
-                <div  class="form-group col-sm-5">
+                <div class="form-group col-sm-5">
                     <label class="col-sm-2">查询日期</label>
                     <div class="col-sm-5">
                         <input type="text" id="start-time" class="form-control form-date" placeholder="选择月份">
@@ -14,24 +14,24 @@
                         <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
                     </div> -->
                 </div>
-                <div  class="form-group col-sm-3">
+                <div class="form-group col-sm-3">
                     <div class="col-sm-6">
                         <button class="btn btn-info2" type="button" onclick="queryTypeClick()">查询</button>
                     </div>
                     <div class="col-sm-6">
-                        <button class="btn btn-info3" type="button" onclick="exportExcel()" >导出Excel</button>
+                        <button class="btn btn-info3" type="button" onclick="exportExcel()">导出Excel</button>
                     </div>
                 </div>
-            </div>    
+            </div>
         </form>
     </div>
     <div class="table-title"><span>温馨服务检查情况统计表</span></div>
 
     <div class="row">
-          <!-- 使用一个div来显示数据表格 -->
-          <div class="datatable" data-checkable="false" data-sortable="false"  style="margin-bottom:0px;">
-              <div class="table-head" >
-                  <table border="1" width="100%" height="90px" align="center">
+        <!-- 使用一个div来显示数据表格 -->
+        <div class="datatable" data-checkable="false" data-sortable="false" style="margin-bottom:0px;">
+            <div class="table-head">
+                <table border="1" width="100%" height="90px" align="center">
                     <thead class="table-thead">
                         <!-- <tr>
                         <th rowspan="2" width="6%">道管整体排名</th>
@@ -53,19 +53,19 @@
                     </thead>
                 </table>
             </div>
-          </div>
-          <div id="scrollTable" style="overflow:auto;">
-              <div class="table-head" style="margin:0px;">
-                  <table border="1" width="100%" height="90px" align="center" style="border-top:0px;">
+        </div>
+        <div id="scrollTable" style="overflow:auto;">
+            <div class="table-head" style="margin:0px;">
+                <table border="1" width="100%" height="90px" align="center" style="border-top:0px;">
                     <tbody class="table-tbody" style="background:white" align="center">
-               
+
                     </tbody>
-                  </table></div>
-          </div>
+                </table>
+            </div>
+        </div>
     </div>
 </div>
 <script>
-   
     $(document).ready(function() {
         // 设置滚动表格的高度
         $("#scrollTable").height($(window).height() - 300);
@@ -77,4 +77,4 @@
         $("#start-time").val(getCurrentTimeFormat());
         initQueryType();
     });
-</script>
+</script>

VisualInspection/qzd/view/statistics/dept_check_statistics.html

@@ -1,6 +1,6 @@
 <!--服务区-综合成绩汇总表-->
 <script src="/js/statistics/common_statistic.js?__inline"></script>
-<script src="/fwq/js/statistics/dept_check_statistics.js"></script>
+<script src="/qzd/js/statistics/dept_check_statistics.js"></script>
 
 <style type="text/css">
     table td,

VisualInspection/qzd/view/statistics/operation_management_integration.html

@@ -1,9 +1,9 @@
 <!--服务区-营运管理综合检查情况统计-->
-<script src="/fwq/js/statistics/operation_management_integration.js?__inline"></script>
+<script src="/qzd/js/statistics/operation_management_integration.js?__inline"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/assess_situation.css?__inline">
 <div class="container-fluid ">
     <div class="form-div">
-        <form  class="form-horizontal">
+        <form class="form-horizontal">
             <div class="form-group">
                 <div class="from-label"><label>查询日期</label></div>
                 <div class="col-sm-2">
@@ -16,7 +16,7 @@
                     <button class="btn btn-primary " type="button" onclick="queryTypeClick()">查询</button>
                 </div>
                 <div class="col-sm-1">
-                    <button class="btn btn-primary " type="button" onclick="exportExcel()" >导出Excel</button>
+                    <button class="btn btn-primary " type="button" onclick="exportExcel()">导出Excel</button>
                 </div>
             </div>
         </form>
@@ -24,44 +24,52 @@
     <div class="table-title"><span>运营管理综合检查情况统计表</span></div>
 
     <div class="row">
-          <!-- 使用一个div来显示数据表格 -->
-          <div class="datatable" data-checkable="false" data-sortable="false"  style="margin-bottom:0px;">
-              <div class="table-head" ><table border="1" width="100%" height="90px" align="center">
-                 <thead>
+        <!-- 使用一个div来显示数据表格 -->
+        <div class="datatable" data-checkable="false" data-sortable="false" style="margin-bottom:0px;">
+            <div class="table-head">
+                <table border="1" width="100%" height="90px" align="center">
+                    <thead>
                         <tr>
-                        <!--<th rowspan="3" width="6%">排名</th><th rowspan="3" width="6%">道管</th>-->
-                        <th rowspan="3" width="8%">排名</th>
-                        <!--<th rowspan="3" width="6%">道管内排名</th>-->
-                        <th rowspan="3" width="8%">服务区</th><th colspan="4" width="24%" height="40px">温馨服务</th>
-                        <th colspan="2" width="12%" height="40px">现场检查</th><th rowspan="3" width="8%">总平均扣分</th>
-                        <th rowspan="3" width="8%">平均得分</th>
+                            <!--<th rowspan="3" width="6%">排名</th><th rowspan="3" width="6%">道管</th>-->
+                            <th rowspan="3" width="8%">排名</th>
+                            <!--<th rowspan="3" width="6%">道管内排名</th>-->
+                            <th rowspan="3" width="8%">服务区</th>
+                            <th colspan="4" width="24%" height="40px">温馨服务</th>
+                            <th colspan="2" width="12%" height="40px">现场检查</th>
+                            <th rowspan="3" width="8%">总平均扣分</th>
+                            <th rowspan="3" width="8%">平均得分</th>
                         </tr>
-                        <tr> 
-                        <th colspan="2">公司检查</th><th colspan="2">第三方暗访</th>
-                        <th rowspan="2" width="54px">受检次数</th><th rowspan="2" width="54px">扣分合计</th>
+                        <tr>
+                            <th colspan="2">公司检查</th>
+                            <th colspan="2">第三方暗访</th>
+                            <th rowspan="2" width="54px">受检次数</th>
+                            <th rowspan="2" width="54px">扣分合计</th>
                         </tr>
-                        <tr> 
-                        <th width="54px">受检次数</th><th width="54px">扣分合计</th>
-                        <th width="54px">受检次数</th><th width="54px">扣分合计</th>
+                        <tr>
+                            <th width="54px">受检次数</th>
+                            <th width="54px">扣分合计</th>
+                            <th width="54px">受检次数</th>
+                            <th width="54px">扣分合计</th>
                         </tr>
-                 </thead>
+                    </thead>
                     <!-- <tbody class="table-tbody" style="background:white" align="center">
                
                     </tbody> -->
-                </table></div>
-          </div>
-          <div id="scrollTable" style="height:300px;overflow:scroll;margin-right:-10px;">
-              <div class="table-head" style="margin:0px;">
-                  <table border="1" width="100%" height="90px" align="center" style="border-top:0px;">
+                </table>
+            </div>
+        </div>
+        <div id="scrollTable" style="height:300px;overflow:scroll;margin-right:-10px;">
+            <div class="table-head" style="margin:0px;">
+                <table border="1" width="100%" height="90px" align="center" style="border-top:0px;">
                     <tbody class="table-tbody" style="background:white" align="center">
-               
+
                     </tbody>
-                  </table></div>
-          </div>
+                </table>
+            </div>
+        </div>
     </div>
 </div>
 <script>
-   
     $(document).ready(function() {
         // 设置滚动表格的高度
         $("#scrollTable").height($(window).height() - 360);
@@ -74,4 +82,4 @@
         $("#start-time").val(getCurrentTimeFormat());
         initQueryType();
     });
-</script>
+</script>

VisualInspection/qzd/view/statistics/service_area_check_statistics.html

@@ -1,5 +1,5 @@
 <script src="/js/statistics/common_statistic.js?__inline"></script>
-<script src="/fwq/js/statistics/service_area_check_statistics.js">
+<script src="/qzd/js/statistics/service_area_check_statistics.js">
 </script>
 <style type="text/css">
     table td,

VisualInspection/qzd/view/statistics/service_area_data_statistics.html

@@ -1,7 +1,7 @@
 <!--服务区数据查询分析-->
 <script src="/js/lib/echarts/build/dist/echarts.js"></script>
 <script src="/js/statistics/common_statistic.js?__inline"></script>
-<script src="/fwq/js/statistics/service_area_data_statistics.js"></script>
+<script src="/qzd/js/statistics/service_area_data_statistics.js"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/personal_data_statistics.css">
 <div class="container-fluid">
     <!--<div class="row-1"><span>个人数据统计</span></div>
@@ -105,6 +105,6 @@
 </div>
 <script>
     $(document).ready(function() {
-        
+
     });
 </script>

VisualInspection/qzd/view/statistics/total_company_statistics.html

@@ -1,6 +1,6 @@
 <script src="/js/lib/echarts/build/dist/echarts.js"></script>
 <script src="/js/statistics/common_statistic.js?__inline"></script>
-<script src="/fwq/js/statistics/total_company_statistics.js"></script>
+<script src="/qzd/js/statistics/total_company_statistics.js"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/total_company_statistics.css">
 <div class="container-fluid statistic-panel">
     <div class="row">

VisualInspection/qzd/view/task/add.html

@@ -1,6 +1,6 @@
 <link href="/node_modules/zui/dist/lib/datagrid/zui.datagrid.min.css" rel="stylesheet">
 <script src="/node_modules/zui/dist/lib/datagrid/zui.datagrid.js"></script>
-<script src="/fwq/js/task/add.js?__inline"></script>
+<script src="/qzd/js/task/add.js?__inline"></script>
 
 <link rel="stylesheet" type="text/css" href="/css/other_check/other_check.css">
 
@@ -35,7 +35,7 @@
         <span style="float: left;
         padding-top: 5px;">服务区：</span>
         <div class="div-station">
-            <select class="form-control" id="fwq"></select>
+            <select class="form-control" id="qzd"></select>
         </div>
 
         <div class="col-xs-1">

VisualInspection/qzd/view/task/apply_task.html

@@ -1,4 +1,4 @@
-<script src="/fwq/js/task/apply_task.js?__inline"></script>
+<script src="/qzd/js/task/apply_task.js?__inline"></script>
 <div class="container-fluid ">
     <div class="row">
         <form class="form-horizontal">
@@ -46,7 +46,7 @@
     <div id="unexamined_datatable"></div>
 </div>
 <div id="apply_detail_div" style="display:none;text-align:center;">
-    <link rel="import" href="/fwq/view/task/applyDetail.html?__inline">
+    <link rel="import" href="/qzd/view/task/applyDetail.html?__inline">
 </div>
 <script>
     $(document).ready(function() {

VisualInspection/qzd/view/task/check.html

@@ -131,7 +131,7 @@
 
 <!-- 修改扣分 -->
 <div id="score-detail-div" style="display:none;text-align:center;">
-    <link rel="import" href="/fwq/view/task/scoreDetail.html?__inline">
+    <link rel="import" href="/qzd/view/task/scoreDetail.html?__inline">
 </div>
 <!-- 无效任务 -->
 <div class="modal fade" id="validSubmitWin">

VisualInspection/qzd/view/task/checked.html

@@ -1,4 +1,4 @@
-<script src="/fwq/js/task/checked.js?__inline"></script>
+<script src="/qzd/js/task/checked.js?__inline"></script>
 <div class="container-fluid ">
     <div class="row">
         <form class="form-horizontal">

VisualInspection/qzd/view/task/taskDetail.html

@@ -72,10 +72,10 @@
     </div>
 </div>
 <div id="appealDetail-div" style="display:none;text-align:center;">
-    <link rel="import" href="/fwq/view/appeal_management/appealDetail.html?__inline">
+    <link rel="import" href="/qzd/view/appeal_management/appealDetail.html?__inline">
 </div>
 <div id="chooseCheckman-div" style="display:none;text-align:center;">
-    <link rel="import" href="/fwq/view/task/chooseCheckman.html?__inline">
+    <link rel="import" href="/qzd/view/task/chooseCheckman.html?__inline">
 </div>
 <style>
     .line {
@@ -107,7 +107,7 @@
 </style>
 <script>
     $(document).ready(function() {
-        addBreadMenu("/fwq/view/task/taskDetail.html", "稽查详情");
+        addBreadMenu("/qzd/view/task/taskDetail.html", "稽查详情");
         checkAuth();
         $("#name").html($.checkTask.name);
         $("#checkman").html($.checkTask.checkman_name);
@@ -142,15 +142,15 @@
         $.zui.store.set("task_detail_btn_" + ROLE_JICHA_ADMIN + "_6", ["#backConfirmBtn"]);
         $.zui.store.set("task_detail_btn_" + ROLE_JICHA_ADMIN + "_14", ["#backAppealBtn"]);
         $.zui.store.set("task_detail_btn_" + ROLE_JICHA_ADMIN + "_11", ["#assignBtn"]);
-        $.zui.store.set("task_detail_btn_" + ROLE_FWQ_ADMIN + "_5", ["#confirmBtn", "#appealBtn"]);
-        $.zui.store.set("task_detail_btn_" + ROLE_FWQ_ADMIN + "_15", ["#confirmAppealBtn"]);
+        $.zui.store.set("task_detail_btn_" + ROLE_QZD_ADMIN + "_5", ["#confirmBtn", "#appealBtn"]);
+        $.zui.store.set("task_detail_btn_" + ROLE_QZD_ADMIN + "_15", ["#confirmAppealBtn"]);
     }
 
     function checkAuth() {
         initBtns();
         showBtn(ROLE_JICHA, $.checkTask.check_status);
         showBtn(ROLE_JICHA_ADMIN, $.checkTask.check_status);
-        showBtn(ROLE_FWQ_ADMIN, $.checkTask.check_status);
+        showBtn(ROLE_QZD_ADMIN, $.checkTask.check_status);
     }
 
     function showBtn(role, status) {

VisualInspection/qzd/view/task/task_list.html

@@ -1,5 +1,5 @@
 <script src="/js/statistics/common_statistic.js?__inline"></script>
-<script src="/fwq/js/task/task_list.js?__inline"></script>
+<script src="/qzd/js/task/task_list.js?__inline"></script>
 
 <div class="container-fluid ">
     <div class="row">

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

@@ -0,0 +1,77 @@
+package com.xintong.visualinspection.controller.gettway;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+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.service.CheckAppealService_F;
+import com.xintong.visualinspection.service.RecordService_Q;
+import com.xintong.visualinspection.service.TaskService_F;
+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;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("/q/record")
+public class RecordController_Q extends BaseController {
+
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private RecordService_Q recordService_q;
+
+
+
+    @RequestMapping(value = "/getall/{page}/{size}")
+    public String getall(HttpServletRequest request, @PathVariable Integer page, @PathVariable Integer size, @RequestBody QzdRecord qzdRecord) {
+        User user = getCurrentUser(request);
+        if (AuthorUtil.hasRole(user, Constants.ROLE_QZD_ADMIN)
+            || AuthorUtil.hasRole(user, Constants.ROLE_QZD)
+                || AuthorUtil.containsRole(user, "ROLE_QZD")) {
+            qzdRecord.setDept(user.getOrganid());
+        }
+        Object ss = recordService_q.getAllRecord(page, size, qzdRecord);
+        return super.returnSuccessResult(ss);
+    }
+
+
+    @RequestMapping(value = "/update")
+    public String update(HttpServletRequest request, @Valid @RequestBody QzdRecord qzdRecord) {
+        if (qzdRecord.getId() == null) {
+            throw new BusinessException(20002);
+        }
+        User user = getCurrentUser(request);
+        recordService_q.updateRecord(qzdRecord);
+        QzdRecord t = recordService_q.getRecord(qzdRecord);
+        return super.returnSuccessResult("修改成功", t);
+    }
+
+    @RequestMapping(value = "/add")
+    public String addrecord(HttpServletRequest request, @Valid @RequestBody QzdRecord record) {
+        if (record == null ) {
+            throw new BusinessException(21502);
+        }
+
+        User user = getCurrentUser(request);
+        record.setRecord_user(user.getId());
+        try {
+            recordService_q.addRecord(record);
+        } catch (Exception e) {
+            throw new BusinessException(21501);
+        }
+
+        return super.returnSuccessResult("添加成功", null);
+    }
+
+
+}

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

@@ -52,7 +52,7 @@ public class PermissionServiceImpl extends BaseService implements PermissionServ
 		// 找出子
 		for (Integer oid : map.keySet()) {
 			for (Permission m2 : permisions) {
-				if (m2.getId() == oid) {
+				if (m2.getId().equals( oid)) {
 					m2.setChilds(map.get(oid));
 					if (m2.getPid() == null || m2.getPid()==0) {
 						olist.add(m2);

VisualInspection_server/src/main/resources/application.properties

@@ -136,8 +136,8 @@ dubbo.protocol.status = server
 
 ## RegistryConfig Bean
 dubbo.registry.id = demoservice
-dubbo.registry.address = zookeeper://127.0.0.1:2181
-#dubbo.registry.address = zookeeper://git.topm.win:9994
+#dubbo.registry.address = zookeeper://127.0.0.1:2181
+dubbo.registry.address = zookeeper://192.168.45.158:2181
 dubbo.registry.file = ./output/dubbo.cache
 
 

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

@@ -0,0 +1,67 @@
+package com.xintong.visualinspection.bean;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.xintong.visualinspection.util.CustomJsonDateDeserializer;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 文件名：QzdCheckTask
+ * 版本信息：日期：2018/6/21 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+@Data
+public class QzdCheckTask implements Serializable {
+    private Integer id;
+    private String name;
+    private Integer check_status;
+    private Integer check_status_end;
+
+    private Integer[] check_status_arr;
+    private Integer record_id;
+    private String record_name;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date create_time;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date update_time;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonDeserialize(using = CustomJsonDateDeserializer.class)
+    private Date start_time;
+
+    @JsonDeserialize(using = CustomJsonDateDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date end_time;
+    private Long checkman;
+    private String checkman_name;
+    private Long checked_dept;
+    private String checked_dept_name;
+    private String check_period;
+    private Integer rule_id;
+    private String remark;
+    private Long recheckman;
+    private String recheckman_name;
+    private Integer period_id;
+    private Integer invalid_from;
+
+    private String checked_users;
+
+    private Long update_user;
+
+    private Integer hasScore;
+
+    private Integer invalidFrom;
+
+
+    private Long[] dispatch_ids;
+
+    private String check_status_name;
+    //申诉结果
+    private Integer appeal_result;
+    //申诉结果
+    private String appeal_result_name;
+    //申诉id
+    private Long appeal_id;
+}

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

@@ -0,0 +1,39 @@
+package com.xintong.visualinspection.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 文件名：QzdRecord
+ * 版本信息：日期：2018/6/21 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+@Data
+public class QzdRecord implements Serializable {
+    private Integer id;  //编号
+    private Date creat_time; //创建时间
+    private Integer type;//'类型 1 抛锚  2 事故'
+    private String users;//'清障员'
+    private Integer dept;//'部门'
+    private String addr;//'桩号'
+    private Date received_time;//'接警时间'
+    private String car_info;//'车辆信息'
+    private String car_user_info;//'车主信息'
+    private Date start_time;//'出警时间'
+    private Date arrive_time;//'到达时间'
+    private Date back_time;//'撤离时间'
+    private Integer record_user;//'值机员'
+    private Integer arrive_in_time;//'N分钟到达 1到达 0否'
+    private Integer unimpeded_in_time;//'N小时畅通 1 畅通 0不畅通'
+    private Integer car_user_satisfaction;//'客户满意度 1 非常满意 2满意 3不满意'
+    private String videos;//'视频列表地址'
+    private String pics;//'图片列表地址'
+    private Integer zxt_is_standard;//'锥形桶摆放是否规范 1 规范 0不规范'
+    private Integer is_explain;//'客户无法满足是否解释 1解释 0未解释'
+    private Integer record_no_come;//'故障车未拖到指定地点是否记录 1有记录 0未记录'
+    private Integer take_photo_upload;//'是否拍照上传 1是 0 否'
+    private Integer arrive_do_work;//'到达现场是否清障作业 1是 0 否
+    private String remarks;//'备注'
+
+}

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

@@ -0,0 +1,10 @@
+package com.xintong.visualinspection.service;
+
+import com.xintong.visualinspection.bean.QzdRecord;
+
+public interface RecordService_Q {
+    public Object getAllRecord(Integer page, Integer size,QzdRecord qzdRecord);
+    public void addRecord(QzdRecord qzdRecord);
+    public void updateRecord(QzdRecord qzdRecord);
+    public QzdRecord getRecord(QzdRecord qzdRecord);
+}

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/Constants.java

@@ -25,4 +25,6 @@ public class Constants {
 	public static String ROLE_MANAGER="ROLE_MANAGER";
     public static String ROLE_FWQ_ADMIN="ROLE_FWQ_ADMIN";
     public static String ROLE_FWQ="ROLE_FWQ";
+    public static String ROLE_QZD_ADMIN="ROLE_QZD_ADMIN";
+    public static String ROLE_QZD="ROLE_QZD";
 }

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed May 23 11:30:42 CST 2018
+#Thu Jun 21 15:58:59 CST 2018
 version=1.0-SNAPSHOT
 groupId=com.xintong.visuallnspection.inteface
 artifactId=visuallnspectioninteface

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

@@ -15,6 +15,8 @@ com/xintong/visualinspection/bean/Constant.class
 com/xintong/visualinspection/bean/FwqCheckOther.class
 com/xintong/visualinspection/pojo/fwq/FwqRankingData.class
 com/xintong/visualinspection/service/TaskService_F.class
+com/xintong/visualinspection/bean/QzdCheckTask.class
+com/xintong/visualinspection/service/RecordService_Q.class
 com/xintong/visualinspection/service/JobService.class
 com/xintong/visualinspection/bean/Job.class
 com/xintong/visualinspection/bean/WreckerGroup.class
@@ -28,6 +30,7 @@ com/xintong/visualinspection/bean/Role.class
 com/xintong/visualinspection/service/AreaInfoService_F.class
 com/xintong/visualinspection/bean/CheckTaskPeriod.class
 com/xintong/visualinspection/service/UserService.class
+com/xintong/visualinspection/bean/QzdRecord.class
 com/xintong/visualinspection/service/ItemService.class
 com/xintong/visualinspection/pojo/fwq/ServiceAreaStatistic.class
 com/xintong/visualinspection/pojo/fwq/FwqStatisiticPojo.class

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

@@ -6,6 +6,7 @@
 /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/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
@@ -18,6 +19,7 @@
 /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/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/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/AreaInfoService_F.java
@@ -33,6 +35,7 @@
 /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/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/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/util/CacheUtil.java
 /Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ItemService.java

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

@@ -18,7 +18,7 @@ import java.util.Date;
 
 @RestController
 @RequestMapping("/f/file")
-public class FileExcelController_F extends BaseController {
+public class FileExcelController_Q extends BaseController {
 
     @Autowired
     private CheckOtherService_F checkOtherService_f;

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

@@ -0,0 +1,20 @@
+package com.xintong.visualinspection.visuallnspection_qzd.dao;
+
+import com.xintong.visualinspection.bean.FwqCheckTask;
+import com.xintong.visualinspection.bean.QzdRecord;
+import com.xintong.visualinspection.bean.TaskStatus;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 文件名：FwqTaskDao
+ * 版本信息：日期：2018/4/11 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+@Mapper
+public interface QzdRecordDao {
+    public void addRecord(QzdRecord qzdRecord);
+    public void updateRecord(QzdRecord qzdRecord);
+    public List<QzdRecord> getall(QzdRecord qzdRecord);
+    public QzdRecord getone(QzdRecord qzdRecord);
+}

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

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xintong.visualinspection.visuallnspection_qzd.dao.QzdRecordDao">
+    <!--private Integer id;-->
+    <!--private Date creat_time;-->
+    <!--private Integer type;-->
+    <!--private String users;-->
+    <!--private Integer dept;-->
+    <!--private String addr;-->
+    <!--private Date received_time;-->
+    <!--private String car_info;-->
+    <!--private String car_user_info;-->
+    <!--private Date start_time;-->
+    <!--private Date arrive_time;-->
+    <!--private Date back_time;-->
+    <!--private Integer record_user;-->
+    <!--private Integer arrive_in_time;-->
+    <!--private Integer unimpeded_in_time;-->
+    <!--private Integer car_user_satisfaction;-->
+    <!--private String videos;-->
+    <!--private String pics;-->
+    <!--private Integer zxt_is_standard;-->
+    <!--private Integer is_explain;-->
+    <!--private Integer record_no_come;-->
+    <!--private Integer take_photo_upload;-->
+    <!--private Integer arrive_do_work;-->
+    <!--private String remarks;-->
+
+    <insert id="addRecord" useGeneratedKeys="true" keyProperty="id"
+            parameterType="com.xintong.visualinspection.bean.QzdRecord">
+        INSERT INTO record_info
+        (type,users,dept,addr,received_time,car_info,car_user_info,start_time,arrive_time,back_time,record_user,arrive_in_time,unimpeded_in_time,car_user_satisfaction,videos
+        ,pics,zxt_is_standard,is_explain,record_no_come,take_photo_upload,arrive_do_work,remarks)
+        VALUES
+        (#{type},#{users},#{dept},#{addr},#{received_time},#{car_info},#{car_user_info},#{start_time},#{arrive_time},#{back_time},#{record_user},#{arrive_in_time},#{unimpeded_in_time},#{car_user_satisfaction},#{videos}
+        ,#{pics},#{zxt_is_standard},#{is_explain},#{record_no_come},#{take_photo_upload},#{arrive_do_work},#{remarks}
+        )
+    </insert>
+
+    <update id="updateRecord" parameterType="com.xintong.visualinspection.bean.QzdRecord">
+        update
+        record_info
+        set
+        <if test="type != null">type = #{type}</if>
+        <if test="users != null">type = #{users}</if>
+        <if test="dept != null">type = #{dept}</if>
+        <if test="addr != null">type = #{addr}</if>
+        <if test="received_time != null">type = #{received_time}</if>
+        <if test="car_info != null">type = #{car_info}</if>
+        <if test="car_user_info != null">type = #{car_user_info}</if>
+        <if test="start_time != null">type = #{start_time}</if>
+        <if test="arrive_time != null">type = #{arrive_time}</if>
+        <if test="back_time != null">type = #{back_time}</if>
+        <if test="record_user != null">type = #{record_user}</if>
+        <if test="arrive_in_time != null">type = #{arrive_in_time}</if>
+        <if test="unimpeded_in_time != null">type = #{unimpeded_in_time}</if>
+        <if test="car_user_satisfaction != null">type = #{car_user_satisfaction}</if>
+        <if test="videos != null">type = #{videos}</if>
+        <if test="pics != null">type = #{pics}</if>
+        <if test="zxt_is_standard != null">type = #{zxt_is_standard}</if>
+        <if test="is_explain != null">type = #{is_explain}</if>
+        <if test="record_no_come != null">type = #{record_no_come}</if>
+        <if test="take_photo_upload != null">type = #{take_photo_upload}</if>
+        <if test="arrive_do_work != null">type = #{arrive_do_work}</if>
+        <if test="remarks != null">type = #{remarks}</if>
+        id=#{id}
+        WHERE
+        id = #{id}
+
+    </update>
+
+
+    <select id="getone" parameterType="com.xintong.visualinspection.bean.QzdRecord"
+            resultType="com.xintong.visualinspection.bean.QzdRecord">
+        select * from record_info where id = #{id}
+        ORDER BY received_time DESC
+    </select>
+
+    <select id="getall" parameterType="com.xintong.visualinspection.bean.FwqCheckTask"
+            resultType="com.xintong.visualinspection.bean.FwqCheckTask">
+        select t.*
+        from record_info t
+        where 1=1
+
+        ORDER BY t.received_time DESC
+    </select>
+
+
+</mapper>
+
+

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

@@ -0,0 +1,83 @@
+package com.xintong.visualinspection.visuallnspection_qzd.service.impl;
+
+/**
+ * 文件名：TaskServiceImpl_F
+ * 版本信息：日期：2017/4/7 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ *
+ * @author wenhongquan
+ * @date 2018/04/11
+ */
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.*;
+import com.xintong.visualinspection.pojo.fwq.CheckAreaData;
+import com.xintong.visualinspection.pojo.fwq.TaskData_F;
+import com.xintong.visualinspection.service.CommonService;
+import com.xintong.visualinspection.service.RecordService_Q;
+import com.xintong.visualinspection.service.TaskService_F;
+import com.xintong.visualinspection.util.Constants;
+import com.xintong.visualinspection.visuallnspection_qzd.dao.FwqTaskDao;
+import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdRecordDao;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@com.alibaba.dubbo.config.annotation.Service(
+        version = "1.0.0",
+        application = "${dubbo.application.id}",
+        protocol = "${dubbo.protocol.id}",
+        registry = "${dubbo.registry.id}"
+)
+public class RecordServiceImpl implements RecordService_Q {
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(RecordServiceImpl.class);
+
+    @Autowired
+    private QzdRecordDao qzdRecordDao;
+
+
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private CommonService commonService;
+
+    @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();
+
+        if (!(page.equals(0) && size.equals(0))) {
+            return new PageInfo<QzdRecord>(qzdRecordList);
+        }
+        return qzdRecordList;
+    }
+
+    @Override
+    public void addRecord(QzdRecord qzdRecord) {
+        qzdRecordDao.addRecord(qzdRecord);
+    }
+
+    @Override
+    public void updateRecord(QzdRecord qzdRecord) {
+        qzdRecordDao.updateRecord(qzdRecord);
+    }
+
+    @Override
+    public QzdRecord getRecord(QzdRecord qzdRecord) {
+        return qzdRecordDao.getone(qzdRecord);
+    }
+
+
+
+}