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

VisualInspection/js/util/util.js

@@ -301,6 +301,18 @@ function setSASelectValueNoAll(data, div, selectId) {
     $(div).html(optStr);
 }
 
+function setQzdSelectValueNoAll(data, div, selectId) {
+    var optStr = '<option value="">请选择清障队</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 setSASelectValueNoAll_name(data, div, selectId, name) {
     var optStr = '<option value="">' + name + '</option>';
     for (var i in data) {
@@ -411,6 +423,29 @@ function setWreckerGroupSelectValue(data, div, selectId) {
     $(div).html(optStr);
 }
 
+function setWreckerGroupAllSelect(div, selectId) {
+    var feeList = $.zui.store.get("cache_wrecker_group_list");
+    if (feeList) {
+        setWreckerGroupSelectAllValue(feeList, div, selectId);
+    } else {
+        get_common_service("/dept/getAllWG", null, function(data) {
+            setWreckerGroupSelectAllValue(data, div, selectId);
+        });
+    }
+}
+
+function setWreckerGroupSelectAllValue(data, div, selectId) {
+    var optStr = '<option value="">全部</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 setLaneSelect(div, selectId) {
     var optStr = '';
     var data = [];

VisualInspection/qzd/js/other_check/other_check.js

@@ -46,10 +46,11 @@ function init() {
     setRoadManagerSelect("#first", road_manager, true);
     // 设置服务区
     var checked_dept = null;
-    if (roleContains("FWQ")) {
+    if (roleContains("QZD")) {
         checked_dept = getCurrentUser().organid;
     }
-    setSASelect("#fsList", checked_dept);
+  //  setSASelect("#fsList", checked_dept);
+  setWreckerGroupAllSelect("#fsList", checked_dept);
 
     // 新增服务区下拉框
     var dept;
@@ -61,7 +62,8 @@ function init() {
         roadManager2 = getCurrentUser().organid;
     }
     var feeList = getOrganList(roadManager2);
-    setSASelectValueNoAll(feeList, "#select-dept", dept);
+   // setWreckerGroupSelect("#select-dept", checked_dept);
+   setQzdSelectValueNoAll(feeList, "#select-dept", dept);
     // setPersonal();// 2期不需要人员显示
     var zTreeObj;
     var zNodes = [];
@@ -70,7 +72,6 @@ function init() {
     getOtherCheckItems();
 
     $("#check_item_select input").on("click", function() {
-        //debugger;
         var nodedata;
         if ($("#check_item_select input") != undefined && $("#check_item_select input") != "") {
             nodedata = check_item_tree.getNodeByParam("name", $("#check_item_select input").val(), null);
@@ -152,7 +153,7 @@ $("#save-check").click(function() {
 
 
         if (dept_id == null || dept_id == undefined || dept_id == "") {
-            layer.msg('请选择服务区');
+            layer.msg('请选择清障队');
             return;
         } else if (check_item_id == null || check_item_id == undefined || check_item_id == "") {
             layer.msg('请选择扣分类别');
@@ -178,7 +179,7 @@ $("#save-check").click(function() {
         }
         console.log(data);
         if (idUpdate) {
-            post_common_service("f/checkOther/update", data, function(data) {
+            post_common_service("q/checkOther/update", data, function(data) {
                 file_src = "";
                 imgs_src = [];
                 layer.closeAll();
@@ -187,7 +188,7 @@ $("#save-check").click(function() {
 
             });
         } else {
-            post_common_service("f/checkOther/add", data, function(data) {
+            post_common_service("q/checkOther/add", data, function(data) {
                 file_src = "";
                 imgs_src = [];
                 layer.closeAll();
@@ -241,6 +242,7 @@ function confirmCfun() {
 
 function queryTable() {
     $(".datatable").empty();
+    console.log(check_type);
     var data = {
         "check_time_name": $("#month_date").val(),
         "dept_id": $("#fsList").val(),
@@ -299,13 +301,13 @@ function queryTable() {
     }
     $('.datatable').mytable({
         'cols': cols,
-        'url': "f/checkOther/getAllCheckOther",
+        'url': "q/checkOther/getAllCheckOther",
         'param': data
     });
 }
 
 function deleteCheckTeam(id) {
-    deleteItem4Common(id, "f/checkOther/delete", queryTable);
+    deleteItem4Common(id, "q/checkOther/delete", queryTable);
 }
 
 function updateCheckTeam(id) {
@@ -313,7 +315,7 @@ function updateCheckTeam(id) {
     data = {
         "id": id
     }
-    post_common_service("f/checkOther/getCheckById", data, function(data) {
+    post_common_service("q/checkOther/getCheckById", data, function(data) {
         var select_road = $(".div-roadManage select").val();
         var feeList = getOrganList(select_road);
         setSASelectValueNoAll(feeList, "#select-dept", data.dept_id);
@@ -426,13 +428,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 = getWreckerGroupList.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_wrecker_group_list");
         // }
     }
     return organList;
@@ -494,7 +496,7 @@ function refreshFee(data, selectId) {
 //     var param = {
 //         "organid": select_road
 //     }
-//     var url = "user/getFsUserList";
+//     var url = "useq/getFsUserList";
 //     if (check_type == 5) {
 //         url = "user/getWGUserList";
 //     }
@@ -707,11 +709,17 @@ function getOtherCheckItems() {
     var param = {};
     // rule_type=8,服务区暗访考核办法.rule_type=9,服务区现场考核办法
     // check_type=8,服务区第三方暗访，check_type=9，服务区现场稽查
-    if (check_type == 8) {
-        param.rule_type = 8;
-    } else if (check_type == 9) {
-        param.rule_type = 9;
+    if (check_type == 11) {
+        param.rule_type = 11;
+    } else if (check_type == 12) {
+        param.rule_type = 12;
+    }else if (check_type == 13) {
+        param.rule_type = 13;
+    }else if (check_type == 14) {
+        param.rule_type = 14;
     }
+    
+
     post_common_service('checkRule/getItemListByRuleType', param, function(data) {
         all_data = [];
         z_cache = data;
@@ -789,7 +797,7 @@ function static() {
 
     var type = $("#speacial_type_select").val();
 
-    if (check_type == 8 || check_type == 9) {
+    if (check_type == 11 || check_type == 12 || check_type == 13 || check_type == 14) {
         var p = {
             "check_type": check_type,
             "check_period": $("#month_date").val(),
@@ -797,7 +805,8 @@ function static() {
         };
 
 
-        post_common_service("f/checkOther/getOtherCheckStatistics", p, function(data) {
+        post_common_service("q/checkOther/getOtherCheckStatistics", p, function(data) {
+            console.log(data);
 
             var names = new Array();
             var totalnamesvalue = new HashMap();
@@ -805,8 +814,10 @@ function static() {
             var datas = '';
             var t8 = 0;
             var title = "";
-            if (check_type == 8) title = "服务区第三方暗访情况";
-            if (check_type == 9) title = "服务区现场检查情况";
+            if (check_type == 12) title = "清障队第三方暗访情况";
+            if (check_type == 11) title = "清障队现场检查情况";
+            if (check_type == 13) title = "清障队96777";
+            if (check_type == 14) title = "清障队其它稽查情况";
             // if (check_type == 4) title = "数据平台应用情况";
             // if (check_type == 2 && type == "1") title = "公司特情稽查情况";
             // if (check_type == 2 && type == "2") title = "联网特情稽查情况";

VisualInspection/qzd/js/task/new.js

@@ -1,6 +1,7 @@
 var cur_status;
 var cur_page;
 var is_save;
+var updateid = null;
 var user = $.zui.store.get("user")
 $("#fileupload").change(function() {
     UpladFile();
@@ -10,6 +11,7 @@ function initTaskPage() {
     initQueryParams();
     initTableRowBtn();
     queryTask();
+    getRecord();
 }
 
 function initQueryParams() {
@@ -87,7 +89,7 @@ function queryTask() {
         { 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 = 16;
+    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' };
         colFunc.oper = $.zui.store.get("task_table_btn_1");
@@ -158,8 +160,24 @@ function checkUpdate(id){
         $('#addModal').modal('show');
         $("#type").val(redata.type);
         $("#carinfo").val(redata.car_info);
-        time = moment(redata.arrive_time).format("YYYY-MM-DD HH:mm:ss");
+        var time = moment(redata.arrive_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#arrive_time").val(time);
+        time = moment(redata.received_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#received_time").val(time);
+        time = moment(redata.start_time).format("YYYY-MM-DD HH:mm:ss");
         $("#startTime").val(time);
+        time = moment(redata.back_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#back_time").val(time);
+        time = moment(redata.backfield_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#backfield_time").val(time);
+        time = moment(redata.delivery_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#delivery_time").val(time);
+        time = moment(redata.accept_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#accept_time").val(time);
+        time = moment(redata.rescue_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#rescue_time").val(time);
+        time = moment(redata.relief_time).format("YYYY-MM-DD HH:mm:ss");
+        $("#relief_time").val(time);
         $("#carUserinfo").val(redata.car_user_info);
         $("#dept").val(redata.dept);
         $("#carUserSatisfaction").val(redata.car_user_satisfaction);
@@ -191,4 +209,17 @@ function resert(){
         $(".ComboTreeItemChlid").find("input").prop('checked', false);
         $("#recordUser").val('');
         $("#addr").val('');
+}
+
+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);
+});
 }

VisualInspection/qzd/view/other_check/96777_check.html

@@ -0,0 +1,178 @@
+<link rel="stylesheet" type="text/css" href="/css/other_check/other_check.css">
+<script src="/qzd/js/other_check/other_check.js?_inline"></script>
+<!--  start -->
+<div class="container-fluid ">
+    <div class="row">
+        <div>
+            <div class="col-xs-1" style="width:160px">
+                <span style="float: left;
+                padding-top: 5px;">时间：</span>
+                <div class="div-month">
+                    <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
+                </div>
+            </div>
+            <!-- <div class="col-xs-1" style="width:220px">
+                <span style="float: left;
+                 padding-top: 5px;">道管：</span>
+                <div class="div-roadManage">
+                    <select class="form-control" id="first"></select>
+                </div>
+            </div> -->
+            <div class="col-xs-1" style="width:212px">
+                <span style="float: left;
+                padding-top: 5px;">清障队：</span>
+                <div class="div-station">
+                    <select class="form-control" id="fsList"></select>
+                </div>
+            </div>
+
+            <div class="col-xs-1">
+                <div class="input-group">
+                    <button class="btn btn-primary " type="button" id="conditional_query">查询</button>
+                </div>
+            </div>
+
+            <div class="col-xs-4" style="float:right;margin-right:30px;">
+                <button class="btn btn-info3" type="button" style="margin-right:30px;" onclick="static()">统计</button>
+
+                <button class="btn btn-primary" type="button" id="add_btn"><i class="icon icon-plus-sign"></i> 增加稽查记录</button>
+
+                <button class="btn btn-info3" type="button" style="margin-left:30px;" onclick="exportThird()"> 导出Excel</button>
+            </div>
+
+        </div>
+    </div>
+    <hr>
+    <div class="row">
+        <!-- 使用一个div来显示数据表格 -->
+        <div class="datatable" data-checkable="true" data-sortable="true"></div>
+    </div>
+    <div class="">
+
+    </div>
+
+</div>
+<!--  end -->
+<div style="display:none;" id="form-div">
+    <div class="layer-content" style="width:100%;height:100%;">
+        <div style="width:350px;overflow:hidden;zoom:1;margin:auto;">
+            <div style="width:100%;margin-top:20px;overflow:hidden;zoom:1;">
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">选择清障队</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <div class="div-select"><select class="form-control" id="select-dept"></select></button>
+                        </div>
+                        <!-- <div class="div-select"><select class="form-control" id="select-personal"></select></button>
+                        </div> -->
+                    </div>
+                </div>
+                <div style="width:100%;margin-top:10px;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">扣分类别</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <div id="check_item_select" style="position: relative;">
+                            <input class="form-control" id="check_item_id">
+                        </div>
+                        <div class="form-group check_item_group">
+                            <!--<label for="exampleInputPassword4" class="col-sm-2">分类：</label>-->
+                            <div class="col-md-6 col-sm-10">
+                                <div id="check_item_select"></div>
+
+                            </div>
+                        </div>
+                    </div>
+                    <div class="panel-body" style="display:none;">
+                        <ul id="check_rule_tree2" class="ztree">
+
+                        </ul>
+                    </div>
+                </div>
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">扣分描述</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <input class="form-control" id="remark">
+                    </div>
+                </div>
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">扣分值</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <input class="form-control" id="check_score" onkeypress="return kkpager.keypress_gopage(event);">
+                    </div>
+                </div>
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">附件上传</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <div class="col-md-10">
+                            <div id="uploaderExample" class="uploader">
+                                <div id="editImage" file_src="" style="overflow:hidden;zoom:1;"></div>
+                                <div class="file-list" data-drag-placeholder="请拖拽文件到此处"></div>
+                                <button type="button" class="btn btn-primary  uploader-btn-browse" style="float:left;"><i class="icon icon-cloud-upload"></i> 选择文件</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">稽查时间</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <div class="div-month2">
+                            <input id="month_date2" class="form-control form-date" type="text" placeholder="请选择" style="height:32px;">
+                        </div>
+                        <select class="form-control" style="width:130px;" id="check_num">
+                        <option value="1">第一次检查</option>
+                        <option value="2">第二次检查</option>
+                        <option value="3">第三次检查</option>
+                    </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="operation" style="width:100%;overflow:hidden;zoom:1;border-top:1px solid #ddd;margin-top:20px;padding:10px 10px 10px 10px;">
+            <button class="btn btn-primary" type="button" style="float:right;" id="save-check"> 保存</button>
+            <button class="btn btn-primary" type="button" style="float:right;background-color:#fff;color:#333;margin-right:20px;" id="close-layer"> 关闭</button>
+        </div>
+    </div>
+    <script>
+        $(document).ready(function() {
+            check_type = 13;
+            init();
+        });
+
+        function exportThird() {
+            var param = '';
+            var month_date = $("#month_date").val();
+            // var first = $("#first").val();
+            var second = $("#fsList").val();
+            if (month_date != '') {
+                param = "&check_time_name=" + month_date;
+            }
+            if (second != '') {
+                param += "&dept_id=" + second;
+            }
+            window.open(getExcelServeraddr() + "f/file/other/check/excel?check_type=13" + param);
+        }
+
+        function exportThirds() {
+            var param = '';
+            var month_date = $("#month_date").val();
+            // var first = $("#first").val();
+            var second = $("#fsList").val();
+            if (month_date != '') {
+                param = "&check_time_name=" + month_date;
+            }
+            if (second != '') {
+                param += "&dept_id=" + second;
+            }
+            window.open(getExcelServeraddr() + "f/file/other/check/static/excel?check_type=13" + param);
+        }
+    </script>

VisualInspection/qzd/view/other_check/onsite_check.html

@@ -1,24 +1,29 @@
-<!--现场稽查-->
 <link rel="stylesheet" type="text/css" href="/css/other_check/other_check.css">
 <script src="/qzd/js/other_check/other_check.js?_inline"></script>
 <!--  start -->
 <div class="container-fluid ">
     <div class="row">
         <div>
-            <span style="float: left;
+            <div class="col-xs-1" style="width:160px">
+                <span style="float: left;
                 padding-top: 5px;">时间：</span>
-            <div class="div-month">
-                <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
+                <div class="div-month">
+                    <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
+                </div>
             </div>
-            <!-- <span style="float: left;
+            <!-- <div class="col-xs-1" style="width:220px">
+                <span style="float: left;
                  padding-top: 5px;">道管：</span>
-            <div class="div-roadManage">
-                <select class="form-control" id="first"></select>
+                <div class="div-roadManage">
+                    <select class="form-control" id="first"></select>
+                </div>
             </div> -->
-            <span style="float: left;
-                padding-top: 5px;">服务区：</span>
-            <div class="div-station">
-                <select class="form-control" id="fsList"></select>
+            <div class="col-xs-1" style="width:212px">
+                <span style="float: left;
+                padding-top: 5px;">清障队：</span>
+                <div class="div-station">
+                    <select class="form-control" id="fsList"></select>
+                </div>
             </div>
 
             <div class="col-xs-1">
@@ -27,14 +32,14 @@
                 </div>
             </div>
 
-            <div style="float:right;margin-right:30px;">
-
+            <div class="col-xs-4" style="float:right;margin-right:30px;">
                 <button class="btn btn-info3" type="button" style="margin-right:30px;" onclick="static()">统计</button>
 
                 <button class="btn btn-primary" type="button" id="add_btn"><i class="icon icon-plus-sign"></i> 增加稽查记录</button>
 
                 <button class="btn btn-info3" type="button" style="margin-left:30px;" onclick="exportThird()"> 导出Excel</button>
             </div>
+
         </div>
     </div>
     <hr>
@@ -44,7 +49,6 @@
     </div>
     <div class="">
 
-
     </div>
 
 </div>
@@ -55,7 +59,7 @@
             <div style="width:100%;margin-top:20px;overflow:hidden;zoom:1;">
                 <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
                     <div style="width:80px;float:left;">
-                        <span style="line-height:32px;">选择服务区</span>
+                        <span style="line-height:32px;">选择清障队</span>
                     </div>
                     <div style="width:260px;float:left;">
                         <div class="div-select"><select class="form-control" id="select-dept"></select></button>
@@ -140,7 +144,7 @@
     </div>
     <script>
         $(document).ready(function() {
-            check_type = 9;
+            check_type = 11;
             init();
         });
 
@@ -155,7 +159,7 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/excel?check_type=9" + param);
+            window.open(getExcelServeraddr() + "f/file/other/check/excel?check_type=11" + param);
         }
 
         function exportThirds() {
@@ -169,6 +173,6 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/static/excel?check_type=9" + param);
+            window.open(getExcelServeraddr() + "f/file/other/check/static/excel?check_type=11" + param);
         }
     </script>

VisualInspection/qzd/view/other_check/other_check.html

@@ -0,0 +1,178 @@
+<link rel="stylesheet" type="text/css" href="/css/other_check/other_check.css">
+<script src="/qzd/js/other_check/other_check.js?_inline"></script>
+<!--  start -->
+<div class="container-fluid ">
+    <div class="row">
+        <div>
+            <div class="col-xs-1" style="width:160px">
+                <span style="float: left;
+                padding-top: 5px;">时间：</span>
+                <div class="div-month">
+                    <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
+                </div>
+            </div>
+            <!-- <div class="col-xs-1" style="width:220px">
+                <span style="float: left;
+                 padding-top: 5px;">道管：</span>
+                <div class="div-roadManage">
+                    <select class="form-control" id="first"></select>
+                </div>
+            </div> -->
+            <div class="col-xs-1" style="width:212px">
+                <span style="float: left;
+                padding-top: 5px;">清障队：</span>
+                <div class="div-station">
+                    <select class="form-control" id="fsList"></select>
+                </div>
+            </div>
+
+            <div class="col-xs-1">
+                <div class="input-group">
+                    <button class="btn btn-primary " type="button" id="conditional_query">查询</button>
+                </div>
+            </div>
+
+            <div class="col-xs-4" style="float:right;margin-right:30px;">
+                <button class="btn btn-info3" type="button" style="margin-right:30px;" onclick="static()">统计</button>
+
+                <button class="btn btn-primary" type="button" id="add_btn"><i class="icon icon-plus-sign"></i> 增加稽查记录</button>
+
+                <button class="btn btn-info3" type="button" style="margin-left:30px;" onclick="exportThird()"> 导出Excel</button>
+            </div>
+
+        </div>
+    </div>
+    <hr>
+    <div class="row">
+        <!-- 使用一个div来显示数据表格 -->
+        <div class="datatable" data-checkable="true" data-sortable="true"></div>
+    </div>
+    <div class="">
+
+    </div>
+
+</div>
+<!--  end -->
+<div style="display:none;" id="form-div">
+    <div class="layer-content" style="width:100%;height:100%;">
+        <div style="width:350px;overflow:hidden;zoom:1;margin:auto;">
+            <div style="width:100%;margin-top:20px;overflow:hidden;zoom:1;">
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">选择清障队</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <div class="div-select"><select class="form-control" id="select-dept"></select></button>
+                        </div>
+                        <!-- <div class="div-select"><select class="form-control" id="select-personal"></select></button>
+                        </div> -->
+                    </div>
+                </div>
+                <div style="width:100%;margin-top:10px;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">扣分类别</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <div id="check_item_select" style="position: relative;">
+                            <input class="form-control" id="check_item_id">
+                        </div>
+                        <div class="form-group check_item_group">
+                            <!--<label for="exampleInputPassword4" class="col-sm-2">分类：</label>-->
+                            <div class="col-md-6 col-sm-10">
+                                <div id="check_item_select"></div>
+
+                            </div>
+                        </div>
+                    </div>
+                    <div class="panel-body" style="display:none;">
+                        <ul id="check_rule_tree2" class="ztree">
+
+                        </ul>
+                    </div>
+                </div>
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">扣分描述</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <input class="form-control" id="remark">
+                    </div>
+                </div>
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">扣分值</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <input class="form-control" id="check_score" onkeypress="return kkpager.keypress_gopage(event);">
+                    </div>
+                </div>
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">附件上传</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <div class="col-md-10">
+                            <div id="uploaderExample" class="uploader">
+                                <div id="editImage" file_src="" style="overflow:hidden;zoom:1;"></div>
+                                <div class="file-list" data-drag-placeholder="请拖拽文件到此处"></div>
+                                <button type="button" class="btn btn-primary  uploader-btn-browse" style="float:left;"><i class="icon icon-cloud-upload"></i> 选择文件</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">稽查时间</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <div class="div-month2">
+                            <input id="month_date2" class="form-control form-date" type="text" placeholder="请选择" style="height:32px;">
+                        </div>
+                        <select class="form-control" style="width:130px;" id="check_num">
+                        <option value="1">第一次检查</option>
+                        <option value="2">第二次检查</option>
+                        <option value="3">第三次检查</option>
+                    </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="operation" style="width:100%;overflow:hidden;zoom:1;border-top:1px solid #ddd;margin-top:20px;padding:10px 10px 10px 10px;">
+            <button class="btn btn-primary" type="button" style="float:right;" id="save-check"> 保存</button>
+            <button class="btn btn-primary" type="button" style="float:right;background-color:#fff;color:#333;margin-right:20px;" id="close-layer"> 关闭</button>
+        </div>
+    </div>
+    <script>
+        $(document).ready(function() {
+            check_type = 14;
+            init();
+        });
+
+        function exportThird() {
+            var param = '';
+            var month_date = $("#month_date").val();
+            // var first = $("#first").val();
+            var second = $("#fsList").val();
+            if (month_date != '') {
+                param = "&check_time_name=" + month_date;
+            }
+            if (second != '') {
+                param += "&dept_id=" + second;
+            }
+            window.open(getExcelServeraddr() + "f/file/other/check/excel?check_type=14" + param);
+        }
+
+        function exportThirds() {
+            var param = '';
+            var month_date = $("#month_date").val();
+            // var first = $("#first").val();
+            var second = $("#fsList").val();
+            if (month_date != '') {
+                param = "&check_time_name=" + month_date;
+            }
+            if (second != '') {
+                param += "&dept_id=" + second;
+            }
+            window.open(getExcelServeraddr() + "f/file/other/check/static/excel?check_type=14" + param);
+        }
+    </script>

VisualInspection/qzd/view/other_check/third_unannounced_check.html

@@ -20,7 +20,7 @@
             </div> -->
             <div class="col-xs-1" style="width:212px">
                 <span style="float: left;
-                padding-top: 5px;">服务区：</span>
+                padding-top: 5px;">清障队：</span>
                 <div class="div-station">
                     <select class="form-control" id="fsList"></select>
                 </div>
@@ -59,7 +59,7 @@
             <div style="width:100%;margin-top:20px;overflow:hidden;zoom:1;">
                 <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
                     <div style="width:80px;float:left;">
-                        <span style="line-height:32px;">选择服务区</span>
+                        <span style="line-height:32px;">选择清障队</span>
                     </div>
                     <div style="width:260px;float:left;">
                         <div class="div-select"><select class="form-control" id="select-dept"></select></button>
@@ -144,7 +144,7 @@
     </div>
     <script>
         $(document).ready(function() {
-            check_type = 8;
+            check_type = 12;
             init();
         });
 
@@ -159,7 +159,7 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/excel?check_type=8" + param);
+            window.open(getExcelServeraddr() + "f/file/other/check/excel?check_type=12" + param);
         }
 
         function exportThirds() {
@@ -173,6 +173,6 @@
             if (second != '') {
                 param += "&dept_id=" + second;
             }
-            window.open(getExcelServeraddr() + "f/file/other/check/static/excel?check_type=8" + param);
+            window.open(getExcelServeraddr() + "f/file/other/check/static/excel?check_type=12" + param);
         }
     </script>

VisualInspection/qzd/view/task/addtask.html

@@ -22,7 +22,7 @@
                     <div class="form-group col-xs-4">
                         <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">里程数:</label>
                         <div class="col-xs-8">
-                                <input type="text" id="start_time" class="form-control form-date" placeholder="公里" onchange="changestatus()">
+                                <input type="text" id="km" class="form-control form-date" placeholder="公里" onchange="changestatus()">
                             </div>
                     </div>
                 </div>
@@ -48,7 +48,7 @@
                 <div class="form-group col-xs-5">
                     <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding: 0px">接警时间：</label>
                     <div class="col-xs-8">
-                        <input type="text" style="width:100%;" id="startTime" class="form-control">
+                        <input type="text" style="width:100%;" id="received_time" class="form-control">
                         </div>
                 </div>
                 <div class="form-group col-xs-7">
@@ -95,13 +95,13 @@
                         <div class="form-group col-xs-5">
                             <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">送达时间：</label>
                             <div class="col-xs-8">
-                                <input type="text" style="width:100%;" id="arriveTime" class="form-control">
+                                <input type="text" style="width:100%;" id="delivery_time" class="form-control">
                                 </div>
                         </div>
                         <div class="form-group col-xs-7">
                             <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">接受时间：</label>
                             <div class="col-xs-6">
-                                <input type="text" style="width:100%;" id="backTime" class="form-control">
+                                <input type="text" style="width:100%;" id="accept_time" class="form-control">
                                 </div>
                         </div>
                     </div> 
@@ -109,13 +109,13 @@
                         <div class="form-group col-xs-5">
                             <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">出发时间：</label>
                             <div class="col-xs-8">
-                                <input type="text" style="width:100%;" id="arriveTime" class="form-control">
+                                <input type="text" style="width:100%;" id="startTime" class="form-control" autocomplete="off">
                                 </div>
                         </div>
                         <div class="form-group col-xs-7">
                             <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">到达时间：</label>
                             <div class="col-xs-6">
-                                <input type="text" style="width:100%;" id="backTime" class="form-control">
+                                <input type="text" style="width:100%;" id="arrive_time" class="form-control">
                                 </div>
                         </div>
                     </div> 
@@ -123,13 +123,13 @@
                         <div class="form-group col-xs-5">
                             <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">施救时间：</label>
                             <div class="col-xs-8">
-                                <input type="text" style="width:100%;" id="arriveTime" class="form-control">
+                                <input type="text" style="width:100%;" id="rescue_time" class="form-control">
                                 </div>
                         </div>
                         <div class="form-group col-xs-7">
                             <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">离场时间：</label>
                             <div class="col-xs-6">
-                                <input type="text" style="width:100%;" id="backTime" class="form-control">
+                                <input type="text" style="width:100%;" id="back_time" class="form-control">
                                 </div>
                         </div>
                     </div> 
@@ -137,13 +137,13 @@
                         <div class="form-group col-xs-5">
                             <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding:0">解脱时间：</label>
                             <div class="col-xs-8">
-                                <input type="text" style="width:100%;" id="arriveTime" class="form-control">
+                                <input type="text" style="width:100%;" id="relief_time" class="form-control">
                                 </div>
                         </div>
                         <div class="form-group col-xs-7">
                             <label for="exampleInputAccount1" class="col-xs-4" style="text-align: left;padding-right:0">回场时间：</label>
                             <div class="col-xs-6">
-                                <input type="text" style="width:100%;" id="backTime" class="form-control">
+                                <input type="text" style="width:100%;" id="backfield_time" class="form-control">
                                 </div>
                         </div>
                     </div> 
@@ -160,17 +160,40 @@
     var arrive = 30;
     var back = 60;
        laydate.render({
+        elem: '#received_time',
+        type: 'datetime',                                                                                              
+    });
+    laydate.render({
+        elem: '#delivery_time',
+        type: 'datetime',                                                                                              
+    });  
+    laydate.render({
+        elem: '#accept_time',
+        type: 'datetime',                                                                                              
+    });
+    laydate.render({
         elem: '#startTime',
         type: 'datetime',                                                                                              
     });
-
+    laydate.render({
+        elem: '#arrive_time',
+        type: 'datetime',                                                                                              
+    });
       laydate.render({
-        elem: '#arriveTime',
+        elem: '#rescue_time',
         type: 'datetime',                                                                                              
     });
 
       laydate.render({
-        elem: '#backTime',
+        elem: '#back_time',
+        type: 'datetime',                                                                                              
+    });
+    laydate.render({
+        elem: '#relief_time',
+        type: 'datetime',                                                                                              
+    });
+    laydate.render({
+        elem: '#backfield_time',
         type: 'datetime',                                                                                              
     });
 
@@ -234,13 +257,19 @@
        var data={
         'type' : $("#type").val(),
         'car_info' :  $("#carinfo").val(),
-        'received_time' :  new Date($("#startTime").val()),
+        'received_time' :  new Date($("#received_time").val()),
         'car_user_info' :  $("#carUserinfo").val(),
         'dept' :  $("#dept").val(),
         'car_user_satisfaction' :  $("#carUserSatisfaction").val(),
         'users' :  userid,
-        'arrive_time' :  new Date($("#arriveTime").val()),
-        'back_time' :  new Date($("#backTime").val()),
+        'arrive_time' :  new Date($("#arrive_time").val()),
+        'back_time' :  new Date($("#back_time").val()),
+        'delivery_time' :  new Date($("#delivery_time").val()),
+        'accept_time' :  new Date($("#accept_time").val()),
+        'rescue_time' :  new Date($("#rescue_time").val()),
+        'relief_time' :  new Date($("#relief_time").val()),
+        'backfield_time' :  new Date($("#backfield_time").val()),
+        'start_time' :  new Date($("#startTime").val()),
         'arrive_in_time' : arriveIntime,
         'unimpeded_in_time' : unimpededInTime,
         'addr': $("#addr").val()

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

@@ -0,0 +1,99 @@
+package com.xintong.visualinspection.controller.gettway;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.FwqCheckOther;
+import com.xintong.visualinspection.controller.BaseController;
+import com.xintong.visualinspection.service.CheckOtherService_F;
+import com.xintong.visualinspection.service.CheckOtherService_Q;
+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.Map;
+
+@RestController
+@RequestMapping("/q/checkOther")
+public class CheckOtherController_Q extends BaseController {
+
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private CheckOtherService_Q checkOtherService_f;
+
+    /**
+     * 第三方暗访稽查查询(查询条件:时间,道管,服务区)
+     * @param request
+     * @param page
+     * @param size
+     * @param fwqCheckOther
+     * @return
+     */
+    @RequestMapping(value = "/getAllCheckOther/{page}/{size}")
+    public String getAllCheckOther(HttpServletRequest request, @PathVariable Integer page, @PathVariable Integer size, @RequestBody FwqCheckOther fwqCheckOther){
+        Object result = checkOtherService_f.getAllCheckOther(page,size,fwqCheckOther);
+        return super.returnSuccessResult(result);
+    }
+
+    /**
+     * 添加其他稽查查记录
+     * @param request
+     * @param fwqCheckOther
+     * @return
+     */
+    @RequestMapping(value = "/add")
+    public String add(HttpServletRequest request, @Valid @RequestBody FwqCheckOther fwqCheckOther) {
+        checkOtherService_f.addCheckOther(fwqCheckOther);
+        return super.returnSuccessResult("添加成功");
+    }
+
+    /**
+     * 更新稽查记录
+     * @param fwqCheckOther
+     * @return
+     */
+    @RequestMapping(value = "/update")
+    public String update(@RequestBody FwqCheckOther fwqCheckOther){
+        if(fwqCheckOther.getId()==null){
+            throw new BusinessException(20002);
+        }
+        checkOtherService_f.updateCheckOther(fwqCheckOther);
+        return super.returnSuccessResult("修改成功");
+    }
+
+    /**
+     * 根据id删除稽查记录
+     * @param fwqCheckOther
+     * @return
+     */
+    @RequestMapping(value = "/delete")
+    public String delete(@RequestBody FwqCheckOther fwqCheckOther){
+        if(fwqCheckOther.getId()==null){
+            throw new BusinessException(20002);
+        }
+        checkOtherService_f.deleteCheckOther(fwqCheckOther.getId());
+        return super.returnSuccessResult("删除成功");
+    }
+
+    /**根据id获取稽查记录
+     * @param fwqCheckOther
+     * @return
+     */
+    @RequestMapping(value = "/getCheckById")
+    public String getCheckById(@RequestBody FwqCheckOther fwqCheckOther){
+        if(fwqCheckOther.getId()==null){
+            throw new BusinessException(20002);
+        }
+        FwqCheckOther result =checkOtherService_f.selectCheckById(fwqCheckOther.getId());
+        return super.returnSuccessResult(result);
+    }
+
+    @RequestMapping(value = "/getOtherCheckStatistics")
+    public String getOtherCheckStatistics(@RequestBody FwqCheckOther fwqCheckOther){
+        Map<String,Object> checkStatistics = checkOtherService_f.getCheckOtherStatistics(fwqCheckOther);
+        return super.returnSuccessResult(checkStatistics);
+    }
+}

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

@@ -154,9 +154,8 @@ public class DepartmentServiceImpl extends BaseService implements DepartmentServ
 	}
 
 	@Override
-	public List<FeeStation> getAllWG() {
-		// TODO Auto-generated method stub
-		return departmentDao.getAllWG();
+	public List<FeeStation> getAllWG(){
+		return  departmentDao.getAllWG();
 	}
 
 

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

@@ -40,5 +40,11 @@ public class QzdRecord implements Serializable {
     private Date startTime;//'开始时间'
     private Date endTime;//'结束时间'
     private Integer check_status;
+    private Date delivery_time;
+    private Date accept_time;
+    private Date rescue_time;
+    private Date relief_time;
+    private Date backfield_time;
+
 
 }

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

@@ -0,0 +1,56 @@
+package com.xintong.visualinspection.service;
+
+import com.xintong.visualinspection.bean.FwqCheckOther;
+
+import java.util.Map;
+
+public interface CheckOtherService_Q {
+
+    /**
+     * 查询第三方暗访稽查数据
+     *
+     * @param page
+     * @param size
+     * @param fwqOtherCheck
+     * @return
+     */
+    Object getAllCheckOther(Integer page, Integer size, FwqCheckOther fwqOtherCheck);
+
+    /**
+     * 新增稽查数据
+     *
+     * @param fwqOtherCheck
+     */
+    void addCheckOther(FwqCheckOther fwqOtherCheck);
+
+    /**
+     * 根据id删除稽查记录
+     *
+     * @param id
+     */
+    void deleteCheckOther(Long id);
+
+    /**
+     * 根据id修改稽查记录
+     *
+     * @param fwqOtherCheck
+     */
+    void updateCheckOther(FwqCheckOther fwqOtherCheck);
+
+    /**
+     * 根据id获取稽查记录
+     *
+     * @param id
+     * @return
+     */
+    FwqCheckOther selectCheckById(Long id);
+
+    /**
+     * 统计数据
+     *
+     * @param fwqOtherCheck
+     * @return
+     */
+    Map<String, Object> getCheckOtherStatistics(FwqCheckOther fwqOtherCheck);
+
+}

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

@@ -93,6 +93,10 @@ public class CacheUtil {
         list.add(26L);// 第三方暗访
         list.add(27L);// 现场检查
         list.add(28L);// 服务区考核办法
+        list.add(29L);// 清障队现场检查
+        list.add(30L);// 清障队第三方
+        list.add(31L);// 清障队96777
+        list.add(32L);// 清障队其他稽查
         for (Long id : list) {
             List<String> itemList = itemService.getCheckItemName(id);
             CacheUtil.itemNameMap.put(id, itemList);

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

@@ -30,10 +30,10 @@
             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)
+        ,pics,zxt_is_standard,is_explain,record_no_come,take_photo_upload,arrive_do_work,remarks,delivery_time,accept_time,rescue_time,relief_time,backfield_time)
         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}
+        ,#{pics},#{zxt_is_standard},#{is_explain},#{record_no_come},#{take_photo_upload},#{arrive_do_work},#{remarks},#{delivery_time},#{accept_time},#{rescue_time},#{relief_time},#{backfield_time}
         )
     </insert>
 
@@ -63,6 +63,11 @@
         <if test="take_photo_upload != null">take_photo_upload = #{take_photo_upload},</if>
         <if test="arrive_do_work != null">arrive_do_work = #{arrive_do_work},</if>
         <if test="remarks != null">remarks = #{remarks},</if>
+        <if test="delivery_time != null">delivery_time = #{delivery_time},</if>
+        <if test="accept_time != null">accept_time = #{accept_time},</if>
+        <if test="rescue_time != null">rescue_time = #{rescue_time},</if>
+        <if test="relief_time != null">relief_time = #{relief_time},</if>
+        <if test="backfield_time != null">backfield_time = #{backfield_time},</if>
         id=#{id}
         WHERE
         id = #{id}

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

@@ -9,7 +9,7 @@ import com.xintong.visualinspection.bean.FwqCheckOther;
 import com.xintong.visualinspection.bean.FwqCheckOtherStatistics;
 import com.xintong.visualinspection.bean.Item;
 import com.xintong.visualinspection.bean.Organ;
-import com.xintong.visualinspection.service.CheckOtherService_F;
+import com.xintong.visualinspection.service.CheckOtherService_Q;
 import com.xintong.visualinspection.service.CommonService;
 import com.xintong.visualinspection.visuallnspection_qzd.dao.QzdCheckOtherDao;
 import org.slf4j.Logger;
@@ -35,12 +35,12 @@ import java.util.Map;
         protocol = "${dubbo.protocol.id}",
         registry = "${dubbo.registry.id}"
 )
-public class CheckOtherServiceImpl implements CheckOtherService_F {
+public class CheckOtherServiceImpl implements CheckOtherService_Q {
 
     private static final Logger logger = LoggerFactory.getLogger(CheckOtherServiceImpl.class);
 
     @Autowired
-    private QzdCheckOtherDao qzdCheckOtherDao;
+    private QzdCheckOtherDao fwqCheckOtherDao;
 
     @Reference(version = "1.0.0",
             application = "${dubbo.application.id}",
@@ -60,7 +60,7 @@ public class CheckOtherServiceImpl implements CheckOtherService_F {
         if (!(page.equals(0) && size.equals(0))) {
             PageHelper.startPage(page, size);
         }
-        List<FwqCheckOther> checkOtherList = qzdCheckOtherDao.getAllCheckOther(fwqCheckOther == null ? new FwqCheckOther() : fwqCheckOther);
+        List<FwqCheckOther> checkOtherList = fwqCheckOtherDao.getAllCheckOther(fwqCheckOther == null ? new FwqCheckOther() : fwqCheckOther);
         Map<Long, Organ> deptMap = commonService.getDeptMap();
         Map<Long, Item> itemMap = commonService.getItemMap();
         Map<String, Constant> codeMap = commonService.getCodeMap();
@@ -99,7 +99,7 @@ public class CheckOtherServiceImpl implements CheckOtherService_F {
      */
     private Object getAllCheckOther(FwqCheckOther fwqCheckOther) {
 
-        List<FwqCheckOther> checkOtherList = qzdCheckOtherDao.getAllCheckOther(fwqCheckOther == null ? new FwqCheckOther() : fwqCheckOther);
+        List<FwqCheckOther> checkOtherList = fwqCheckOtherDao.getAllCheckOther(fwqCheckOther == null ? new FwqCheckOther() : fwqCheckOther);
         Map<Long, Organ> deptMap = commonService.getDeptMap();
         Map<Long, Item> itemMap = commonService.getItemMap();
         Map<String, Constant> codeMap = commonService.getCodeMap();
@@ -134,22 +134,22 @@ public class CheckOtherServiceImpl implements CheckOtherService_F {
      */
     @Override
     public void addCheckOther(FwqCheckOther fwqOtherCheck) {
-        qzdCheckOtherDao.addCheckOther(fwqOtherCheck);
+        fwqCheckOtherDao.addCheckOther(fwqOtherCheck);
     }
 
     @Override
     public void deleteCheckOther(Long id) {
-        qzdCheckOtherDao.deleteCheckOther(id);
+        fwqCheckOtherDao.deleteCheckOther(id);
     }
 
     @Override
     public void updateCheckOther(FwqCheckOther fwqCheckOther) {
-        qzdCheckOtherDao.updateCheckOther(fwqCheckOther);
+        fwqCheckOtherDao.updateCheckOther(fwqCheckOther);
     }
 
     @Override
     public FwqCheckOther selectCheckById(Long id) {
-        FwqCheckOther fwqCheckOther = qzdCheckOtherDao.selectCheckById(id);
+        FwqCheckOther fwqCheckOther = fwqCheckOtherDao.selectCheckById(id);
         Map<Long, Item> itemMap = commonService.getItemMap();
         fwqCheckOther.setCheck_item_name(itemMap.get(fwqCheckOther.getCheck_item_id()).getName());
         return fwqCheckOther;
@@ -168,7 +168,7 @@ public class CheckOtherServiceImpl implements CheckOtherService_F {
         List<FwqCheckOtherStatistics> fwqCheckOtherStatisticses = new ArrayList<>();
 
         fwqCheckOther.setCheck_time_name(fwqCheckOther.getCheck_period());
-        List<FwqCheckOther> checkOtherList = qzdCheckOtherDao.getAllCheckOther(fwqCheckOther);
+        List<FwqCheckOther> checkOtherList = fwqCheckOtherDao.getAllCheckOther(fwqCheckOther);
         Map<Long, Organ> deptMap = commonService.getDeptMap();
         Map<Long, Item> itemMap = commonService.getItemMap();
         Map<String, Constant> codeMap = commonService.getCodeMap();
@@ -195,18 +195,24 @@ public class CheckOtherServiceImpl implements CheckOtherService_F {
         }
 
         // 获得所有服务区数据
-        List<FeeStation> saList = commonService.getAllDeptByLayer("SA");
+        List<FeeStation> saList = commonService.getAllDeptByLayer("WG");
         // 获得所有道管中心数据
         List<FeeStation> rmList = commonService.getAllDeptByLayer("RM");
 
         int checkType = fwqCheckOther.getCheck_type();
-        if (checkType == 8 || checkType == 9) {
-            Long id = 26L;
-            if (checkType == 8) {
-                id = 26L;
+        if (checkType == 11 || checkType == 12 || checkType == 13 || checkType == 14) {
+            Long id = 25L;
+            if (checkType == 11) {
+                id = 29L;
             }
-            if (checkType == 9) {
-                id = 27L;
+            if (checkType == 12) {
+                id = 30L;
+            }
+            if (checkType == 13) {
+                id = 31L;
+            }
+            if (checkType == 14) {
+                id = 32L;
             }
             //获取考核办法对应的考核项
             List<String> itemName = commonService.getCheckItemName(id);