Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

VisualInspection/css/main.css

@@ -26,12 +26,15 @@ footer p {
     /* border-bottom: 1px; */
     padding: 4px 15px;
 }
-#main_content_title{
+
+#main_content_title {
     border-top: 3px solid #3c8dbc;
 }
+
 .form-group {
     margin-bottom: 5px;
 }
+
 .navbar-header {
     /* box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); */
 }
@@ -66,181 +69,269 @@ footer p {
     overflow: auto;
 }
 
+
 /* #main_panel {
-     overflow: auto; 
+     overflow: auto;
 } */
 
 #main_panel_body {
     overflow: auto;
     background: #ecf0f5;
 }
-a:hover{
+
+a:hover {
     text-decoration: none;
 }
+
 a:focus {
     text-decoration: none;
 }
-#breadcrumb_menu a{
+
+#breadcrumb_menu a {
     font-weight: bold;
-    color:#03b8cf;
+    color: #03b8cf;
 }
-#breadcrumb_menu a:focus{
+
+#breadcrumb_menu a:focus {
     text-decoration: none;
 }
-.btn-info1{
+
+.btn-info1 {
     padding: 5px 5px;
-    color:#03b8cf;
+    color: #03b8cf;
     background-color: #fff;
     border-radius: 10px;
     border-color: #03b8cf;
     text-shadow: none;
 }
+
 .btn-info1:hover {
-    color:#fff;
+    color: #fff;
     background-color: #03b8cf;
     border-color: #03b8cf;
 }
+
 .btn-info1:focus {
-    color:#fff;
+    color: #fff;
     background-color: #03b8cf;
 }
-.btn-info1:visited{
+
+.btn-info1:visited {
     padding: 5px 5px;
-    color:#03b8cf;
+    color: #03b8cf;
     background-color: #fff;
     border-radius: 10px;
     border-color: #03b8cf;
     text-shadow: none;
 }
 
-.btn-info2{
-    color:#fff;
+.btn-info2 {
+    color: #fff;
     background-color: #03b8cf;
     border-radius: 4px;
     border-color: #03b8cf;
     text-shadow: none;
 }
+
 .btn-info2:hover {
-    color:#03b8cf;
+    color: #03b8cf;
     background-color: #fff;
     border-color: #03b8cf;
 }
+
 .btn-info2:focus {
-    color:#03b8cf;
+    color: #03b8cf;
     background-color: #fff;
 }
-.btn-info2:active{
-    color:#fff;
+
+.btn-info2:active {
+    color: #fff;
     background-color: #03b8cf;
     border-radius: 4px;
     border-color: #03b8cf;
 }
-.btn-info3{
-    color:#fff;
+
+.btn-info3 {
+    color: #fff;
     background-color: #38b03f;
     border-radius: 4px;
     border-color: #38b03f;
     text-shadow: none;
 }
+
 .btn-info3:hover {
-    color:#38b03f;
+    color: #38b03f;
     background-color: #fff;
     border-color: #38b03f;
 }
+
 .btn-info3:focus {
-    color:#38b03f;
+    color: #38b03f;
     background-color: #fff;
 }
-.btn-info4{
-    color:#fff;
+
+.btn-info4 {
+    color: #fff;
     background-color: #B71C1C;
     border-radius: 4px;
     border-color: #B71C1C;
     text-shadow: none;
 }
+
 .btn-info4:hover {
-    color:#B71C1C;
+    color: #B71C1C;
     background-color: #fff;
     border-color: #B71C1C;
 }
+
 .btn-info4:focus {
-    color:#B71C1C;
+    color: #B71C1C;
+    background-color: #fff;
+}
+
+.btn-info5 {
+    color: #fff;
+    background-color: #ea644a;
+    border-radius: 4px;
+    border-color: #ea644a;
+    text-shadow: none;
+}
+
+.btn-info5:hover {
+    color: #ea644a;
+    background-color: #fff;
+    border-color: #ea644a;
+}
+
+.btn-info5:focus {
+    color: #ea644a;
     background-color: #fff;
 }
 
-.btn-table{
-    color:#fff;
+.btn-info5:active {
+    color: #fff;
+    background-color: #ea644a;
+    border-radius: 4px;
+    border-color: #ea644a;
+}
+
+.btn-info6 {
+    color: #fff;
+    background-color: #ed980f;
+    border-radius: 4px;
+    border-color: #ed980f;
+    text-shadow: none;
+}
+
+.btn-info6:hover {
+    color: #ed980f;
+    background-color: #fff;
+    border-color: #ed980f;
+}
+
+.btn-info6:focus {
+    color: #ed980f;
+    background-color: #fff;
+}
+
+.btn-info6:active {
+    color: #fff;
+    background-color: #ed980f;
+    border-radius: 4px;
+    border-color: #ed980f;
+}
+
+.btn-table {
+    color: #fff;
     background-color: #2196F3;
     border-radius: 4px;
     border-color: #2196F3;
     text-shadow: none;
     padding: 2px 4px 2px 6px;
 }
+
 .btn-table:hover {
-    color:#2196F3;
+    color: #2196F3;
     background-color: #fff;
     border-color: #2196F3;
 }
+
 .btn-table:focus {
-    color:#2196F3;
+    color: #2196F3;
     background-color: #fff;
 }
 
+
 /* .statistic-panel{
     margin: -15px -15px -30px -15px;
     background-color: #ecf0f5;
 } */
-.datatable{
+
+.datatable {
     background-color: #fff;
     /* padding: 5px; */
 }
+
 #kkpager span.disabled {
     border: 0px;
 }
+
 #kkpager span.curr {
     border: 0px;
 }
-#kkpager a{
+
+#kkpager a {
     border: 0px;
 }
-.container-fluid  .form-control {
+
+.container-fluid .form-control {
     border-color: #d2d6de;
     /* border: none; */
-    box-shadow:none;
+    box-shadow: none;
 }
+
 .table>thead>tr>th {
     vertical-align: bottom;
     background-color: #61707D;
     border-bottom: 0px solid #ddd;
-    color:#fff;
+    color: #fff;
 }
-.table-thead{
+
+.table-thead {
     background-color: #d2d6de;
     border-color: #C7C6C5;
     /* border-bottom: 0px solid #ddd; */
 }
-.table-head  thead tr th{
+
+.table-head thead tr th {
     background-color: #d2d6de;
     border-color: #C7C6C5;
 }
-.calendar-views{
+
+.calendar-views {
     background-color: #fff;
 }
+
 .img-thumbnail {
     padding: 0px;
     border: none;
 }
-.nav-secondary>li.active>a, .nav-secondary>li.active>a:focus, .nav-secondary>li.active>a:hover {
+
+.nav-secondary>li.active>a,
+.nav-secondary>li.active>a:focus,
+.nav-secondary>li.active>a:hover {
     color: #3280fc;
     border-top-color: #3280fc;
     border-top: 2px solid #3280fc;
     border-bottom: none;
     font-weight: bold;
 }
+
 .nav-secondary>li>a {
     /* border-top: 2px solid #e5e5e5; */
     border-bottom: none;
 }
-.panel{
+
+.panel {
     border: none;
 }

VisualInspection/fwq/js/task/add.js

@@ -1,3 +1,7 @@
+var selectedData = { cols: [], array: [] };
+var checkusersselect = null;
+var checkuserlist = null;
+var tabledatagride = null;
 $(document).ready(function() {
     $.jeDate("#month_date", {
         isinitVal: true,
@@ -7,6 +11,375 @@ $(document).ready(function() {
     if (roleContains("SERVICEAREA")) {
         checked_dept = getCurrentUser().organid;
     }
-    setSASelect("#fwq", checked_dept);
+    setSASelecttemp("#fwq", checked_dept);
 
-});
+    //默认值 $("#fwq").val()
+    var dd = 89;
+    if ($("#fwq").val() != "") {
+        dd = $("#fwq").val();
+    }
+    inittAreaable($("#month_date").val(), dd);
+
+    initselecttable();
+
+    laydate.render({
+        elem: '#starttime',
+        type: 'time'
+    });
+    laydate.render({
+        elem: '#endtime',
+        type: 'time'
+    });
+
+
+
+
+});
+
+var arealist = null;
+var stimemonth = null;
+
+function initselecttable() {
+    selectedData = { cols: [], array: [], cache: false };
+    selectedData.cols.push({ width: 0.3, name: "time", label: '时间', style: { 'text-align': 'center', 'line-height': '34px' } });
+    selectedData.cols.push({ width: 0.2, name: "dept_name", label: '部门', style: { 'text-align': 'center', 'line-height': '34px' } });
+    selectedData.cols.push({ width: 0.2, name: "area_name", label: '区域', style: { 'text-align': 'center', 'line-height': '34px' } });
+    selectedData.cols.push({ width: 0.3, name: "option", label: '操作', html: true, style: { 'text-align': 'center', 'line-height': '34px' } });
+    reloadtable();
+
+}
+
+function reloadtable() {
+
+    $('#selected_table').datagrid({
+        dataSource: selectedData,
+        states: { fixedTopUntil: 0 },
+        rowDefaultHeight: 50,
+        height: 200,
+    });
+
+}
+var layindex = null;
+var taskMap = new HashMap();
+
+function inittAreaable(time, dept) {
+
+    layindex = layer.load(0, { shade: false });
+    var t = time.replace("/", "-") + "";
+    var endtime = moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss");
+    var starttime = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+
+
+    var param1 = { "start_time": starttime.format("YYYY-MM-DD HH:mm:ss"), "end_time": endtime.format("YYYY-MM-DD HH:mm:ss"), "checked_dept": dept }
+    post_common_service("/f/task/getall/0/0", param1, function(taskdata) {
+
+        taskMap = new HashMap();
+        taskdata.forEach(t => {
+            var key = t.area_id + "_" + moment(t.start_time).format("YYYY-MM-DD");
+            if (taskMap.get(key) != null) {
+                var list = taskMap.get(key);
+                list.push(t);
+                taskMap.set(key, list);
+            } else {
+                var list = [];
+                list.push(t);
+                taskMap.set(key, list);
+            }
+
+        });
+
+
+        var param = { "dept_id": dept };
+        post_common_service('/f/area/getall', param, function(redata) {
+
+            layer.close(layer.index);
+            var data = redata.areas;
+            checkuserlist = redata.checkusers;
+
+            var datac = { cols: [], array: [] };
+
+            var days = endtime.diff(starttime, 'days');
+
+            datac.cols.push({ width: 120, name: 'type', label: "", });
+
+            for (var i = 1; i <= days; i++) {
+                var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+                var currentday = temp.add(i, "day");
+                var day = currentday.date();
+                datac.cols.push({ width: 80, name: "day_" + i, label: currentday.format("MM-DD"), html: true, className: "table_content" });
+            }
+            arealist = data;
+            stimemonth = time;
+
+            for (var index in data) {
+                var area = data[index];
+                var data_table = {};
+                data_table.type = area.name;
+                for (var i = 1; i <= days; i++) {
+                    //内容
+                    var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+                    var currentday = temp.add(i, "day");
+                    var key = area.id + "_" + currentday.format("YYYY-MM-DD");
+
+                    var temphtml = "";
+
+                    if (taskMap.get(key) != null) {
+                        //存在稽查记录
+                        var list = taskMap.get(key);
+                        var hasc = 0;
+                        var invc = 0;
+                        list.forEach(t => {
+                            if (t.check_status == 4 || t.check_status == 16 || t.check_status == 6) {
+                                //完成稽查
+                                hasc++;
+                            }
+                            if (t.check_status == 22) {
+                                //存在无效任务
+                                invc++;
+                            }
+                        });
+                        //无效
+                        if (invc == list.length) {
+                            temphtml = '<div class="btn-group btn_c" data-toggle="buttons" id="div_' + area.id + '_' + i + '" >' +
+                                '<label class="btn btn-info6" >' +
+                                '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + area.id + '_' + i + '"> 无效' +
+                                '</label>';
+                        } else
+                        //已完成
+                        if (hasc + invc == list.length) {
+                            temphtml = '<div class="btn-group btn_c" data-toggle="buttons"  id="div_' + area.id + '_' + i + '">' +
+                                '<label class="btn btn-info5 " >' +
+                                '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + area.id + '_' + i + '"> 已稽查' +
+                                '</label>';
+                        } else {
+                            //进行中
+                            temphtml = '<div class="btn-group btn_c" data-toggle="buttons" id="div_' + area.id + '_' + i + '" >' +
+                                '<label class="btn btn-info3" >' +
+                                '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + area.id + '_' + i + '"> 稽查中' +
+                                '</label>';
+                        }
+
+
+                    } else {
+                        //不存在稽查
+                        temphtml = '<div class="btn-group btn_c" data-toggle="buttons" id="div_' + area.id + '_' + i + '" >' +
+                            '<label class="btn btn-info2" >' +
+                            '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + area.id + '_' + i + '"> 待稽查' +
+                            '</label>';
+                    }
+
+                    data_table["day_" + i] = temphtml;
+                }
+                datac.array.push(data_table);
+            }
+
+            if (tabledatagride != null) {
+                tabledatagride.dataSource.data = null;
+                tabledatagride.setDataSource(datac);
+                tabledatagride.setPager(1, datac.array.length, datac.array.length);
+                tabledatagride.render();
+            } else {
+                $('#table_s').datagrid({
+                    dataSource: datac,
+                    states: { fixedLeftUntil: 1, fixedTopUntil: 0 },
+                    showRowIndex: false,
+
+                    onRender: function() {
+
+
+
+                        $(".btn_c").mouseover(function() {
+                            var tempids = this.id.split("_");
+                            var t = stimemonth.replace("/", "-") + "";
+                            var starttime = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+                            var ctime = starttime.add(tempids[2], "day");
+                            var key = tempids[1] + "_" + ctime.format("YYYY-MM-DD");
+                            if (taskMap.get(key) != null) {
+                                var temphtml = "";
+                                var list = taskMap.get(key);
+
+                                list.forEach(t => {
+                                    var startus = "";
+                                    if (t.check_status == 4 || t.check_status == 16 || t.check_status == 6) {
+                                        startus = "已完成";
+                                    } else
+                                    if (t.check_status == 22) {
+                                        startus = "无效";
+                                    } else {
+                                        startus = "进行中";
+                                    }
+                                    temphtml += '<tr><td>' + moment(t.start_time).format("HH:mm:ss") + '</td><td>' + moment(t.end_time).format("HH:mm:ss") + '</td><td>' + startus + '</td></tr>';
+                                });
+
+                                var thtml = '<table border=1 style="border:solid 1px;width:180px;"><tr><th>开始时间</th><th>结束时间</th><th>状态</th></tr>' + temphtml + '</table>';
+                                layer.tips(thtml, "#" + this.id, {
+                                    tips: [1, '#8e8e8e'],
+                                    time: 0,
+                                    width: '240px'
+                                });
+                            }
+                        });
+                        $(".btn_c").mouseout(function() {
+                            layer.close(layer.index);
+                        });
+
+
+                    },
+                    configs: {
+                        C1: { className: "datagrid-cell-index", style: { 'text-align': 'center', } },
+                        R0: { style: { 'text-align': 'center', 'line-height': '36px' } }
+                    }
+                });
+                tabledatagride = $('#table_s').data('zui.datagrid');
+            }
+
+
+
+
+            for (var index in checkuserlist) {
+                var p = checkuserlist[index];
+                p.title = p.truename;
+            }
+
+
+            if (checkusersselect != null) {
+                reset();
+            } else {
+                checkusersselect = $('#check_users').comboTree({
+                    source: checkuserlist,
+                    isMultiple: true
+                });
+            }
+
+        });
+
+    });
+}
+
+function reset() {
+    initselecttable();
+    var myDataGrid = $('#selected_table').data('zui.datagrid');
+    myDataGrid.dataSource.data = null;
+    myDataGrid.setDataSource(selectedData);
+    myDataGrid.setPager(1, selectedData.array.length, selectedData.array.length);
+    myDataGrid.render();
+
+    if (checkusersselect != null) {
+        $("#check_users").val("");
+        checkusersselect.unbind();
+        checkusersselect.closeDropDownMenu();
+        checkusersselect.bindings();
+        $(".ComboTreeItemChlid").find("input").prop('checked', false);
+
+
+    }
+    $("#starttime").val("");
+    $("#endtime").val("");
+
+
+
+}
+
+
+function selectedTask(obj) {
+    changeListItem(obj.id);
+
+}
+
+function removeListItem(obj) {
+    var ids = obj.id.split("delete_");
+
+    $("#" + ids[1]).parent().removeClass("active");
+    $("#" + ids[1]).prop("checked", false);
+    changeListItem(ids[1]);
+
+}
+
+function changeListItem(id) {
+    var tempids = id.split("_");
+    var t = stimemonth.replace("/", "-") + "";
+    var starttime = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
+    var ctime = starttime.add(tempids[1], "day");
+    var carea = null;
+    for (var i in arealist) {
+        var a = arealist[i];
+        if (a.id == tempids[0]) {
+            carea = a;
+        }
+    }
+
+
+    if ($("#" + id).prop('checked')) {
+        addlisttable(carea, ctime, id);
+    } else {
+        removelisttable(carea, ctime);
+    }
+}
+
+
+function addlisttable(area, time, id) {
+    var feeList = $.zui.store.get("cache_sa_station_list");
+    var dept_info = null;
+    for (var index in feeList) {
+        var dept = feeList[index];
+        if (area.dept_id == dept.deptid) {
+            dept_info = dept;
+        }
+    }
+    id = trim(id);
+    var btn = '<button class="btn btn-primary" type="button" onclick="removeListItem(this)" id="delete_' + id + '">删除</button>';
+    selectedData.array.push({ "time": time.format("YYYY-MM-DD"), "dept_name": dept_info.name, "area_name": area.name, "option": btn, areaInfo: area, deptInfo: dept_info });
+
+    var myDataGrid = $('#selected_table').data('zui.datagrid');
+    myDataGrid.dataSource.data = null;
+    myDataGrid.setDataSource(selectedData);
+    myDataGrid.setPager(1, selectedData.array.length, selectedData.array.length);
+    myDataGrid.render();
+
+    // $('#selected_table').data('zui.datagrid').setDataSource(selectedData);
+    // $('#selected_table').data('zui.datagrid').renderData();
+}
+
+function removelisttable(area, time) {
+    for (var index in selectedData.array) {
+        var o = selectedData.array[index];
+        if (o != null && o.areaInfo.id == area.id && time.format("YYYY-MM-DD") == o.time) {
+            selectedData.array.splice(index, 1);
+        }
+    }
+    var myDataGrid = $('#selected_table').data('zui.datagrid');
+    myDataGrid.dataSource.data = null;
+    myDataGrid.setDataSource(selectedData);
+    myDataGrid.setPager(1, selectedData.array.length, selectedData.array.length);
+
+    myDataGrid.render();
+    //reloadtable();
+}
+
+
+
+function search() {
+    inittAreaable($("#month_date").val(), $("#fwq").val());
+
+}
+
+
+function addTask() {
+    //获取列表
+    var tasklist = selectedData.array;
+    var start_time = $("#starttime").val();
+    var end_time = $("#endtime").val();
+    var check_user_list = checkusersselect.getSelectedItemsId();
+    tasklist.forEach(t => {
+        t.start_time = t.time + " " + start_time;
+        t.end_time = t.time + " " + end_time;
+    });
+
+    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());
+    });
+
+
+}

VisualInspection/fwq/view/task/add.html

@@ -1,5 +1,29 @@
+<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>
+
 <link rel="stylesheet" type="text/css" href="/css/other_check/other_check.css">
+
+
+
+<style>
+    .table_content {
+        padding: 0;
+    }
+    
+    .btn_c,
+    .btn_c label {
+        width: 100% !important;
+        height: 100% !important;
+        border-radius: 0;
+    }
+    
+    table td,
+    table th {
+        text-align: center;
+    }
+</style>
+
 <div class="container-fluid ">
     <div class="row">
 
@@ -16,48 +40,59 @@
 
         <div class="col-xs-1">
             <div class="input-group">
-                <button class="btn btn-primary " type="button" id="conditional_query">查询</button>
+                <button class="btn btn-primary " type="button" id="conditional_query" onclick="search()">查询</button>
             </div>
         </div>
     </div>
 
-    <div class="row">
-        <table id="table">
-
-
-        </table>
+    <div class="row" style="height: 400px;">
+        <div class="datagrid" id="table_s" data-checkable="false" data-sortable="false"></div>
     </div>
     <div class="row">
-        <div class="col-xs-4">
+        <div class="col-xs-6" style="">
             <div class="row">
                 <span style="float: left;
                 padding-top: 5px;">已选任务：</span>
             </div>
-
-            <table id="selected_table">
-
-
-            </table>
+            <div class="row" style="height: 200px;">
+                <div id="selected_table" class="datagrid" data-checkable="false" data-sortable="false"></div>
+            </div>
         </div>
-        <div class="col-xs-4">
+        <div class="col-xs-4" style="padding: 0 15px 0 15px">
             <div class="row">
                 <span style="float: left;
                 padding-top: 5px;">稽查时间段：</span>
             </div>
 
+            <div class="row" style="padding-top: 10px">
+                <div class="col-xs-5">
+                    <input type="text" style="width:100%;" id="starttime">
+                </div>
+                <div class="col-xs-2" style="text-align: center"> ~ </div>
 
-            <div class="row">
-                <span style="float: left;
+                <div class="col-xs-5"><input type="text" style="width:100%;" id="endtime"></div>
+
+            </div>
+
+
+            <div class="row" style="margin-top: 100px">
+                <div class="row" style="margin: 0">
+                    <span style="float: left;
                 padding-top: 5px;">分配稽查任务：</span>
+                </div>
+                <div class="row" style="margin: 0;padding-top: 10px">
+                    <input type="text" style="width:100%;" id="check_users" class="form-control" placeholder="请选择稽查人员">
+
+                </div>
             </div>
 
         </div>
-        <div class="col-xs-4">
-            <div class="col-xs-1">
-                <div class="input-group">
-                    <button class="btn btn-primary " type="button" id="conditional_query">生成任务</button>
-                </div>
+        <div class="col-xs-2" style="margin-top: 190px;padding: 0;">
+
+            <div class="input-group" style="float: right ;">
+                <button class="btn btn-primary " style="width: 120px;" type="button" id="add_task_btn" onclick="addTask()">生成任务</button>
             </div>
+
         </div>
 
     </div>

VisualInspection/js/lib/laydate/theme/default/font/iconfont.svg

@@ -0,0 +1,45 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="laydate-icon" horiz-adv-x="1024" >
+  <font-face
+    font-family="laydate-icon"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
+d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
+t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
+t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
+    
+
+    
+    <glyph glyph-name="youyou" unicode="&#58882;" d="M283.648 721.918976 340.873216 780.926976 740.352 383.997952 340.876288-12.925952 283.648 46.077952 619.52 383.997952Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zuozuo" unicode="&#58883;" d="M740.352 721.918976 683.126784 780.926976 283.648 383.997952 683.123712-12.925952 740.352 46.077952 404.48 383.997952Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiayiye" unicode="&#58970;" d="M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753 0.269 0.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754 0.273 0.249-385.662 385.661zM451.365 384.103z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiayiye1" unicode="&#58971;" d="M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-0.261507-0.239614 375.259894-375.265975v0.003649m-378.312834 0L157.756743-29.285422c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-0.266372-0.239614 375.267191-375.265975-0.004865 0.003649m0 0z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>

VisualInspection/js/util/util.js

@@ -247,11 +247,13 @@ function setFeSelect(div, selectId) {
 }
 
 function setSASelect(div, selectId) {
+    hasall = true;
     var feeList = $.zui.store.get("cache_sa_station_list");
     if (feeList) {
         setSASelectValue(feeList, div, selectId);
     } else {
         get_common_service("/dept/getAllSA", null, function(data) {
+            $.zui.store.set("cache_sa_station_list", data);
             setSASelectValue(data, div, selectId);
         });
     }
@@ -266,6 +268,7 @@ function setSASelecttemp(div, selectId, hasall1) {
         setSASelectValue(feeList, div, selectId);
     } else {
         get_common_service("/dept/getAllSA", null, function(data) {
+            $.zui.store.set("cache_sa_station_list", data);
             setSASelectValue(data, div, selectId);
         });
     }
@@ -803,4 +806,9 @@ function isRealNum(val) {
     } else {
         return false;
     }
+}
+
+
+function trim(str) {
+    return str.replace(/\s|\xA0/g, "");
 }

VisualInspection/view/common/commonscriptlink.html

@@ -15,6 +15,7 @@
 <script src="/node_modules/blueimp-md5/js/md5.min.js"></script>
 <script src="/node_modules/hashmap/hashmap.js"></script>
 <script src="/js/lib/layer/layer.js"></script>
+<script src="/js/lib/laydate/laydate.js"></script>
 <script src="/node_modules/ztree/js/jquery.ztree.all.min.js"></script>
 <script src="/js/lib/treeSelect.js"></script>
 <script src="/js/lib/kkpager.js"></script>

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

@@ -0,0 +1,54 @@
+package com.xintong.visualinspection.controller.gettway;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.AreaInfo;
+import com.xintong.visualinspection.bean.FwqCheckTask;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.controller.BaseController;
+import com.xintong.visualinspection.dao.master.UserDao;
+import com.xintong.visualinspection.service.AreaInfoService_F;
+import com.xintong.visualinspection.service.TaskService_F;
+import com.xintong.visualinspection.service.UserService;
+import com.xintong.visualinspection.util.AuthorUtil;
+import com.xintong.visualinspection.util.Constants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.*;
+
+@RestController
+@RequestMapping("/f/area")
+public class AreaInfoController_F extends BaseController {
+
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private AreaInfoService_F areaInfoService_f;
+
+    @Autowired
+    private UserService userService;
+
+    @RequestMapping(value = "/getall")
+    public String getall(HttpServletRequest request,@RequestBody AreaInfo areaInfo){
+        Object ss = areaInfoService_f.getAllArea(areaInfo);
+        Map<String,Object> u = new HashMap<String,Object>();
+
+        User us = new User();
+        us.setOrganid(29);
+        List<Integer> pos = new ArrayList<>();
+        pos.add(2);
+        us.setPosition_ids(pos);
+        u.put("checkusers",userService.getUsers(us));
+        u.put("areas",ss);
+        return super.returnSuccessResult(u);
+    }
+
+
+
+}

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

@@ -9,8 +9,10 @@ import com.xintong.visualinspection.bean.FwqCheckTask;
 import com.xintong.visualinspection.bean.Task;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.controller.BaseController;
+import com.xintong.visualinspection.pojo.fwq.TaskData_F;
 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;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.Size;
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -58,4 +61,23 @@ public class TaskController_F extends BaseController {
         FwqCheckTask t = taskService_f.getTask(fwqCheckTask);
         return super.returnSuccessResult("修改成功",t);
     }
+
+    @RequestMapping(value = "/add")
+    public String addtask(HttpServletRequest request,@Valid @RequestBody TaskData_F taskData_f){
+        if(taskData_f==null|| taskData_f.getCheckAreaData()==null || taskData_f.getUserids()==null  || taskData_f.getUserids().size()<1 || taskData_f.getCheckAreaData().size()<1){
+            throw new BusinessException(20002);
+        }
+        List<User> us =new ArrayList<>();
+        for (String u:taskData_f.getUserids()
+             ) {
+            User user = CacheUtil.userMap.get(Long.valueOf(u));
+            us.add(user);
+        }
+        taskData_f.setUsers(us);
+
+        User user = getCurrentUser(request);
+        taskData_f.setUser_id(user.getId());
+        taskService_f.addTask(taskData_f);
+        return super.returnSuccessResult("添加成功",null);
+    }
 }

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

@@ -1,13 +1,10 @@
 package com.xintong.visualinspection.service.impl;
 
-import com.xintong.visualinspection.bean.Constant;
-import com.xintong.visualinspection.bean.FeeStation;
-import com.xintong.visualinspection.bean.Item;
-import com.xintong.visualinspection.bean.Job;
-import com.xintong.visualinspection.bean.Organ;
-import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.bean.*;
+import com.xintong.visualinspection.dao.master.CheckTaskPeriodDao;
 import com.xintong.visualinspection.service.CommonService;
 import com.xintong.visualinspection.util.CacheUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -25,6 +22,9 @@ import java.util.Map;
         registry = "${dubbo.registry.id}"
 )
 public class CommonServiceImpl implements CommonService {
+    @Autowired
+    private CheckTaskPeriodDao checkTaskPeriodDao;
+
     @Override
     public Map<String, String> getCommonDataMap() {
         return CacheUtil.commonDataMap;
@@ -70,4 +70,20 @@ public class CommonServiceImpl implements CommonService {
         return CacheUtil.allDeptMap.get(s);
     }
 
+    @Override
+    public CheckTaskPeriod getCheckTaskPeriod(Long starttime, Long endtime) {
+        List<CheckTaskPeriod> checkTaskPeriods = checkTaskPeriodDao.select(new CheckTaskPeriod());
+
+        CheckTaskPeriod period = null;
+        // 计算上个周期时间 周期时间：00:00:00 ----- 00:00:00 参数：23:00:00
+        for (CheckTaskPeriod p : checkTaskPeriods) {
+            if (starttime >= p.getStarttime().getTime() && endtime <= p.getEndtime().getTime()) {
+                period = p;
+                break;
+            }
+        }
+       return period;
+    }
+
+
 }

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/dao/FwqAreaDao.java

@@ -1,12 +1,17 @@
 package com.xintong.visualinspection.visuallnspection_fjq.dao;
 
+import com.xintong.visualinspection.bean.AreaInfo;
+import com.xintong.visualinspection.bean.FwqCheckTask;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 文件名：FwqAreaDao
  * 版本信息：日期：2018/5/7 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
  */
 @Mapper
-public class FwqAreaDao {
+public interface FwqAreaDao {
+    public List<AreaInfo> getall(AreaInfo areaInfo);
 
 }

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/mapper/master/AreaMapper.xml

@@ -0,0 +1,17 @@
+<?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_fjq.dao.FwqAreaDao">
+
+
+    <select id="getall" parameterType="com.xintong.visualinspection.bean.AreaInfo" resultType="com.xintong.visualinspection.bean.AreaInfo">
+        select * from area_info where 1=1
+        <if test="id != null">AND id = #{id}</if>
+        <if test="dept_id != null">AND dept_id = #{dept_id}</if>
+        <if test="name != null ">AND name = #{name}  </if>
+        <if test="type != null">AND type = #{type}</if>
+    </select>
+
+
+</mapper>
+
+

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/AreaInfoServiceImpl.java

@@ -0,0 +1,28 @@
+package com.xintong.visualinspection.visuallnspection_fjq.service.impl;
+
+import com.xintong.visualinspection.bean.AreaInfo;
+import com.xintong.visualinspection.service.AreaInfoService_F;
+import com.xintong.visualinspection.visuallnspection_fjq.dao.FwqAreaDao;
+import com.xintong.visualinspection.visuallnspection_fjq.dao.FwqTaskDao;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 文件名：AreaInfoServiceImpl
+ * 版本信息：日期：2018/5/8 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+@com.alibaba.dubbo.config.annotation.Service(
+        version = "1.0.0",
+        application = "${dubbo.application.id}",
+        protocol = "${dubbo.protocol.id}",
+        registry = "${dubbo.registry.id}"
+)
+public class AreaInfoServiceImpl implements AreaInfoService_F {
+
+    @Autowired
+    private FwqAreaDao fwqAreaDao;
+
+    @Override
+    public Object getAllArea(AreaInfo areaInfo) {
+        return fwqAreaDao.getall(areaInfo);
+    }
+}

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/CheckOtherServiceImpl.java

@@ -16,6 +16,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -263,4 +265,14 @@ public class CheckOtherServiceImpl implements CheckOtherService_F {
         return datas;
     }
 
+    @Override
+    public void getExcel(FwqCheckOther fwqOtherCheck, HttpServletRequest req, HttpServletResponse resp) {
+
+    }
+
+    @Override
+    public void getOtherCheckExcel(FwqCheckOther fwqOtherCheck, HttpServletRequest req, HttpServletResponse resp) {
+
+    }
+
 }

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/TaskServiceImpl.java

@@ -10,11 +10,15 @@ package com.xintong.visualinspection.visuallnspection_fjq.service.impl;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.xintong.visualinspection.bean.CheckTaskPeriod;
 import com.xintong.visualinspection.bean.FwqCheckTask;
 import com.xintong.visualinspection.bean.Organ;
 import com.xintong.visualinspection.bean.User;
+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.TaskService_F;
+import com.xintong.visualinspection.util.Constants;
 import com.xintong.visualinspection.visuallnspection_fjq.dao.FwqTaskDao;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -76,5 +80,50 @@ public class TaskServiceImpl implements TaskService_F {
         return fwqTaskDao.getone(fwqCheckTask);
     }
 
+    @Override
+    public void addTask(TaskData_F taskData_f) {
+
+        try {
+            //获取列表
+            List<CheckAreaData> checkAreaData = taskData_f.getCheckAreaData();
+            List<User> users = taskData_f.getUsers();
+
+            CheckTaskPeriod p = commonService.getCheckTaskPeriod(checkAreaData.get(0).getStart_time().getTime(), checkAreaData.get(0).getEnd_time().getTime());
+
+            List<FwqCheckTask> tasks = new ArrayList<>();
+            int count = checkAreaData.size() / users.size();
+            int u_index = 0;
+            int index = 0;
+            for (CheckAreaData s : checkAreaData
+                    ) {
+                if (index++ == count) {
+                    u_index++;
+                    if (u_index == users.size()) {
+                        u_index--;
+                    }
+                }
+                FwqCheckTask t = new FwqCheckTask();
+                t.setName(s.getDeptInfo().getName() + s.getAreaInfo().getName());
+                t.setCheck_status(Constants.STATUS_ASSIGN);
+                t.setArea_id(s.getAreaInfo().getId());
+                t.setStart_time(s.getStart_time());
+                t.setEnd_time(s.getEnd_time());
+                t.setCheckman((long) users.get(u_index).getId());
+                t.setCheckman_name(users.get(u_index).getTruename());
+                t.setChecked_dept((long) s.getAreaInfo().getDept_id());
+                t.setUpdate_user((long) taskData_f.getUser_id());
+                //服务区视频稽查考核办法 id
+                t.setRule_id(10);
+                if (p != null && p.getEndtime().getTime() > s.getStart_time().getTime()) {
+                    t.setPeriod_id(p.getId());
+                }
+                fwqTaskDao.addtask(t);
+
+            }
+        }catch (Exception e){
+            System.out.println(e.getStackTrace());
+        }
+    }
+
 
 }

Visuallnspection_fjq/visuallnspectioninteface/.idea/misc.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">

Visuallnspection_fjq/visuallnspectioninteface/install.sh

@@ -1,4 +1,4 @@
 java -version;
 mvn clean deploy;
-#mvn install:install-file -Dfile="/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/target/visuallnspectioninteface-1.0-SNAPSHOT.jar" -DgroupId=com.xintong.visuallnspection.inteface -DartifactId=visuallnspectioninteface -Dversion=1.0 -Dpackaging=jar;
+#mvn clean package && mvn install:install-file -Dfile="/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/target/visuallnspectioninteface-1.0-SNAPSHOT.jar" -DgroupId=com.xintong.visuallnspection.inteface -DartifactId=visuallnspectioninteface -Dversion=1.0 -Dpackaging=jar;
 

Visuallnspection_fjq/visuallnspectioninteface/installlocal.sh

@@ -0,0 +1,5 @@
+java -version;
+#mvn clean deploy;
+
+mvn clean package && mvn install:install-file -Dfile="/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/target/visuallnspectioninteface-1.0-SNAPSHOT.jar" -DgroupId=com.xintong.visuallnspection.inteface -DartifactId=visuallnspectioninteface -Dversion=1.0-SNAPSHOT -Dpackaging=jar;
+

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

@@ -2,12 +2,14 @@ package com.xintong.visualinspection.bean;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 文件名：AreaInfo
  * 版本信息：日期：2018/5/7 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
  */
 @Data
-public class AreaInfo {
+public class AreaInfo implements Serializable {
     private Integer id;
     private Integer dept_id;
     private String name;

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/CheckTaskPeriod.java → Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/CheckTaskPeriod.java

@@ -1,11 +1,12 @@
 package com.xintong.visualinspection.bean;
 
-import java.util.Date;
-
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 @Data
-public class CheckTaskPeriod {
+public class CheckTaskPeriod implements Serializable {
 	
 	private Integer id;
 	private String name;

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/CheckAreaData.java

@@ -0,0 +1,27 @@
+package com.xintong.visualinspection.pojo.fwq;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.xintong.visualinspection.bean.AreaInfo;
+import com.xintong.visualinspection.bean.FeeStation;
+import com.xintong.visualinspection.util.CustomJsonDateDeserializer;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 文件名：CheckAreaData
+ * 版本信息：日期：2018/5/9 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+@Data
+public class CheckAreaData implements Serializable {
+    private AreaInfo areaInfo;
+    private FeeStation deptInfo;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonDeserialize(using = CustomJsonDateDeserializer.class)
+    private Date start_time;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonDeserialize(using = CustomJsonDateDeserializer.class)
+    private Date end_time;
+}

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/pojo/fwq/TaskData_F.java

@@ -0,0 +1,19 @@
+package com.xintong.visualinspection.pojo.fwq;
+
+import com.xintong.visualinspection.bean.User;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 文件名：TaskData_F
+ * 版本信息：日期：2018/5/9 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+@Data
+public class TaskData_F implements Serializable {
+    private List<User> users;
+    private List<CheckAreaData> checkAreaData;
+    private Integer user_id;
+    private List<String> userids;
+}

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

@@ -0,0 +1,12 @@
+package com.xintong.visualinspection.service;
+
+import com.xintong.visualinspection.bean.AreaInfo;
+import com.xintong.visualinspection.bean.FwqCheckTask;
+
+/**
+ * 文件名：AreaInfoService_F
+ * 版本信息：日期：2018/5/8 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+public interface AreaInfoService_F {
+    public Object getAllArea(AreaInfo areaInfo);
+}

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

@@ -1,11 +1,6 @@
 package com.xintong.visualinspection.service;
 
-import com.xintong.visualinspection.bean.Constant;
-import com.xintong.visualinspection.bean.FeeStation;
-import com.xintong.visualinspection.bean.Item;
-import com.xintong.visualinspection.bean.Job;
-import com.xintong.visualinspection.bean.Organ;
-import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.bean.*;
 
 import java.util.List;
 import java.util.Map;
@@ -26,4 +21,8 @@ public interface CommonService {
     public List<String> getCheckItemName(Long ruleId);
     // 获得部门信息,比如SA,RM内容
     public List<FeeStation> getAllDeptByLayer(String key);
+
+
+    //获取周期信息
+    public CheckTaskPeriod getCheckTaskPeriod(Long startDate,Long endDate);
 }

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

@@ -1,6 +1,7 @@
 package com.xintong.visualinspection.service;
 
 import com.xintong.visualinspection.bean.FwqCheckTask;
+import com.xintong.visualinspection.pojo.fwq.TaskData_F;
 
 import java.util.List;
 
@@ -9,4 +10,6 @@ public interface TaskService_F {
     public void addTask(FwqCheckTask fwqCheckTask);
     public void updateStatus(FwqCheckTask fwqCheckTask);
     public FwqCheckTask getTask(FwqCheckTask fwqCheckTask);
+    public void addTask(TaskData_F taskData_f);
+
 }

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon May 07 23:56:49 CST 2018
+#Tue May 08 11:01:54 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

@@ -14,6 +14,7 @@ com/xintong/visualinspection/util/DateUtil.class
 com/xintong/visualinspection/util/CacheUtil.class
 com/xintong/visualinspection/bean/Item.class
 com/xintong/visualinspection/bean/Role.class
+com/xintong/visualinspection/service/AreaInfoService_F.class
 com/xintong/visualinspection/service/UserService.class
 com/xintong/visualinspection/service/ItemService.class
 com/xintong/visualinspection/bean/AreaInfo.class

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

@@ -1,26 +1,27 @@
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CacheUtil.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/WreckerGroup.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Role.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/Constants.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FeeStation.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/JobService.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CodeUtil.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CustomJsonDateDeserializer.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/User.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CommonService.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/DepartmentService.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Organ.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/AreaInfo.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Job.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/TaskService_F.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/AuthorUtil.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ConstantService.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckOther.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Constant.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/DateUtil.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Item.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckOtherService_F.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckOtherStatistics.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ItemService.java
-/Users/huangcheng/work/idea/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/UserService.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CodeUtil.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ConstantService.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/User.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CommonService.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/WreckerGroup.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/AuthorUtil.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Job.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Role.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/AreaInfoService_F.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CustomJsonDateDeserializer.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/Constants.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Organ.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Item.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/DepartmentService.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.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
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/UserService.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/TaskService_F.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckOtherStatistics.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/Constant.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FeeStation.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/JobService.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/CheckOtherService_F.java