二期task 内容

VisualInspection/fwq/js/task/check.js

@@ -0,0 +1,1109 @@
+function initCheck() {
+    addBreadMenu("/view/mytask/check.html", "视频稽查");
+    $('#ex1').slider({ tooltip: 'hide' });
+    $("#ex1").on("slideStop", function(slideEvt) {
+        setVideoProcess(slideEvt.value);
+    });
+
+    $("#ex1").on("change", function(sender) {
+        var width = $("#ex1").siblings(".slider").children(".slider-track").children(".slider-selection").width();
+        var total_width = $("#ex1").siblings(".slider").children(".slider-track").width();
+        var sp_width = $("#ex1_span").width();
+
+
+        var left = ((total_width - width) < (sp_width / 2.0)) ? (total_width - sp_width / 2.0 - 25) : (width - sp_width / 2.0) + 25
+        $("#ex1_span").css("left", ((left > 25 ? left : 25)) + "px")
+
+        if ($.checkTask) {
+            var time = moment($.checkTask.start_time);
+            var pos = $("#video_pos").val();
+            if ($("#full_video_pos").length > 0) {
+                pos = $("#full_video_pos").val();
+            }
+            var c_time = time.add(sender.value.newValue, "s");
+            if (/^(\+|-)?\d+($|\.\d+$)/.test(pos)) {
+                if (pos > 0) {
+                    c_time = time.add(Math.abs(pos), "s");
+                } else {
+                    c_time = time.subtract(Math.abs(pos), "s");
+                }
+            }
+
+
+            $("#ex1_span").html(c_time.format("YYYY-MM-DD HH:mm:ss"))
+        }
+    });
+
+
+
+    $("#tabcontent").css("height", ($("#video_content").height() - 80) + "px");
+    $("#score_datatable").css("height", ($("#video_content").height() - 120) + "px");
+    if (ISCLIENT) {
+        event = document.createEvent('MessageEvent');
+        var origin = window.location.protocol + '//' + window.location.host;
+        event.initMessageEvent('setvideoposition', true, true, getVideoPosition(null), origin, 1234, window, null);
+        document.dispatchEvent(event);
+    }
+
+
+
+    // 仅选择日期
+    $("#start-time").datetimepicker({
+        language: "zh-CN",
+        weekStart: 1,
+        todayBtn: 1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        minView: 2,
+        forceParse: 0,
+        format: "yyyy-mm-dd"
+    });
+    // 仅选择日期
+    $("#end-time").datetimepicker({
+        language: "zh-CN",
+        weekStart: 1,
+        todayBtn: 1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        minView: 2,
+        forceParse: 0,
+        format: "yyyy-mm-dd"
+    });
+    if ($.checkTask) {
+        getUserCheckCount();
+        initCheckAppealBtns();
+        // setFeSelect("#fsList", $.checkTask.checked_dept);
+        $("#taskName").html($.checkTask.name);
+        $("#ex1_span").html($.checkTask.start_time)
+        $("#full_ex1_span").html($.checkTask.start_time)
+
+        $("#lane").val($.checkTask.checked_location);
+        $("#check_time").html($.checkTask.check_period);
+        $("#monitor").html($.checkTask.monitor_user_name);
+        // setLaneSelect("#lane", $.checkTask.checked_location);
+        get_common_service('user/getUserById/' + $.checkTask.checked_person, null, function(data) {
+                changePersonContent(data);
+            })
+            //查询评分情况
+        queryCheckScores();
+        //查询录像播放列表
+        var videos = $.checkTask.video_id.split(',');
+        if (videos[0]) {
+            curVideo = videos[0];
+            queryVideoList();
+        } else {
+            callFunc("showvideoview", "false");
+            layer.msg('该处暂无视屏！', {
+                offset: 'r',
+                time: 2000, //20s后自动关闭
+            });
+            callFunc("stop", "");
+        }
+    }
+    $("select#video_list").change(function() {
+        playVideo($(this).val());
+    });
+
+
+}
+
+function setfastorslow(type, speed) {
+    if (type == 0) {
+        $("#fast_info").html("");
+        $("#slow_info").html("");
+        if ($("#full_fast_info")) {
+            $("#full_fast_info").html("");
+            $("#full_slow_info").html("");
+        }
+    }
+    if (type == 1) {
+        $("#fast_info").html(speed + "x");
+        $("#slow_info").html("");
+        if ($("#full_fast_info")) {
+            $("#full_fast_info").html(speed + "x");
+            $("#full_slow_info").html("");
+        }
+    }
+    if (type == 2) {
+        $("#slow_info").html(speed + "x");
+        $("#fast_info").html("");
+        if ($("#full_fast_info")) {
+            $("#full_fast_info").html("");
+            $("#full_slow_info").html(speed + "x");
+        }
+    }
+
+}
+
+function normalscreen() {
+    if (layer_full) {
+        layer.close(layer_full)
+        $("#video_pos").val($("#full_video_pos").val());
+    }
+
+}
+var layer_full = null;
+
+function fullscreen() {
+    var height = window.innerWidth * 0.8 * 1 / 2.0 + 110
+
+    var contenthtml = ' <div class="tab-content" id="full_tabcontent" style="height:400px;text-align: center;background:black;">' +
+        '                                    <p style="padding-top:180px;font-size:20px">加载中...</p>' +
+        '                                    <!--<i class="icon icon-spin icon-spinner  icon-5x" style="margin-top:100px"></i>-->' +
+        '                                </div>' +
+        '                                <div class="row" class="col-md-12" style="padding:5px 10px 25px 10px;text-align:center;margin:0px">' +
+        '                                    <input id="full_ex1" class="col-md-12" type="text" data-slider-min="0" data-slider-max="100" data-slider-step="1" data-slider-value="0"/>' +
+        '                                   <br/> <span id="full_ex1_span" style="position: absolute;left: 25px;">2017-06-12 23:00:00</span>' +
+        '                                    ' +
+        '                                </div>' +
+        '                                <div class="row" style="padding:0px 5px 0px 5px;text-align:center;margin:0px">' +
+        '                                    <select class="form-control" id="full_video_list" style="width:200px;float:left;display:none;"></select>' +
+        '                                      <div class="col-md-4 " style="padding-left:0">' +
+        '                                                                      <div class="input-group" style="padding-left:0">' +
+        '                                                                          <input type="text" id="full_video_pos" style="height:42px" class="form-control" placeholder="时间偏移值">' +
+        '                                                                         <span class="input-group-btn">' +
+        '                                                                              <button class="btn btn-default" onclick="setVideoPos()" style="height:42px" type="button">校正</button>' +
+        '                                                                          </span>' +
+        '                                                                      </div>' +
+        '                                                                     </div>' +
+        '                                    <div class="btn-group1" style="float:right;">' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'start\')"><i class="icon icon-play-circle icon-2x"></i></button>' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'stop\')"><i class="icon icon-pause icon-2x"></i></button>' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'fast\')"><i class="icon icon-forward icon-2x"></i><span id=\"full_fast_info\"></span></button>' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'slow\')"><span id=\"full_slow_info\"></span><i class="icon icon-backward icon-2x"></i></button>' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" style="width:51px;height:42px" id="full_video_btn_start" onclick="doAction(\'video_start\')"><img id="full_video_btn_start_img" style="width:30px" src="/images/video.png"></img></i></button>' +
+        '                                        <button type="button" class="btn btn-info1 hidden" style="width:41px;height:41px" id="full_video_btn_stop" onclick="doAction(\'video_stop\')"><i class="icon icon-stop icon-2x"></i></button>' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'screenshot\')"><i class="icon icon-camera icon-2x"></i></button>' +
+        '                                    </div>' +
+        '                                </div>';
+
+
+    layer_full = layer.open({
+        area: ['80%', height + "px"],
+        type: 1,
+        title: false,
+        anim: -1,
+        closeBtn: 0,
+        shadeClose: false,
+        content: "<div id='layer_content' style='padding-bottom:10px' >" + contenthtml + "</div>",
+        success: function(layero, index) {
+
+            // slider_current_value = 90;
+            $("#full_video_pos").val($("#video_pos").val());
+
+            $('#full_ex1').slider({ tooltip: 'hide' });
+            $("#full_ex1").on("slideStop", function(slideEvt) {
+                setVideoProcess(slideEvt.value);
+            });
+
+            $("#full_video_btn_start").mouseover(function() {
+                $("#full_video_btn_start_img").attr("src", "/images/movie.png");
+            });
+            $("#full_video_btn_start").mouseout(function() {
+                $("#full_video_btn_start_img").attr("src", "/images/video.png");
+            });
+
+            $("#full_ex1").on("change", function(sender) {
+                var width = $("#full_ex1").siblings(".slider").children(".slider-track").children(".slider-selection").width();
+                var total_width = $("#full_ex1").siblings(".slider").children(".slider-track").width();
+
+                var sp_width = $("#full_ex1_span").width();
+
+
+                var left = ((total_width - width) < (sp_width / 2.0)) ? (total_width - sp_width + 10) : (width - sp_width / 2.0) + 10
+                $("#full_ex1_span").css("left", ((left > 0 ? left : 10)) + "px")
+
+                if ($.checkTask) {
+                    var time = moment($.checkTask.start_time);
+                    var pos = $("#video_pos").val();
+                    if ($("#full_video_pos").length > 0) {
+                        pos = $("#full_video_pos").val();
+                    }
+                    var c_time = time.add(sender.value.newValue, "s");
+                    if (/^(\+|-)?\d+($|\.\d+$)/.test(pos)) {
+                        if (pos > 0) {
+                            c_time = time.add(Math.abs(pos), "s");
+                        } else {
+                            c_time = time.subtract(Math.abs(pos), "s");
+                        }
+                    }
+
+
+
+                    $("#full_ex1_span").html(c_time.format("YYYY-MM-DD HH:mm:ss"))
+                }
+            });
+
+            $("#full_ex1").slider({ step: 5, min: 0, max: maxVV });
+
+            $("#full_ex1").slider('setValue', slider_current_value);
+
+
+
+            $("#full_fast_info").html($("#fast_info").html());
+            $("#full_slow_info").html($("#slow_info").html());
+
+
+            $("#full_tabcontent").css("height", (height - 110) + "px");
+            $("#full_tabcontent").css("width", "100%");
+            setTimeout(function() {
+                callFunc("setvideoposition", getVideoPosition($("#full_tabcontent")))
+            }, 800)
+
+        }
+    });
+
+}
+
+function getUserCheckCount() {
+    var param = {
+        "id": $.checkTask.id,
+        "checked_person": $.checkTask.checked_person
+    };
+    post_common_service("/task/getUserCount/", param, function(userList) {
+        if (userList) {
+            $("#checked_count").html(userList.length);
+        } else {
+            $("#checked_count").html(0);
+        }
+    });
+}
+
+function checkUserCount() {
+    var param = {
+        "id": $.checkTask.id,
+        "checked_person": $.checkTask.checked_person,
+        "class_type": $.checkTask.class_type
+    };
+    post_common_service("/task/getUserCount/", param, function(data) {
+        if (data >= 2) {
+            layer.msg("本周期稽查次数已满，不能再被稽查！", {
+                offset: 'r',
+                time: 2000 //20s后自动关闭
+            });
+            return false;
+        }
+        return true;
+    });
+}
+
+function showCheckDetailCount() {
+    scoreDetailLayer = showPopup4Common('本周期已考核任务', null, ['450px', '350px'], '#checked_task_list_div', 'r', '确定');
+    var param = {
+        "period_id": $.checkTask.period_id,
+        "checked_person": $.checkTask.checked_person,
+        "status_search_type": 1
+    };
+
+    var cols = [
+        { width: 40, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
+        { width: 80, text: '任务名称', type: 'string', flex: true, sort: 'down', field: 'name' },
+        { width: 50, text: '考核人员', type: 'string', flex: true, colClass: '', field: 'checked_person_name' },
+        { width: 80, text: '扣分情况', type: 'string', flex: true, sort: 'down', field: 'score_details' },
+        { width: 70, text: '稽查时间段', type: 'string', flex: true, sort: 'down', field: 'check_period' }
+    ];
+    $('#checked_user_task_datatable').mytable({
+        'cols': cols,
+        'url': "/task/getUserCheckedTaskByPage/",
+        'param': param,
+        'isShoWPager': false
+    });
+}
+
+function initCheckAppealBtns() {
+    if ($.checkTask.appeal) {
+        $("#btn_appeal_task").show();
+        $("#btn_task").hide();
+        // $("#appeal_div").show();
+        $("#appeal_time").html($.checkTask.appeal.appeal_time);
+        $("#appeal_reason").html($.checkTask.appeal.appeal_reason);
+        $("#appeal_file_list").html(genAppeaFiles($.checkTask.appeal.file_src));
+        $("#recheck_result").html($.checkTask.appeal.recheck_result);
+        showAppealLayer();
+    } else {
+        // $("#appeal_div").hide();
+        $("#btn_appeal_task").hide();
+        $("#btn_task").show();
+    }
+}
+
+function showAppealLayer() {
+    layer.open({
+        type: 1,
+        area: ['400px', "400px"],
+        title: "申诉详情",
+        closeBtn: 1,
+        shade: false,
+        maxmin: false,
+        shadeClose: true,
+        offset: 'rb',
+        content: $('#appeal_div'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+        cancel: function(index) {
+            layer.close(index);
+            layer.open({
+                type: 1,
+                title: "",
+                closeBtn: 0,
+                shade: false,
+                maxmin: false,
+                shadeClose: true,
+                content: $('#hide_div'),
+                offset: 'rb',
+                btn: ['申诉详情'],
+                yes: function(index) {
+                    layer.close(index);
+                    showAppealLayer();
+                }
+            });
+            return false;
+        }
+    });
+}
+// 使用data参数更新数据：
+function queryCheckScores() {
+    //$('#score_datatable').score_datatable("");
+    // console.log("任务id：" + $.checkTask.id);
+    var data = {
+            "task_id": $.checkTask.id
+        }
+        // alert("ff");
+    var cols = [
+        { width: 40, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
+        { width: 100, text: '评分记录', type: 'string', flex: true, sort: 'down', field: 'content' },
+        { width: 40, text: '分数', type: 'string', flex: true, colClass: '', field: 'check_item_score' },
+        { width: 100, text: '备注', type: 'string', flex: true, colClass: '', field: 'remark' },
+        { width: 50, text: '考核人', type: 'string', flex: true, colClass: '', field: 'checked_person_name' },
+        // {width: 80, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'},
+        // {
+        //     width: 150,
+        //     text: '操作',
+        //     type: 'string',
+        //     flex: true,
+        //     field: 'id',
+        //     oper: [
+        //         { func: 'showEditCheckScore', text: '修改', icon_class: 'icon-edit' },
+        //         { func: 'showEditPic', text: '图片', icon_class: 'icon-edit' },
+        //         { func: 'deleteCheckScore', text: '删除', icon_class: 'icon-remove-circle' }
+        //     ]
+        // }
+    ];
+
+    var colFunc = { width: 120, text: '操作', type: 'string', flex: true, field: 'id' };
+    colFunc.oper = [
+        { func: 'showEditCheckScore', text: '修改', icon_class: 'icon-edit' },
+        { func: 'showEditPic', text: '图片', icon_class: 'icon-edit' }
+    ];
+    if ($.checkTask.appeal) {
+        colFunc.oper.push({ func: 'backoutCheckScore', text: '撤销', icon_class: 'icon-reply' });
+    } else {
+        colFunc.oper.push({ func: 'deleteCheckScore', text: '删除', icon_class: 'icon-remove-circle' });
+    }
+    cols.push(colFunc);
+
+    // var pager = {
+    //     page_size:10
+    // }
+    $('#score_datatable').mytable({
+        'cols': cols,
+        'url': "/score/getScoreList/",
+        'param': data
+    });
+}
+
+function showEditPic(id) {
+    var rowData = getItemByIdFromArr(id, $('#score_datatable').mytable('getTableData'));
+    showPics(rowData.pics);
+    $("#saveEditBtn").show();
+    editScoreId = id;
+}
+
+function showEditCheckScore(id) {
+    // deleteItem4Common(id,"/score/delete/",queryCheckScores);
+    var rowData = getItemByIdFromArr(id, $('#score_datatable').mytable('getTableData'));
+    scoreDetailLayer = showPopup4Common('修改考核项', function(data) {
+        saveScoreEdit();
+    }, ['350px', '550px'], '#score-detail-div', 'r');
+
+    $("#score_id_text").val(rowData.id);
+    $("#check_item_text").val(rowData.content);
+    $("#check_score_text").val(rowData.check_item_score);
+    setFeeUserSelect("#check_checked_person_select", rowData.checked_person);
+    // $("#check_checked_person_select").val(rowData.checked_person);
+    $("#check_remark_text").tagsInput({ 'defaultText': '添加备注', 'width': '240px' });
+    $("#check_remark_text").addTag(rowData.remark);
+    getTags("/score/getTopRemark", '#score_remark_div', '#check_remark_text', 'remark');
+}
+
+function setFeeUserSelect(div, selectId) {
+    var param = {
+        'organid': $.checkTask.checked_dept
+    };
+    post_common_service("/user/getUserList/", param, function(userList) {
+        // setFeeUserSelect("#check_checked_person_select",rowData.checked_person,data);
+        var optStr = '';
+        for (var i in userList) {
+            if (userList[i].id == selectId)
+                optStr += '<option value="' + userList[i].id + '" selected="selected">' + userList[i].truename + '</option>';
+            else
+                optStr += '<option value="' + userList[i].id + '">' + userList[i].truename + '</option>';
+        }
+        $(div).html('');
+        $(div).html(optStr);
+
+        $('#check_checked_person_select').chosen({
+            // width:'200px',
+            height: '100px',
+            no_results_text: '没有找到', // 当检索时没有找到匹配项时显示的提示文本
+            disable_search_threshold: 10, // 10 个以下的选择项则不显示检索框
+            search_contains: true // 从任意位置开始检索
+        });
+    });
+
+}
+
+function saveScoreEdit() {
+    var param = {
+        'id': $("#score_id_text").val(),
+        'content': $("#check_item_text").val(),
+        'check_item_score': $("#check_score_text").val(),
+        'remark': $("#check_remark_text").val(),
+        'checked_person': $("#check_checked_person_select").val(),
+    };
+    editScoreId = null;
+    $("#saveEditBtn").hide();
+    no_return_common_service("/score/update", param, function(data) {
+        if (scoreLayer) layer.close(scoreLayer);
+        //查询评分情况
+        queryCheckScores();
+        // layer.msg(data, {
+        //     time: 2000//20s后自动关闭
+        // });
+    });
+}
+var editScoreId;
+
+function saveEdit() {
+    if (editScoreId) {
+        var imgArr = $("#img_container .pic-class");
+        var picsStr = "";
+        if (imgArr && imgArr.length > 0) {
+            for (var i = 0; i < imgArr.length; i++) {
+                picsStr += imgArr[i].attr("path") + ","
+            }
+            picsStr = picsStr.substr(0, picsStr.length - 1);
+        }
+        var param = {
+            'id': editScoreId,
+            'pics': picsStr
+        };
+        editScoreId = null;
+        $("#saveEditBtn").hide();
+        no_return_common_service("/score/update", param, function(data) {
+            if (scoreLayer) layer.close(scoreLayer);
+            //查询评分情况
+            queryCheckScores();
+            layer.msg(data, {
+                offset: 'r',
+                time: 2000 //20s后自动关闭
+            });
+        });
+    }
+}
+
+function deleteCheckScore(id) {
+    deleteItem4Common(id, "/score/delete/", queryCheckScores, 'r');
+}
+
+function backoutCheckScore(id) {
+    layer.confirm('是否要撤销扣分？', {
+        btn: ['是', '否'], //按钮
+        shadeClose: true,
+        shade: 0, //不显示遮罩
+        offset: 'r'
+    }, function() {
+        var param = {
+            "id": id,
+            "check_item_score": 0
+        };
+        post_common_service("/score/backoutScore/", param, function(data) {
+            layer.msg('撤销成功！', {
+                offset: 'r',
+                time: 2000, //20s后自动关闭
+            });
+            queryCheckScores();
+        });
+    }, function() {
+
+    });
+}
+
+function setVideoList(videos) {
+    var videoArr;
+    if (videos) {
+        videoArr = videos.split("|");
+        var selectStr = "";
+        for (var i in videoArr) {
+            if (i == 0)
+                selectStr += '<option value="' + videoArr[i] + '" selected="selected">视频' + (videoArr[i] + 1) + '</option>'
+            else
+                selectStr += '<option value="' + videoArr[i] + '">视频' + (videoArr[i] + 1) + '</option>';
+        }
+    }
+    $('#video_list').html(selectStr);
+}
+
+function addPic(pic) {
+    if (pic) {
+        var i = 0;
+        // var imgArr = $("#img_container .pic-class");
+        // if(imgArr && imgArr.length>0) i = imgArr.length;
+
+        if (pic.startWith("http"))
+            pic = pic.replace(base_image_server_url, "/");
+
+        var picStr = genPicstr(pic);
+        $('#img_container').append(picStr);
+        $('a.lightbox-toggle').lightbox();
+    }
+}
+
+function showPics(pics, divId) {
+    var picStr = '';
+    if (!divId) divId = '#img_container';
+    $(divId).html(picStr);
+    if (pics) {
+        var picArr = pics.split(',');
+        for (var i in picArr) {
+            var pic = genPicstr(picArr[i]);
+            picStr += pic;
+        }
+        $(divId).html(picStr);
+        $('a.lightbox-toggle').lightbox();
+    }
+}
+
+function genPicstr(imgSrc) {
+    var src = imgSrc;
+    if (!src.startWith("http"))
+        src = base_image_server_url + src;
+
+    var ispic = true;
+    var videosrc = src;
+    if (src.indexOf('.avi') != -1) {
+        src = src.split('.avi')[0] + "_screen_0.png"
+        ispic = false;
+    }
+    if (src.indexOf('.mov') != -1) {
+        src = src.split('.mov')[0] + "_screen_0.png"
+        ispic = false;
+    }
+    if (src.indexOf('.mp4') != -1) {
+        src = src.split('.mp4')[0] + "_screen_0.png"
+        ispic = false;
+    }
+
+    var pic = '<div class="img_item" style="width:100px;height:90px;float:left;">' +
+        '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>' +
+        (ispic ? '<a class="card lightbox-toggle" data-group="image-group-1" data-lightbox-group="example-3" href="' + src + '" style="position:absolute">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="position:absolute">') +
+        '<img class="pic-class img-thumbnail" path="' + imgSrc + '" style="width:100px;height:70px;" src="' + src + '" alt="">' + (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 30px;position: absolute;top: 20px;left: 40px;color: white;"></i>') +
+        '</a>' +
+        '</div>';
+    if (ISCLIENT) {
+        pic = '<div class="img_item" style="width:100px;height:90px;float:left;">' +
+            '<a href="javascript:void(0)" onclick="removeImg(this)" style="float:right;position:relative;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>' +
+            '<a class="card" onclick="' + (ispic ? 'showClientImg(\'' + src + '\')' : 'showClientVideo(\'' + videosrc + '\')') + '" href="javascript:void(0)" style="position:absolute">' +
+            '<img class="pic-class img-thumbnail" path="' + imgSrc + '" style="width:100px;height:70px;" src="' + src + '" alt="">' + (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 30px;position: absolute;top: 20px;left: 40px;color: white;"></i>') +
+            '</a>' +
+            '</div>';
+    }
+    return pic;
+}
+
+
+function removeImg(this1) {
+    $(this1).parent('.img_item').remove();
+}
+
+function clearAllImg() {
+    $('#img_container').empty();
+}
+var changePersonLayer;
+
+function showChangeUser() {
+    var param = {
+        'organid': $.checkTask.checked_dept
+    };
+
+    post_common_service("/user/getUserList/", param, function(data) {
+        changePersonLayer = showPopup4Common('更改人员', null, ['550px', '600px'], null, 'r', '确定');
+        $("#user_container").empty();
+        var userStr = "";
+        for (var i in data) {
+            var name = data[i].truename;
+            if (data[i].workno) name = name + " " + data[i].workno.substr(data[i].workno.length - 3);
+            var pic = "../../images/body-bg.png";
+            if (data[i].pic) pic = base_image_server_url + data[i].pic;
+            str = '<div style="width:90px;float:left;margin:5px;">' +
+                '<a class="card" href="javascript:void(0)">' +
+                '<img src="' + pic + '" alt="" style="height:100px;width:90px;" onclick="showBigImg(\'' + pic + '\')">' +
+                '<div class="card-heading"><strong>' + name + '</strong></div>' +
+                '<div class="card-actions">' +
+                '<button type="button" class="btn btn-mini btn-danger" onclick="changePerson(\'' + data[i].id + '\')">选择</button>' +
+                '</div>' +
+                '</a>' +
+                '</div>';
+            userStr += str;
+        }
+        $("#user_container").html(userStr);
+    })
+}
+
+function changePerson(id) {
+    layer.confirm('是否要更改考核人？', {
+        btn: ['是', '否'], //按钮
+        shadeClose: true,
+        shade: 0, //不显示遮罩
+        offset: 'r'
+    }, function(index) {
+        layer.close(index);
+        var flag = true;
+        var param = {
+            "id": $.checkTask.id,
+            "checked_person": id,
+            "class_type": $.checkTask.class_type
+        };
+        post_common_service("/task/getUserCount/", param, function(data) {
+            if (data && data.length >= 2) {
+                layer.msg("本周期稽查次数已满，不能再被稽查！", {
+                    time: 2000, //20s后自动关闭
+                    offset: 'r'
+                });
+            } else {
+                // $('#checked_person').html(id);
+                var param1 = {
+                    "id": $.checkTask.id,
+                    "checked_person": id,
+                }
+                post_common_service("task/update/", param1, function(task_data) {
+                    checkHasScore(id, $.checkTask.checked_person);
+                    //重置当前任务
+                    $.checkTask = task_data;
+                    //获取用户信息
+                    get_common_service('user/getUserById/' + id, null, function(data) {
+                            changePersonContent(data);
+                        })
+                        //更新用户次数表
+                    no_return_common_service('task/updateUserCount/', param, function(data) {
+                        // changePersonContent(data);
+                    })
+                    layer.close(changePersonLayer);
+                }, function(error) {
+                    // alert(error);
+                });
+            }
+        });
+    }, function() {
+
+    });
+
+}
+
+function checkHasScore(id, old_person) {
+    var param = {
+        "task_id": $.checkTask.id,
+        "checked_person": old_person
+    };
+    post_common_service("/score/getScoreList/1/10", param, function(data) {
+        if (data.list && data.list.length > 0) {
+            layer.confirm('是否要同步更改扣分人？', {
+                btn: ['是', '否'], //按钮
+                shadeClose: true,
+                shade: 0, //不显示遮罩
+                offset: 'r'
+            }, function() {
+                var param = {
+                    "task_id": $.checkTask.id,
+                    "checked_person": old_person,
+                    "new_checked_person": id
+                };
+                post_common_service("/score/updateByTaskIdAndPerson/", param, function(data) {
+                    layer.msg('更改成功！', {
+                        offset: 'r',
+                        time: 2000, //20s后自动关闭
+                    });
+                    queryCheckScores();
+                });
+            }, function() {
+
+            });
+        }
+    });
+}
+
+function showBigImg(src) {
+    $('#userBigImg').attr("src", src);
+    layer.open({
+        offset: 'r',
+        type: 1,
+        title: false,
+        closeBtn: 1,
+        area: '450px',
+        skin: 'layui-layer-nobg', //没有背景色
+        shadeClose: true,
+        shade: 0,
+        content: $('#userBigImg')
+    });
+}
+
+function resetUserImgInfo() {
+    $("#user_img_container").empty();
+    var str = '<a id="person_img" href="../../images/img4.jpg" class="lightbox-toggle">' +
+        '<img src="../../images/img4.jpg" class="img-thumbnail" style="width:50px;height:50px;margin-top:-10px;"></a>' +
+        '<label id="checked_person"></label>' +
+        '(次数：<a href="javascript:void(0)" onclick="showCheckDetailCount()"><span class="label label-primary" id="checked_count">Primary</span></a>)';
+    $("#user_img_container").html(str);
+}
+
+function changePersonContent(data) {
+    resetUserImgInfo();
+    var name = data.truename;
+    if (data.workno) name = data.workno + " " + data.truename;
+    $("#checked_person").html(name);
+    var imgSrc = base_image_server_url + data.pic;
+    $("#person_img > img").attr("src", imgSrc);
+    if (ISCLIENT) {
+        $("#person_img").attr("href", "javascript:void(0)");
+        $("#person_img").removeClass("lightbox-toggle");
+        $("#person_img").click(function() {
+            showClientImg(imgSrc);
+        });
+        $("#person_img > img").attr("src", imgSrc);
+        return;
+    } else {
+        $("#person_img").attr("href", imgSrc);
+        $('a.lightbox-toggle').lightbox();
+    }
+    getUserCheckCount();
+}
+var scoreLayer;
+
+function showScore() {
+    scoreLayer = showPopup4Common('选择考核项', null, ['400px', '500px'], '#items-div', 'r');
+    buildTree();
+}
+
+function buildTree() {
+    var zTreeObj;
+    var zNodes = [];
+    check_item_tree = $.fn.zTree.init($("#items_tree"), {}, zNodes);
+    getCheckItems();
+}
+
+function getCheckItems() {
+    function zTreeOnRename(event, treeId, treeNode, isCancel) {
+        alert(treeNode.tId + ", " + treeNode.name);
+    }
+
+    function zTreeOnRemove(event, treeId, treeNode) {
+        alert(treeNode.tId + ", " + treeNode.name);
+    }
+
+
+    var setting = {
+        data: {
+            simpleData: {
+                enable: true,
+                idKey: "id",
+                pIdKey: "pId",
+                rootPId: null
+            }
+        },
+        view: { //表示tree的显示状态
+            selectMulti: false //表示禁止多选
+        },
+        check: { //表示tree的节点在点击时的相关设置
+            enable: false, //是否显示radio/checkbox
+            chkStyle: "checkbox", //值为checkbox或者radio表示
+            checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+            radioType: "level" //设置tree的分组
+        },
+        callback: {
+            onDblClick: zTreeOnClick
+        },
+        edit: {
+            enable: true,
+            drag: {
+                autoExpandTrigger: true,
+                isMove: true,
+                prev: false,
+                next: true,
+                inner: true,
+                autoOpenTime: 0
+            },
+            showRenameBtn: false,
+            showRemoveBtn: false
+        }
+    };
+    var param = { "rule_type": 1 };
+    console.log(param);
+    post_common_service('checkRule/getItemListByRuleType', param, function(data) {
+        // console.log(data);
+        zdata = [];
+        for (var i = 0; i < data.length; i++) {
+            var m = data[i];
+            zdata.push(genNode(m));
+        }
+        // console.log(zdata);
+        menu_tree = $.fn.zTree.init($("#items_tree"), setting, zdata)
+    }, function(error) {
+
+    });
+}
+
+function addobj_checkitem(data) {
+    // console.log(data.subCheckItem);
+    var zdata = [];
+    if (typeof(data.subCheckItem) != "undefined" && data.subCheckItem != null &&
+        data.subCheckItem.length > 0) {
+        for (var i = 0; i < data.subCheckItem.length; i++) {
+            var m = data.subCheckItem[i];
+            zdata.push(genNode(m));
+        }
+        return zdata;
+    } else {
+        return [];
+    }
+}
+
+function genNode(m) {
+    var zdataItem = {};
+    zdataItem["id"] = m.id;
+    zdataItem["value"] = m.name;
+    zdataItem["pId"] = m.parent_id;
+    zdataItem["score"] = m.score;
+    zdataItem["icon"] = "";
+    zdataItem["name"] = m.name;
+    //zdataItem["content"] = m.name;
+    if (m.score) zdataItem["name"] = m.name + '(' + m.score + ')';
+    zdataItem["open"] = true;
+    // console.log(m.subCheckItem);
+    zdataItem["children"] = addobj_checkitem(m);
+    return zdataItem;
+}
+
+function zTreeOnClick(event, treeId, treeNode) {
+    var imgArr = $("#img_container .pic-class");
+    var picsStr = "";
+    if (imgArr && imgArr.length > 0) {
+        for (var i = 0; i < imgArr.length; i++) {
+            picsStr += $(imgArr[i]).attr("path") + ","
+        }
+        picsStr = picsStr.substr(0, picsStr.length - 1);
+    }
+    var param = {
+        'task_id': $.checkTask.id,
+        'pics': picsStr,
+        'name': treeNode.value,
+        'check_item_score': treeNode.score,
+        'content': treeNode.value,
+        'check_item_id': treeNode.id,
+        'checkman': $.checkTask.checkman,
+        'checked_person': $.checkTask.checked_person,
+        'checked_dept': $.checkTask.checked_dept
+    };
+    no_return_common_service("/score/add", param, function(data) {
+        if (scoreLayer) layer.close(scoreLayer);
+        clearAllImg();
+        //查询评分情况
+        queryCheckScores();
+        layer.msg(data, {
+            offset: 'r',
+            time: 2000 //20s后自动关闭
+        });
+    });
+
+}
+
+function submitCheck() {
+    var param = {
+        "id": $.checkTask.id,
+        "check_status": 4
+    }
+    no_return_common_service("/task/taskEnd/", param, function(data) {
+        layer.msg("提交成功", {
+            offset: 'r',
+            time: 2000 //20s后自动关闭
+        });
+        // var currentpage = $.zui.store.get("currentpage");
+        // getPageInfo(currentpage);
+        redirectLastPage();
+    });
+
+}
+
+function showPre(id) {
+    // $('#myModal').modal({name:"dd"});
+    //预览提交把任务状态改为待提交
+    no_return_common_service('/task/update', { "id": $.checkTask.id, "check_status": 7 })
+    changePage("/view/mytask/taskDetail.html");
+}
+
+var isappeal = false;
+
+function appeal_showInvalid() {
+    isappeal = true;
+    showInvalidView();
+}
+
+function showInvalid() {
+    isappeal = false;
+    showInvalidView();
+}
+
+function showInvalidView() {
+    invalidLayer = showPopup4Common('申请无效', function() {
+        saveValidReason();
+    }, ['400px', '500px'], '#invalid_div', 'r');
+
+    $('#apply_reason').tagsInput({ 'defaultText': '添加原因' });
+    getTags("/checkApply/getTopReason", "#top_reason_div", '#apply_reason', 'apply_reason');
+}
+
+
+
+function submitCheck4AppealDirect() {
+    var appeal_result = 1;
+    //询问框
+    layer.confirm('该申诉是否成功？', {
+        offset: 'r',
+        btn: ['成功', '失败'], //按钮
+        // shadeClose: true,
+        shade: 0 //不显示遮罩
+    }, function() {
+        appeal_result = 1;
+        submitCheck4AppealResult(appeal_result);
+    }, function() {
+        appeal_result = 2;
+        submitCheck4AppealResult(appeal_result);
+    });
+
+
+}
+
+function submitCheck4AppealResult(appeal_result) {
+    var param = {
+        "id": $.checkTask.id,
+        "check_status": 14,
+        "appeal_id": $.checkTask.appeal.id,
+        "appeal_result": appeal_result
+    }
+    no_return_common_service("/task/taskEnd/", param, function(data) {
+        layer.msg("提交成功", {
+            offset: 'r',
+            time: 2000 //20s后自动关闭
+        });
+        redirectLastPage();
+    });
+}
+
+function showPre4Appeal(id) {
+    // $('#myModal').modal({name:"dd"});
+    //预览提交把任务状态改为待提交
+    no_return_common_service('/task/update', { "id": $.checkTask.id, "check_status": 17 })
+    changePage("/view/mytask/taskDetail.html");
+}
+
+function saveValidReason() {
+    var param = {
+        "task_id": $.checkTask.id,
+        "apply_reason": $('#apply_reason').val(),
+        "isappeal": isappeal
+    };
+
+
+    no_return_common_service("/checkApply/add/", param, function(data) {
+        layer.msg("申请提交成功", {
+            offset: 'r',
+            time: 2000 //20s后自动关闭
+        });
+        redirectLastPage();
+    });
+}
+
+
+function score(score) {
+    alert("扣分：" + score);
+    $('#scoreWin').modal('toggle');
+}
+
+function refuseApply() {
+    alert("拒绝申请");
+    $('#refuseApplyWin').modal('toggle');
+}
+
+function agreeApply() {
+    alert("同意申请");
+}
+
+
+function getVideoPosition(obj) {
+    if (obj == null) obj = $('#tabcontent');
+    var X = obj.offset().top;
+    var Y = obj.offset().left;
+    var width = obj.width();
+    var height = obj.height();
+    return parseInt(Y) + "|" + parseInt(X) + "|" + parseInt(width) + "|" + parseInt(height);
+}
+
+function initUpLoad() {
+
+    var uploader = WebUploader.create({
+
+        // swf文件路径
+        swf: 'lib/webuploader/js/Uploader.swf',
+
+        // 文件接收服务端。
+        server: base_image_server_url + '/filesSrver/' + FILE_UPLOAD,
+
+        // 选择文件的按钮。可选。
+        // 内部根据当前运行是创建，可能是input元素，也可能是flash.
+        pick: '#picker',
+
+        // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
+        resize: false
+    });
+}
+
+function saveRecheckResult() {
+    var param = {
+        "id": $.checkTask.appeal.id,
+        "recheck_result": $("#recheck_result").val()
+    }
+    post_common_service("/checkAppeal/update", param, function(data) {
+        layer.msg("保存成功", {
+            offset: 'r',
+            time: 2000 //20s后自动关闭
+        });
+        $.checkTask.appeal = data;
+    });
+}
+
+function addTag(text, tagDiv) {
+    if (!$(tagDiv).tagExist(text)) {
+        $(tagDiv).addTag(text);
+    }
+}
+
+// function getTags(){
+//     post_common_service("/checkApply/getTopReason", null, function(data) {
+//         if(data){
+//             var str="";
+//             for(var i=0;i<data.length;i++){
+//                 str+='<a href="javascript:void(0)" onclick="addTag(\''+data[i].apply_reason+'\')" style="float:left;margin:5px;"><span class="label label-success" style="padding:5px;">'+data[i].apply_reason+'</span></a>';
+//             }
+//             $("#top_reason_div").html(str);
+//         }
+//     });
+// }

VisualInspection/fwq/js/task/task_list.js

@@ -0,0 +1,99 @@
+var cur_status;
+var cur_page;
+
+function initTaskPage() {
+    initQueryParams();
+    initTableRowBtn();
+    queryTask();
+}
+
+function initQueryParams() {
+    // 仅选择日期
+    $.jeDate("#start_time", {
+        isinitVal: true,
+        format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+    });
+
+    var page_params = $.zui.store.get("page_params");
+    if (page_params && page_params.status) {
+        cur_status = page_params.status;
+    }
+
+    var checked_dept = null;
+    if (roleContains("SERVICEAREA")) {
+        checked_dept = getCurrentUser().organid;
+    }
+    setSASelect("#fsList", checked_dept);
+
+}
+//初始化表行按钮
+function initTableRowBtn() {
+    $.zui.store.set("task_table_btn_2", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
+    $.zui.store.set("task_table_btn_3", [{ func: 'showCheck', text: '开始稽查', icon_class: 'icon-eye-open' }]);
+    $.zui.store.set("task_table_btn_7", [{ func: 'showContinueCheck', text: '继续稽查', icon_class: 'icon-eye-open' }]);
+    $.zui.store.set("task_table_btn_4", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' },
+        { func: 'dispatchTaskById', text: '下发', icon_class: 'icon-signin' }
+    ]);
+    $.zui.store.set("task_table_btn_5", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' }]);
+    $.zui.store.set("task_table_btn_6", [{ func: 'showTaskDetail', text: '详情', icon_class: 'icon-tasks' }]);
+    $.zui.store.set("task_table_btn_21", [{ func: 'showApplyDetail', text: '处理', icon_class: 'icon-hand-up' }]);
+}
+//查询任务
+function queryTask() {
+
+
+
+    var data = {
+        "start_time": timeTranslate(GV("#start_time")),
+        "end_time": (GV("#start_time") + "/25 23:00:00").replace("/", "-").replace("/", "-"),
+        "checked_dept": $("#fsList").val(),
+        "check_status": cur_status
+    }
+    console.log(data);
+    var hide = false;
+    if (hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) || hasRole(ROLE_JICHA) || roleContains('STATION')) {
+        hide = true;
+    }
+    var cols = [
+        { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
+        { width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down', field: 'name' },
+        { width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down', field: 'checked_dept_name' },
+        { width: 80, text: '稽查人员', type: 'string', flex: true, hide: hide, colClass: '', field: 'checkman_name' },
+        { width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down', field: 'check_period' },
+        // {width: 120, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'}
+    ];
+    var colFunc = { width: 120, text: '操作', type: 'string', flex: true, field: 'id' };
+    colFunc.oper = $.zui.store.get("task_table_btn_" + cur_status);
+    cols.push(colFunc);
+    //只有下发才显示复选框
+    var checkable = false;
+    if ((hasRole(ROLE_JICHA_ADMIN) && cur_status == 4) || (roleContains("STATION") && cur_status == 5)) {
+        checkable = true;
+    }
+    console.log("checkable:" + checkable);
+    if (cur_status == 2 || cur_status == 3) {
+        data.check_status_arr = [2, 3];
+    }
+    taskTableObj = $('#task_list_table').mytable({
+        'cols': cols,
+        'checkable': checkable,
+        'url': "/f/task/getall/",
+        'param': data,
+        'pager': {
+            'p_cur': cur_page
+        }
+    });
+    $.zui.store.set('store_param_' + current_url, data);
+}
+
+
+//进入稽查页面
+function showCheck(id) {
+    // $('#myModal').modal({name:"dd"});
+    $.checkTask = getItemByIdFromArr(id, $('#task_list_table').mytable('getTableData'));
+    $.checkTask.appeal = null;
+    //开始稽查
+    no_return_common_service('/f/task/update', { "id": $.checkTask.id, "check_status": 3 });
+
+    changePage("/fwq/view/task/check.html", taskTableObj);
+}

VisualInspection/fwq/view/main.html

@@ -0,0 +1,90 @@
+<!doctype html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>稽查</title>
+
+
+    <link rel="import" href="/view/common/commoncsslink.html?__inline">
+    <link rel="stylesheet" type="text/css" href="/css/main.css">
+    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
+    <!--<link rel="stylesheet" type="text/css" href="/js/lib/jedate/skin/jedate.css">
+    <script src="/js/lib/jedate/jedate.js"></script>-->
+    <style>
+        html {
+            overflow: auto;
+        }
+        
+        img.lightbox-img {
+            width: 600px;
+        }
+        
+        .navbar-inverse {
+            background-color: #366ca5;
+        }
+        
+        .file-list,
+        .uploader-files {
+            border: 0px;
+        }
+        
+        html {
+            overflow: hidden
+        }
+        
+        body {
+            font-family: 'Microsoft Yahei';
+            overflow: hidden
+        }
+        /*.mum_left {
+            background-color: #2B7EB3;
+        }*/
+    </style>
+    <script src="/fwq/js/task/check.js"></script>
+    <!--<script src="/js/teamClass/check_team_schedule.js"></script>-->
+    <script src="/js/teamClass/charge_team_schedule.js"></script>
+</head>
+
+<body>
+    <link rel="import" href="/view/common/head.html?__inline">
+
+
+
+
+    <div id="main" class="container-fluid main">
+        <div class="row">
+            <div class="col-md-2" style="padding-right:0;z-index: 11;">
+                <div id="mum_left" class="mum_left">
+                    <link rel="import" href="/view/mum.html?__inline">
+                </div>
+            </div>
+            <div class="col-md-10">
+                <div id="mum_right" class="mum_right">
+
+                    <div class="panel" id="main_panel">
+                        <div class="panel-heading" id="main_content_title">
+                            <ol class="breadcrumb" id="breadcrumb_menu" style="margin-bottom: 0;padding:0px;">
+
+                            </ol>
+                        </div>
+                        <div class="panel-body" id="main_panel_body">
+                            <div id="main_content">
+                            </div>
+                            <!--<link rel="import" href="/view/mytask/unchecked.html?__inline">-->
+                        </div>
+                    </div>
+
+                    <link rel="import" href="/view/common/foot.html?__inline">
+                </div>
+
+            </div>
+
+        </div>
+    </div>
+
+    <script src="/js/main.js"></script>
+</body>
+
+
+</html>

VisualInspection/fwq/view/task/check.html

@@ -0,0 +1,255 @@
+<script type="text/javascript" src="/js/lib/sonic.js?__inline"></script>
+<div class="container-fluid ">
+    <div class="row">
+        <form class="form-horizontal">
+            <div class="form-group" style="margin-bottom: 5px;">
+                <div class="form-group col-sm-6" style="margin-bottom: 0px;">
+                    <label class="col-sm-4">名称：<span id="taskName" class="label" style="vertical-align:baseline"></span></label>
+                    <label class="col-sm-5">时间：<span id="check_time" class="label" style="vertical-align:baseline"></span></label>
+                </div>
+                <div class="form-group col-sm-5" style="margin-bottom: 0px;">
+                    <label class="col-sm-3">考核区域：</label>
+                    <div class="col-sm-9" id="user_img_container">
+                        <!-- 使用图片 -->
+                        <a id="person_img" href="../../images/img4.jpg" class="lightbox-toggle"><img src="../../images/img4.jpg" class="img-thumbnail" style="width:50px;height:50px;margin-top:-10px;"></a>
+                        <label id="checked_person"></label>
+                        <a href="javascript:void(0)" onclick="showCheckDetailCount()">次数<label id="checked_count"></label></a>
+                    </div>
+                </div>
+
+
+            </div>
+        </form>
+    </div>
+
+    <div class="row">
+        <div class="col-sm-6">
+            <div id="dashboard" class="dashboard dashboard-draggable" data-height="300">
+                <section class="row">
+                    <div class="col-md-12">
+                        <div class="panel" data-id="1">
+
+                            <div class="panel-body" style="padding:0 0 5px 0">
+
+
+
+                                <div id="video_content">
+                                    <div class="tab-content" id="tabcontent" style="height:400px;text-align: center;background:black;">
+                                        <p style="padding-top:180px;font-size:20px">加载中...</p>
+                                        <!--<i class="icon icon-spin icon-spinner  icon-5x" style="margin-top:100px"></i>-->
+                                    </div>
+                                    <div class="row" class="col-md-12" style="padding:5px 10px 25px 10px;text-align:center;margin:0px">
+                                        <input id="ex1" class="col-md-12" type="text" data-slider-min="0" data-slider-max="100" data-slider-step="1" data-slider-value="0" />
+                                        <br/>
+                                        <span id="ex1_span" style="position: absolute;left: 25px;">2017-06-12 23:00:00</span>
+                                    </div>
+                                    <div class="row" style="padding:0px 5px 0px 5px;text-align:center;margin:0px">
+                                        <select class="form-control" id="video_list" style="width:200px;float:left;display:none"></select>
+                                        <div class="col-md-4 " style="padding-left:0">
+                                            <div class="input-group" style="padding-left:0">
+                                                <input type="text" id="video_pos" style="height:42px" class="form-control" placeholder="时间偏移值">
+                                                <span class="input-group-btn">
+                                                <button class="btn btn-default" style="height:42px" onclick="setVideoPos()" type="button">校正</button>
+                                             </span>
+                                            </div>
+                                        </div>
+                                        <div class="btn-group1" style="float:right;">
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('start')"><i class="icon icon-play-circle icon-2x"></i></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('stop')"><i class="icon icon-pause icon-2x"></i></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('fast')"><i class="icon icon-forward icon-2x"></i><span id="fast_info"></span></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('slow')"><span id="slow_info"></span><i class="icon icon-backward icon-2x"></i></button>
+                                            <button type="button" class="btn btn-info1 " style="width:41px;height:41px" id="video_btn_start" onclick="doAction('video_start')"><img id="video_btn_start_img" style="width:30px" src="/images/video.png"></img></button>
+                                            <button type="button" class="btn btn-info1 hidden" style="width:41px;height:41px" id="video_btn_stop" onclick="doAction('video_stop')"><i class="icon icon-stop icon-2x"></i></button>
+                                            <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction('screenshot')"><i class="icon icon-camera icon-2x"></i></button>
+
+
+                                        </div>
+
+                                    </div>
+                                    <!--<hr>-->
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+
+            </div>
+
+        </div>
+        <div class="col-sm-6">
+            <div id="score_datatable" style="height:250px;overflow:auto;" data-checkable="true" data-sortable="true"></div>
+            <div class="row">
+                <div id="dashboard" class="dashboard dashboard-draggable" data-height="300">
+
+                    <div class="row" class="col-sm-11" style="margin:5px;">
+                        <button class="btn btn-info2" type="button" onclick="clearAllImg()" style="margin-right:10px;">清空</button>
+                        <button class="btn btn-info3" type="button" onclick="showScore()" style="margin-right:10px;">评分</button>
+                        <button id="saveEditBtn" class="btn btn-warning" type="button" onclick="saveEdit()" style="margin-right:10px;display:none;">保存修改</button>
+                        <form id="form1" runat="server" method="post" enctype="multipart/form-data" style="float:left;margin-right:10px;">
+                            <div>
+                                <button id="box" class="btn btn-info2" type="button">上传</button>
+                                <div style="display:none;">
+                                    <input type="file" name="_f" id="_f" />
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                    <div class="panel" style="margin-bottom:10px;">
+                        <div class="panel-body" style="padding:5px;" class="col-sm-12">
+                            <div id="img_container" class="cards cards-borderless col-sm-12" style="height:100px;overflow:auto;">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+            <div class="row" style="margin-top:0px;">
+                <div class="col-sm-10" id="btn_task">
+                    <button class="btn btn-info2" type="button" onclick="submitCheck()">直接提交</button>
+                    <button class="btn btn-info2" type="button" onclick="showPre()">预览提交</button>
+                    <button class="btn btn-info3" type="button" onclick="showInvalid()">申请无效</button>
+                    <!--<button class="btn btn-primary" type="button" data-toggle="modal" data-target="#refuseApplyWin">拒绝申请</button>
+                    <button class="btn btn-primary" type="button" onclick="agreeApply()">同意申请</button>-->
+                </div>
+                <div class="col-sm-10" id="btn_appeal_task">
+                    <button class="btn btn-info2" type="button" onclick="submitCheck4AppealDirect()">直接提交</button>
+                    <button class="btn btn-info2" type="button" onclick="showPre4Appeal()">预览提交</button>
+                    <button class="btn btn-info3" type="button" onclick="appeal_showInvalid()">申请无效</button>
+                    <!--<button class="btn btn-primary" type="button" data-toggle="modal" data-target="#refuseApplyWin">拒绝申请</button>
+                    <button class="btn btn-primary" type="button" onclick="agreeApply()">同意申请</button>-->
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div id="appeal_div" style="display:none;">
+    <link rel="import" href="/view/mytask/appealDetail.html?__inline">
+</div>
+<div id="form-div" style="display:none;text-align:center;">
+    <link rel="import" href="/view/mytask/changePerson.html?__inline">
+</div>
+<div id="items-div" style="display:none;text-align:center;">
+    <ul id="items_tree" class="ztree"></ul>
+</div>
+<div id="score-detail-div" style="display:none;text-align:center;">
+    <link rel="import" href="/view/mytask/scoreDetail.html?__inline">
+</div>
+<!-- 对话框HTML -->
+<div class="modal fade" id="validSubmitWin">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
+                <h4 class="modal-title">无效申请</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal">
+                    <label for="exampleInputAccount1" class="col-sm-2">无效原因</label>
+                    <div class="form-group">
+                        <input class="col-sm-3" type="text" id="valid-reason" class="form-control" placeholder="原因">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="saveValidReason()">保存</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- 对话框HTML -->
+<div id="invalid_div" style="display:none;text-align:center;">
+    <div class="container-fluid" style="overflow: hidden">
+        <div class="cards">
+            <div class="form-group">
+                <div class="col-md-6 col-sm-10">
+                    <input type="text" name="tags" class="form-control" id="apply_reason" placeholder="">
+                </div>
+            </div>
+            <br>
+            <div class="row" style="clear:both;height:100%;">
+            </div>
+            <div class="row" id="top_reason_div" style="padding:15px;">
+            </div>
+        </div>
+    </div>
+</div>
+<div id="checked_task_list_div" style="display:none;text-align:center;">
+    <div class="datatable" id="checked_user_task_datatable"></div>
+</div>
+<!-- 对话框HTML -->
+<div id="hide_div" style="display:none;text-align:center;">
+</div>
+<img id="userBigImg" style="display:none;margin-right:20px;" />
+<script>
+    var curVideo;
+    $(document).ready(function() {
+        $("#video_btn_start").mouseover(function() {
+            $("#video_btn_start_img").attr("src", "/images/movie.png");
+        });
+        $("#video_btn_start").mouseout(function() {
+            $("#video_btn_start_img").attr("src", "/images/video.png");
+        });
+        if ($.checkTask.checked_location_type == 1) {
+            $("li.tab_lane").hide();
+            $("li.tab_not_lane").show();
+            $("li.tab_not_lane:first").addClass("active");
+        } else {
+            $("li.tab_lane").show();
+            $("li.tab_not_lane").hide();
+            $("li.tab_lane:first").addClass("active");
+        }
+        initCheck();
+
+        $('[data-tab]').on('shown.zui.tab', function(e) {
+            // console.log('当前被激活的标签页', $(e.target).attr('bbb'));
+            // console.log('上一个标签页', e.relatedTarget);
+            var i = $(e.target).attr('bbb');
+            var showVideo;
+            if (i == 3 || i == 4) {
+                var videos = $.checkTask.video_id.split(',');
+                showVideo = videos[i - 3];
+            } else {
+                var videos = $.checkTask.video_id.split(',');
+                showVideo = videos[i];
+            }
+
+            if (showVideo != "" && showVideo && showVideo != "undefined") {
+                curVideo = showVideo;
+                queryVideoList();
+            } else {
+                callFunc("showvideoview", "false");
+                layer.msg('暂无视屏！', {
+                    time: 2000, //20s后自动关闭
+                });
+                callFunc("stop", "");
+            }
+
+        });
+
+
+    });
+
+    $("#box").click(function() {
+        return $("#_f").click();
+    });
+
+    $("#_f").change(function() {
+        UpladFile();
+    });
+
+    function UpladFile() {
+        var fileObj = document.getElementById("_f").files[0]; // 获取文件对象
+        // var FileController = base_image_server_url +'fileServer/file/upload';// 接收上传文件的后台地址
+        // FormData 对象
+        // var form = new FormData();
+        // form.append("name", "hooyes");                        // 可以增加表单数据
+        // form.append("file", fileObj);                           // 文件对象
+        uploadFile(fileObj, "file", function(data) {
+            addPic(base_image_server_url + data.path);
+        }, function(error) {
+            console.log(error)
+        }, "task");
+    }
+</script>

VisualInspection/fwq/view/task/task_list.html

@@ -0,0 +1,64 @@
+<script src="/js/statistics/common_statistic.js?__inline"></script>
+<script src="/fwq/js/task/task_list.js?__inline"></script>
+
+<div class="container-fluid ">
+    <div class="row">
+        <form class="form-horizontal" style="margin:0px;">
+            <div class="form-group" style="margin:0px;">
+                <div class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="col-sm-4" style="text-align: left;padding-right:0">稽查周期</label>
+                    <div class="col-sm-8">
+                        <input type="text" id="start_time" class="form-control form-date" placeholder="选择周期">
+                    </div>
+                </div>
+                <div class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="col-sm-4">考核部门</label>
+                    <div class="col-sm-8">
+                        <select class="form-control" id="fsList">
+                        </select>
+                    </div>
+                </div>
+
+
+                <div class="form-group col-sm-2">
+                    <button class="btn btn-info2 col-sm-1" style="width:80px;" type="button" onclick="queryTask()">查询</button>
+                    <div id="dispatchPatchBtn" class="col-sm-1" style="display:none;">
+                        <button class="btn btn-info3" type="button" onclick="dispatchTaskPatch()"><i class="icon icon-signin"></i> 批量下发</button>
+                    </div>
+                    <div id="confirmPatchBtn" class="col-sm-1" style="display:none;">
+                        <button class="btn btn-info3" type="button" onclick="confirmTaskPatch()"><i class="icon icon-hand-up"></i> 一键确认</button>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group" style="margin:0px;">
+                <div id="hasScoreDiv" style="display:none;" class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="col-sm-4">有无扣分</label>
+                    <div class="col-sm-8">
+                        <select class="form-control" id="hasScoreList">
+                            <option value="" selected>全部</option>
+                            <option value="1">有</option>
+                            <option value="2">无</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="form-group col-sm-2">
+                </div>
+                <div class="form-group col-sm-2">
+                    <div class="form-group col-sm-1">
+                    </div>
+                    <div id="dispatchAllNoScoreBtn" class="col-sm-1" style="display:none;padding:0px;">
+                        <button class="btn btn-info4" type="button" onclick="dispatchAllNoScoreTask()"><i class="icon icon-signin"></i> 下发无扣分任务</button>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <hr style="margin-top:0px;">
+
+    <div class="datatable" id="task_list_table"></div>
+</div>
+<script>
+    $(document).ready(function() {
+        initTaskPage();
+    });
+</script>

VisualInspection/js/config.js

@@ -20,6 +20,8 @@ function getserveraddr() {
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
         return "http://localhost:8089/"
+    } else if (base_ui_url.indexOf("192.168.31.233") != -1) {
+        return "http://192.168.31.233:8089/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
     } else {

VisualInspection/js/main.js

@@ -69,7 +69,27 @@ $(document).ready(function() {
 
 
 
+    //判断路径中是否包含其他稽查的路径
+    var pathName = window.document.location.pathname;
+    var mbody = {
+        type: 10
+    };
+    if (pathName.indexOf("fwq") != -1) {
+        //服务区稽查
+        mbody.type = 20;
+
+    } else if (pathName.indexOf("qzd") != -1) {
+        //清障队
+        mbody.type = 30;
+
+    } else if (pathName.indexOf("cd") != -1) {
+        //车队
+        mbody.type = 40;
+    } else {
+        //收费站
+        mbody.type = 10;
 
+    }
     MenuGetAll(function(data) {
         var secondMenus = [];
         //初始化菜单
@@ -113,7 +133,31 @@ $(document).ready(function() {
                     //获取当前页
                     var currentpage = 0;
                     currentpage = $.zui.store.get("currentpage");
-                    if (typeof(currentpage) != undefined && currentpage != null) {
+                    var cexit = false;
+
+
+
+                    if (typeof(MENU) != "undefined" && MENU != null) {
+                        for (var i = 0; i < MENU.length; i++) {
+                            var menu = MENU[i];
+                            if (menu.id == currentpage) {
+                                cexit = true;
+                                break;
+                            }
+                            if (menu.childs.length > 0) {
+                                for (var j = 0; j < menu.childs.length; j++) {
+                                    var mtemp = menu.childs[j];
+                                    if (mtemp.id == currentpage) {
+                                        cexit = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+
+                    if (typeof(currentpage) != undefined && currentpage != null && cexit) {
                         //改变页面
                         getPageInfo(currentpage);
                     } else {
@@ -122,7 +166,7 @@ $(document).ready(function() {
                 });
             });
         });
-    }, function(error) {});
+    }, function(error) {}, mbody);
 
 });
 

VisualInspection/js/menu/menu.js

@@ -103,7 +103,7 @@ function getMenu() {
         }
     };
 
-    get_common_service('menu/get/all?judge=1', null, function(data) {
+    post_common_service('menu/get/all?judge=10', {}, function(data) {
         zdata = [];
         for (var i = 0; i < data.length; i++) {
             var m = data[i];

VisualInspection/js/role/addpermision.js

@@ -1,6 +1,7 @@
 var permission_selectinput;
 var resource_selectinput;
 var permisiontemp;
+
 function loadPermisionData(nodedata) {
     var pnode = nodedata;
     resetform();
@@ -30,7 +31,7 @@ function loadPermisionData(nodedata) {
     //获取菜单data
     getmumdata();
 
-    $("#resourcetype").change(function () {
+    $("#resourcetype").change(function() {
 
         if (this.value == "1") {
             //菜单
@@ -45,13 +46,13 @@ function loadPermisionData(nodedata) {
 
 
     $("#permision_add_btn").off("click");
-    $("#permision_add_btn").on("click", function () {
+    $("#permision_add_btn").on("click", function() {
         addpermision();
     })
 
 }
 
-function setPermison(){
+function setPermison() {
 
     $("#permission_name").val(permisiontemp.name);
     $("#permission_des").val(permisiontemp.description);
@@ -59,10 +60,10 @@ function setPermison(){
 }
 
 
-function addpermision(){
+function addpermision() {
 
     var per_name = $("#permission_name").val();
-    if(!per_name){
+    if (!per_name) {
         layer.alert("权限名称不能为空！");
         return;
     }
@@ -72,26 +73,26 @@ function addpermision(){
     var resource_type = $("#resourcetype").val();
     var resource_id = resource_selectinput.value;
     var data = {
-        "name":per_name,
-        "description":per_des,
-        "type":resource_type,
-        "pid":per_pid,
-        "resourceid":resource_id,
-        "status":1
+        "name": per_name,
+        "description": per_des,
+        "type": resource_type,
+        "pid": per_pid,
+        "resourceid": resource_id,
+        "status": 1
     }
 
-     PermisionAdd(data,function(sus_data){
+    PermisionAdd(data, function(sus_data) {
         layer.msg('添加成功！', {
             time: 2000, //20s后自动关闭
-        }, function () {
+        }, function() {
             $('#addModal').modal('hide')
-           getPermission();
+            getPermission();
         });
-     },function(error){
+    }, function(error) {
+
+    });
 
-     });
 
-    
 
 }
 
@@ -103,7 +104,7 @@ function getbuttonData() {
         valueKey: "id",
         placeholder: "选择资源",
         selectvalue: null,
-        callback:initPerName
+        callback: initPerName
     });
     initTextChangeEvent();
 }
@@ -111,7 +112,7 @@ function getbuttonData() {
 function getmumdata() {
     var mumdata = [];
 
-    get_common_service('menu/get/all?judge=10', null, function (data) {
+    post_common_service('menu/get/all?judge=10', {}, function(data) {
         mumdata = [];
         for (var i = 0; i < data.length; i++) {
             var m = data[i];
@@ -128,20 +129,20 @@ function getmumdata() {
             data: mumdata,
             valueKey: "id",
             placeholder: "选择资源",
-            selectvalue: permisiontemp==null?null:permisiontemp.resourceid,
-            callback:initPerName
+            selectvalue: permisiontemp == null ? null : permisiontemp.resourceid,
+            callback: initPerName
         });
-    }, function (error) {
-        
+    }, function(error) {
+
     });
 
-    function initPerName(name){
-        if(!$("#permission_name").val()) $("#permission_name").val(name);
+    function initPerName(name) {
+        if (!$("#permission_name").val()) $("#permission_name").val(name);
     }
 
     function addobj(data) {
         var zdata = [];
-        if (typeof (data.childs) != "undefinde" && data.childs != null &&
+        if (typeof(data.childs) != "undefinde" && data.childs != null &&
             data.childs.length > 0) {
             for (var i = 0; i < data.childs.length; i++) {
                 var m = data.childs[i];
@@ -167,5 +168,5 @@ function resetform() {
 
     $("#permission_name").val("");
     $("#permission_des").val("");
-      $("#resourcetype").val(1);
+    $("#resourcetype").val(1);
 }

VisualInspection/js/statistics/common_statistic.js

@@ -1,16 +1,16 @@
 /**
  * 过滤掉undefined值，等于默认值，默认 ''
- * @param {*} value 
- * @param {*} default_value 
+ * @param {*} value
+ * @param {*} default_value
  */
-function GDV(value,default_value){
-    if(value != undefined){
-        return value ;
-    }else{
-        if(default_value == undefined){
+function GDV(value, default_value) {
+    if (value != undefined) {
+        return value;
+    } else {
+        if (default_value == undefined) {
             return '';
-        }else{
-            return default_value ;
+        } else {
+            return default_value;
         }
     }
 }
@@ -18,31 +18,31 @@ function GDV(value,default_value){
 /**
  * xxx分钟 转化 xx时xx分
  */
-function convertT(minute){
-    return parseInt(minute/60) +"时"+minute%60+"分";
+function convertT(minute) {
+    return parseInt(minute / 60) + "时" + minute % 60 + "分";
 }
 
 /**
  * 获取当前月份值
  * param： datet Date ,
- * return: month int 
+ * return: month int
  */
-function getM(datet){
+function getM(datet) {
     var date = new Date();
-    if(date!=undefined && datet instanceof Date){
-        date = datet ;
+    if (date != undefined && datet instanceof Date) {
+        date = datet;
     }
-    return date.getMonth() +1 ;
+    return date.getMonth() + 1;
 }
 
 /**
  * 根据Date 获取天数值
- * parm： string date 
+ * parm： string date
  * return int
  */
-function getD(date){
-    var datev = new Date(date) ;
-    return datev.getDate() ;
+function getD(date) {
+    var datev = new Date(date);
+    return datev.getDate();
 }
 
 /**
@@ -50,25 +50,24 @@ function getD(date){
  * param： fs_station_id , func 异步回调
  * return： String , List Option
  */
-function getFsEmployee(fs_station_id , func, selectId){ 
+function getFsEmployee(fs_station_id, func, selectId) {
     var param = {
-            "organid":fs_station_id
+        "organid": fs_station_id
     }
-    post_common_service("user/getFsUserList",param,function(data){
+    post_common_service("user/getFsUserList", param, function(data) {
         var resultStr = ''
-        if(data.length > 0){
-            resultStr = "<option value=''>全部</option>";  
-            for(var i=0;i<data.length;i++){
-                if(selectId == data[i].id){
-                    resultStr += "<option value="+data[i].id+" selected='selected'>"+data[i].truename+"</option>";  
-                }else{
-                    resultStr += "<option value="+data[i].id+">"+data[i].truename+"</option>";  
+        if (data.length > 0) {
+            resultStr = "<option value=''>全部</option>";
+            for (var i = 0; i < data.length; i++) {
+                if (selectId == data[i].id) {
+                    resultStr += "<option value=" + data[i].id + " selected='selected'>" + data[i].truename + "</option>";
+                } else {
+                    resultStr += "<option value=" + data[i].id + ">" + data[i].truename + "</option>";
                 }
             }
         }
         func(resultStr);
-    },function(error){
-    });
+    }, function(error) {});
 }
 
 /**
@@ -76,7 +75,7 @@ function getFsEmployee(fs_station_id , func, selectId){
  * param： center_manage_id , func 异步回调方法
  * return: String select 下 List<Option>
  */
-function getFsStationList(center_manage_id,func,hasAll){ 
+function getFsStationList(center_manage_id, func, hasAll) {
     // var param = {
     //         "parentid":center_manage_id
     // }
@@ -86,24 +85,24 @@ function getFsStationList(center_manage_id,func,hasAll){
     //         str = "<option value=''>全部</option>";
     //         if(hasAll==false) str="";
     //         for(var i=0;i<data.length;i++){
-    //             str += "<option value="+data[i].id+">"+data[i].organname+"</option>";  
+    //             str += "<option value="+data[i].id+">"+data[i].organname+"</option>";
     //         }
     //     }
     //    func(str);
     // },function(error){
     // });
     var data;
-    if(center_manage_id){
+    if (center_manage_id) {
         data = cache_road_manager_fee_list_map.get(center_manage_id);
-    }else{
+    } else {
         data = $.zui.store.get("cache_fee_station_list");
     }
     var str = '';
-    if(data && data.length > 0){
+    if (data && data.length > 0) {
         str = "<option value=''>全部</option>";
-        if(hasAll) str="";
-        for(var i=0;i<data.length;i++){
-            str += "<option value="+data[i].deptid+">"+data[i].name+"</option>";  
+        if (hasAll) str = "";
+        for (var i = 0; i < data.length; i++) {
+            str += "<option value=" + data[i].deptid + ">" + data[i].name + "</option>";
         }
     }
     func(str);
@@ -111,10 +110,10 @@ function getFsStationList(center_manage_id,func,hasAll){
 
 /**
  * 写html value
- * @param {*} selector 
- * @param {*} val 
+ * @param {*} selector
+ * @param {*} val
  */
-function WH(selector,val){
+function WH(selector, val) {
     $(selector).html(val);
 }
 
@@ -122,8 +121,8 @@ function WH(selector,val){
  * 根据选择器 回去value值
  * param： id 选择器
  * return value
- */ 
-function GV(selector){
+ */
+function GV(selector) {
     return $(selector).val();
 }
 
@@ -131,8 +130,8 @@ function GV(selector){
  * 根据选择器，获取html值
  * param：selector 选择器
  * return： html value
- */ 
-function GH(selector){
+ */
+function GH(selector) {
     return $(selector).html();
 }
 
@@ -141,28 +140,26 @@ function GH(selector){
  * param： month String 月份 ，datet Date 年份
  * return：days（ 28,29,30,31 ）
  */
-function getDays(mouth,datet){
+function getDays(mouth, datet) {
     //构造当前日期对象
     var date = new Date();
-    if(date!=undefined && datet instanceof Date){
-        date = datet ;
+    if (date != undefined && datet instanceof Date) {
+        date = datet;
     }
     //获取年份
     var year = date.getFullYear();
     //定义当月的天数；
-    var days ;
+    var days;
     //当月份为二月时，根据闰年还是非闰年判断天数
-    if(mouth == 2){
-            days= year % 4 == 0 ? 29 : 28;
-    }
-    else if(mouth == 1 || mouth == 3 || mouth == 5 || mouth == 7 || mouth == 8 || mouth == 10 || mouth == 12){
+    if (mouth == 2) {
+        days = year % 4 == 0 ? 29 : 28;
+    } else if (mouth == 1 || mouth == 3 || mouth == 5 || mouth == 7 || mouth == 8 || mouth == 10 || mouth == 12) {
         //月份为：1,3,5,7,8,10,12 时，为大月.则天数为31；
-        days= 31;
-    }
-    else{
-        days= 30;   
+        days = 31;
+    } else {
+        days = 30;
     }
-    return days ;
+    return days;
 }
 
 /**
@@ -170,26 +167,24 @@ function getDays(mouth,datet){
  * param： datet String 年份
  * return：days（ 28,29,30,31 ）
  */
-function getDaysByDate1(datet){
+function getDaysByDate1(datet) {
     //构造当前日期对象
     var date = new Date(datet);
     //获取年份
     var year = date.getFullYear();
     var mouth = date.getMonth();
     //定义当月的天数；
-    var days ;
+    var days;
     //当月份为二月时，根据闰年还是非闰年判断天数
-    if(mouth == 2){
-            days= year % 4 == 0 ? 29 : 28;
-    }
-    else if(mouth == 1 || mouth == 3 || mouth == 5 || mouth == 7 || mouth == 8 || mouth == 10 || mouth == 12){
+    if (mouth == 2) {
+        days = year % 4 == 0 ? 29 : 28;
+    } else if (mouth == 1 || mouth == 3 || mouth == 5 || mouth == 7 || mouth == 8 || mouth == 10 || mouth == 12) {
         //月份为：1,3,5,7,8,10,12 时，为大月.则天数为31；
-        days= 31;
-    }
-    else{
-        days= 30;   
+        days = 31;
+    } else {
+        days = 30;
     }
-    return days ;
+    return days;
 }
 
 
@@ -198,69 +193,67 @@ function getDaysByDate1(datet){
  * param： datet String 年份
  * return：days（ 28,29,30,31 ）
  */
-function getDaysByDate(datet){
+function getDaysByDate(datet) {
     //构造当前日期对象
     var date = new Date(datet);
     //获取年份
     var year = date.getFullYear();
-    var mouth = date.getMonth() +1 ;
+    var mouth = date.getMonth() + 1;
     //定义当月的天数；
-    var days ;
+    var days;
     //当月份为二月时，根据闰年还是非闰年判断天数
-    if(mouth == 2){
-            days= year % 4 == 0 ? 29 : 28;
-    }
-    else if(mouth == 1 || mouth == 3 || mouth == 5 || mouth == 7 || mouth == 8 || mouth == 10 || mouth == 12){
+    if (mouth == 2) {
+        days = year % 4 == 0 ? 29 : 28;
+    } else if (mouth == 1 || mouth == 3 || mouth == 5 || mouth == 7 || mouth == 8 || mouth == 10 || mouth == 12) {
         //月份为：1,3,5,7,8,10,12 时，为大月.则天数为31；
-        days= 31;
-    }
-    else{
-        days= 30;   
+        days = 31;
+    } else {
+        days = 30;
     }
-    return days ;
+    return days;
 }
 
 
 var months = new Array();
 var m = new Date().getMonth();
-var mth_pre = 12-m; 
+var mth_pre = 12 - m;
 var initDate;
 /**
  * 根据当前年月动态将13个月push数组
  */
-function month_method(){		
+function month_method() {
     // 将上一年的当前月的上个月到12月加入到数组里//改为当前月到上年同月
-    for(var i=1;i<=mth_pre+1;i++){
-        mth_handle(m,(year-1),(m++));
+    for (var i = 1; i <= mth_pre + 1; i++) {
+        mth_handle(m, (year - 1), (m++));
     }
     // 将当前年的一月份到当前月的上个月加入到数组里（改为当前月）
-    for(var i=1;i<=new Date().getMonth()+1;i++){
-        mth_handle(i,year,i);
+    for (var i = 1; i <= new Date().getMonth() + 1; i++) {
+        mth_handle(i, year, i);
     }
     // 当前年月的上个月（初始化图用）
-    if((new Date().getMonth()+'').length == 1){
-        initDate = year+"/0"+new Date().getMonth();
-    }else{
-        initDate = year+"/"+new Date().getMonth();
+    if ((new Date().getMonth() + '').length == 1) {
+        initDate = year + "/0" + new Date().getMonth();
+    } else {
+        initDate = year + "/" + new Date().getMonth();
     }
 }
 // 抽出的方法
-function mth_handle(mth,getYear,num){
-    if((mth+'').length==1){
-        months.push(((getYear)+'').substr(2)+"/0"+(num));
-    }else{
-        months.push(((getYear)+'').substr(2)+"/"+(num));
+function mth_handle(mth, getYear, num) {
+    if ((mth + '').length == 1) {
+        months.push(((getYear) + '').substr(2) + "/0" + (num));
+    } else {
+        months.push(((getYear) + '').substr(2) + "/" + (num));
     }
 }
 
 /**
  * 月份下拉框
  */
-function select_option(){
+function select_option() {
     var str = $(".div-month select");
     var temp = '';
-    for(var i=0;i<months.length;i++){
-        temp += "<option value=20"+months[i]+">20"+months[i]+"</option>"
+    for (var i = 0; i < months.length; i++) {
+        temp += "<option value=20" + months[i] + ">20" + months[i] + "</option>"
     }
     str.append(temp);
 }
@@ -269,16 +262,16 @@ function select_option(){
 /**
  * 根据当前月份 获取前13个月份
  */
-function month_method_2(){
+function month_method_2() {
     var montharray = new Array();
-    var now_month = new Date().getMonth() ;
-    for(var i= now_month ; i<13;i++){
-        montharray.push( (new Date().getFullYear()-1+'') + "/"+PrefixInteger(i,2) ) ;
+    var now_month = new Date().getMonth();
+    for (var i = now_month; i < 13; i++) {
+        montharray.push((new Date().getFullYear() - 1 + '') + "/" + PrefixInteger(i, 2));
     }
-    for(var i=1;i<=now_month+1;i++){
-        montharray.push( (new Date().getFullYear()+'')  + "/"+ PrefixInteger(i,2) );
+    for (var i = 1; i <= now_month + 1; i++) {
+        montharray.push((new Date().getFullYear() + '') + "/" + PrefixInteger(i, 2));
     }
-    return montharray ;
+    return montharray;
 }
 
 // 数字前面补0
@@ -287,29 +280,29 @@ function PrefixInteger(num, length) {
 }
 
 /**
- * 
+ *
  * @param {*} str  ep:2017/06
  * returns 2017-05-25 23:00:00
  */
-function timeTranslate(str){
-    var strs = str.split("/") ;
+function timeTranslate(str) {
+    var strs = str.split("/");
     var year = strs[0];
     var month = strs[1];
-    var month2 = month - 1 ;
-    var year2 = year ;
-    if( month2 == 0 ){
-        year2 = year2 - 1 ;
-        month2 = 12 ;
+    var month2 = month - 1;
+    var year2 = year;
+    if (month2 == 0) {
+        year2 = year2 - 1;
+        month2 = 12;
     }
-    return year2 + "-"+month2 + "-25 23:00:00" ;
+    return year2 + "-" + (month2 > 9 ? month2 + "" : "0" + month2) + "-25 23:00:00";
 }
 
 /**
- * 
- * @param {*} datet 
- * @param {*} changVal 
+ *
+ * @param {*} datet
+ * @param {*} changVal
  */
-function dateChange(datet , changVal ){
-	var tempDate = new Date(datet.valueOf() - changVal);
-	return tempDate.Format("yyyy-MM-dd HH:mm:ss");
+function dateChange(datet, changVal) {
+    var tempDate = new Date(datet.valueOf() - changVal);
+    return tempDate.Format("yyyy-MM-dd HH:mm:ss");
 }

VisualInspection/js/util/service.js

@@ -111,9 +111,9 @@ function UserDelete(data, success, fail) {
 }
 
 
-function MenuGetAll(success, fail) {
+function MenuGetAll(success, fail, body) {
     var url = base_server_url + MENU_GET_ALL
-    ajaxGet(url, "", function(response) {
+    ajaxPost(url, body, function(response) {
         var data = response;
         if (data.result_code == 0) {
             success(data.result_data)

VisualInspection/js/util/util.js

@@ -245,6 +245,29 @@ function setFeSelect(div, selectId) {
     }
 }
 
+function setSASelect(div, selectId) {
+    var feeList = $.zui.store.get("cache_sa_station_list");
+    if (feeList) {
+        setSASelectValue(feeList, div, selectId);
+    } else {
+        get_common_service("/dept/getAllSA", null, function(data) {
+            setSASelectValue(data, div, selectId);
+        });
+    }
+}
+
+function setSASelectValue(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 setFeeSelectValue(data, div, selectId) {
     var optStr = '<option value="">全部</option>';
     for (var i in data) {

VisualInspection_server/pom.xml

@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>com.xintong.visuallnspection.inteface</groupId>
 			<artifactId>visuallnspectioninteface</artifactId>
-			<version>1.0</version>
+			<version>1.0-SNAPSHOT</version>
 			<exclusions>  <exclusion>
 				<artifactId>spring-boot-starter-parent</artifactId>
 				<groupId>org.springframework.boot</groupId>
@@ -305,6 +305,11 @@
 			<name>Spring Releases</name>
 			<url>https://repo.spring.io/libs-release</url>
 		</repository>
+        <repository>
+            <id>xt-snapshots</id>
+            <name>snapshots</name>
+            <url>http://git.topm.win:9506/nexus/content/repositories/snapshots</url>
+        </repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Menu.java

@@ -19,7 +19,7 @@ public class Menu {
 	private Integer parentId;
 	// 图标类名称
 	private String iconClass;
-	// 菜单类型 10—UI 20—Api
+	// 菜单类型
 	private Integer type;
 	// 排序编号
 	private Integer sortNo;
@@ -27,4 +27,11 @@ public class Menu {
 	private Integer status;
 	
 	private List<Menu> childs;
+
+	public void setTypeE(MenuType menuType){
+	    type = menuType.getValue();
+    }
+
 }
+
+

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/MenuType.java

@@ -0,0 +1,28 @@
+package com.xintong.visualinspection.bean;
+
+/**
+ * 文件名：MemuType
+ * 版本信息：日期：2018/4/23 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+public enum MenuType {
+    SFZ(10),FWQ(20),QZD(30),CD(40);
+
+    private Integer value;
+
+    private MenuType(int value){
+        this.value = value;
+    }
+
+    public  Integer getValue(){
+        return this.value;
+    }
+
+    public static MenuType getMenuTypeByValue(int value) {
+        for (MenuType c : MenuType.values()) {
+            if (c.value == value) {
+                return c;
+            }
+        }
+        return null;
+    }
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/DepartmentController.java

@@ -155,6 +155,12 @@ public class DepartmentController extends BaseController {
     	List<FeeStation> organs = departmentService.getAllRM();
     	return returnResult(0, "获取成功", organs);
     }
+
+    @RequestMapping(value = "/getAllSA",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getAllSA(){
+        List<FeeStation> organs = departmentService.getAllSA();
+        return returnResult(0, "获取成功", organs);
+    }
     /**
      * 获取所有排障大队
      * @return

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/MenuController.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.xintong.visualinspection.bean.MenuType;
 import com.xintong.visualinspection.bean.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -93,11 +94,11 @@ public class MenuController extends BaseController {
      * @return
      */
 
-    @RequestMapping(value = "/get/all",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getAllMenu(HttpServletRequest request,@RequestParam(required=false) Integer judge){
+    @RequestMapping(value = "/get/all",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String getAllMenu(HttpServletRequest request,@RequestParam(required=false) Integer judge,@RequestBody(required = false) Menu menu){
         try{
         	User u = getCurrentUser(request);
-        	List<Menu> menus= menuService.getMenus(new Menu(),u,judge);
+        	List<Menu> menus= menuService.getMenus(menu==null?new Menu():menu,u,judge);
         	return returnResult(0, "获取成功", menus);
         }catch(Exception e){
         	throw new BusinessException(20001);

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

@@ -1,10 +1,18 @@
 package com.xintong.visualinspection.controller.gettway;
 
 import com.alibaba.dubbo.config.annotation.Reference;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.CheckAppeal;
 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.service.TaskService_F;
+import com.xintong.visualinspection.util.AuthorUtil;
+import com.xintong.visualinspection.util.Constants;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,9 +31,31 @@ public class TaskController_F extends BaseController {
             registry = "${dubbo.registry.address}")
     private TaskService_F taskService_f;
 
-    @RequestMapping(value = "/getall")
-    public String getall(HttpServletRequest request){
-        List<FwqCheckTask> ss = taskService_f.getAllTask();
+    @RequestMapping(value = "/getall/{page}/{size}")
+    public String getall(HttpServletRequest request, @PathVariable Integer page, @PathVariable Integer size,@RequestBody FwqCheckTask fwqCheckTask){
+        User user = getCurrentUser(request);
+        if(AuthorUtil.hasRole(user, Constants.ROLE_STATION_ADMIN)
+                ||AuthorUtil.hasRole(user, Constants.ROLE_STATION)
+                ||AuthorUtil.hasRole(user, Constants.ROLE_STATION_AGENT)
+                ||AuthorUtil.containsRole(user, "ROLE_STATION")){
+            fwqCheckTask.setChecked_dept((long)user.getOrganid());
+        }else if(AuthorUtil.hasRole(user, Constants.ROLE_JICHA)){
+            fwqCheckTask.setCheckman(new Long(user.getId()));
+        }
+        Object ss = taskService_f.getAllTask(page,size,fwqCheckTask);
         return super.returnSuccessResult(ss);
     }
+
+
+    @RequestMapping(value = "/update")
+    public String update(HttpServletRequest request,@Valid @RequestBody FwqCheckTask fwqCheckTask){
+        if(fwqCheckTask.getId()==null){
+            throw new BusinessException(20002);
+        }
+        User user = getCurrentUser(request);
+        fwqCheckTask.setUpdate_user(new Long(user.getId()));
+        taskService_f.updateStatus(fwqCheckTask);
+        FwqCheckTask t = taskService_f.getTask(fwqCheckTask);
+        return super.returnSuccessResult("修改成功",t);
+    }
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java

@@ -19,6 +19,7 @@ public interface DepartmentDao  {
     public List<FeeStation> getAllFS();
     public List<FeeStation> getAllRM();
     public List<WreckerGroup> getAllWG();
+    public List<FeeStation> getAllSA();
     public FeeStation getFsBydeptId(Integer id);
     
     public List<StatisticsBean> selectFeeStationGroup(User obj);

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -54,7 +54,11 @@
         SELECT *, b.parentid FROM t_br_layer_road_manager a left join t_sys_organ b on a.organ_id=b.id
     </select>
     
-     <select id="getAllWG" resultMap="FeeStationMap">
+     <select id="getAllSA" resultMap="FeeStationMap">
+        SELECT *, b.parentid FROM t_br_layer_service_area a left join t_sys_organ b on a.organ_id=b.id
+    </select>
+
+    <select id="getAllWG" resultMap="FeeStationMap">
         SELECT *, b.parentid FROM t_br_layer_wrecker_group a left join t_sys_organ b on a.organ_id=b.id
     </select>
     

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

@@ -0,0 +1,55 @@
+package com.xintong.visualinspection.service.impl;
+
+import com.xintong.visualinspection.bean.Constant;
+import com.xintong.visualinspection.bean.Job;
+import com.xintong.visualinspection.bean.Organ;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.CommonService;
+import com.xintong.visualinspection.util.CacheUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文件名：CommonServiceImpl
+ * 版本信息：日期：2018/4/25 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+@Service
+@com.alibaba.dubbo.config.annotation.Service(
+        version = "1.0.0",
+        application = "${dubbo.application.id}",
+        protocol = "${dubbo.protocol.id}",
+        registry = "${dubbo.registry.id}"
+)
+public class CommonServiceImpl implements CommonService {
+    @Override
+    public Map<String, String> getCommonDataMap() {
+        return CacheUtil.commonDataMap;
+    }
+
+    @Override
+    public Map<Long, User> getUserMap() {
+        return CacheUtil.userMap;
+    }
+
+    @Override
+    public Map<Long, Organ> getDeptMap() {
+        return CacheUtil.deptMap;
+    }
+
+    @Override
+    public Map<String, Constant> getCodeMap() {
+        return CacheUtil.codeMap;
+    }
+
+    @Override
+    public Map<String, List<Constant>> getCodeFlagMap() {
+        return CacheUtil.codeFlagMap;
+    }
+
+    @Override
+    public Map<Long, Job> getJobMap() {
+        return CacheUtil.jobMap;
+    }
+}

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

@@ -80,6 +80,12 @@ public class DepartmentServiceImpl extends BaseService implements DepartmentServ
 		return departmentDao.getAllFS();
 	}
 
+    @Override
+    public List<FeeStation> getAllSA() {
+        // TODO Auto-generated method stub
+        return departmentDao.getAllSA();
+    }
+
 	@Override
 	public List<Organ> getAll() {
 

VisualInspection_server/src/main/resources/application.properties

@@ -3,8 +3,8 @@ spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://git.topm.win:9002/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -13,8 +13,8 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 
 ## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url=jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf8
-#cluster.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url=jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url = jdbc:mysql://git.topm.win:9002/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -61,8 +61,8 @@ spring.redis.host=git.topm.win
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 #spring.redis.port=6379
 
-#spring.redis.port=7003
-spring.redis.port=9004
+spring.redis.port=9001
+#spring.redis.port=9004
 #spring.redis.port=6380
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
 spring.redis.password=xintong
@@ -124,7 +124,8 @@ dubbo.scan.basePackages  = com.xintong.visualinspection.service
 ## ApplicationConfig Bean
 dubbo.application.id = jicha_base-provider
 dubbo.application.name = jicha_base-provider
-dubbo.reference.check = false
+dubbo.reference.check=false
+dubbo.consumer.check=false
 
 # ProtocolConfig Bean
 dubbo.protocol.id = dubbo

Visuallnspection_fjq/visuallnspection_fjq/pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.xintong.visuallnspection.inteface</groupId>
             <artifactId>visuallnspectioninteface</artifactId>
-            <version>1.0</version>
+            <version>1.0-SNAPSHOT</version>
             <exclusions>  <exclusion>
                 <artifactId>spring-boot-starter-parent</artifactId>
                 <groupId>org.springframework.boot</groupId>
@@ -277,6 +277,12 @@
             <name>Spring Releases</name>
             <url>https://repo.spring.io/libs-release</url>
         </repository>
+
+        <repository>
+            <id>xt-snapshots</id>
+            <name>snapshots</name>
+            <url>http://git.topm.win:9506/nexus/content/repositories/snapshots</url>
+        </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/SystemInit.java

@@ -0,0 +1,30 @@
+package com.xintong.visualinspection.visuallnspection_fjq;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.xintong.visualinspection.service.*;
+import com.xintong.visualinspection.util.CacheUtil;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SystemInit implements CommandLineRunner {
+
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private CommonService commonService;
+
+	private static final org.slf4j.Logger logger = LoggerFactory.getLogger(SystemInit.class);
+
+
+    @Override
+    public void run(String... strings) throws Exception {
+
+        System.out.println("_________________________________________________________________");
+
+       // System.out.println(commonService.getCodeFlagMap().toString());
+    }
+}

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

@@ -3,6 +3,8 @@ package com.xintong.visualinspection.visuallnspection_fjq.dao;
 import com.xintong.visualinspection.bean.FwqCheckTask;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 文件名：FwqTaskDao
  * 版本信息：日期：2018/4/11 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
@@ -10,4 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface FwqTaskDao {
     public void addtask(FwqCheckTask fwqCheckTask);
+    public List<FwqCheckTask> getall(FwqCheckTask fwqCheckTask);
+    public void updateStatus(FwqCheckTask fwqCheckTask);
+    public FwqCheckTask getone(FwqCheckTask fwqCheckTask);
 }

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

@@ -8,11 +8,36 @@
         	end_time,checkman,checked_dept,rule_id,remark,period_id
         )
         VALUES
-        (#{name}, #{check_status},#{area_id},#{create_time},#{update_time},#{start_time},
+        (#{name}, #{check_status},#{area_id},now(),now(),#{start_time},
         	#{end_time},#{checkman},#{checked_dept},#{rule_id},#{remark},#{period_id}
         )
     </insert>
 
+
+    <select id="getone" parameterType="com.xintong.visualinspection.bean.FwqCheckTask" resultType="com.xintong.visualinspection.bean.FwqCheckTask">
+        select *,CONCAT(substr(start_time,1,16),'-',substr(end_time,12,5)) as check_period from check_task where id = #{id}
+        ORDER BY start_time DESC
+    </select>
+
+    <select id="getall" parameterType="com.xintong.visualinspection.bean.FwqCheckTask" resultType="com.xintong.visualinspection.bean.FwqCheckTask">
+        select *,CONCAT(substr(start_time,1,16),'-',substr(end_time,12,5)) as check_period from check_task where 1=1
+        <if test="period_id != null">AND period_id = #{period_id}</if>
+        <if test="checked_dept != null">AND checked_dept = #{checked_dept}</if>
+        <if test="start_time != null and end_time != null">AND start_time >= #{start_time} <![CDATA[ AND end_time < #{end_time}]]> </if>
+        <if test="check_status != null">AND check_status = #{check_status}</if>
+        <if test="checkman != null">AND checkman = #{checkman}</if>
+        <if test="area_id != null">AND area_id = #{area_id}</if>
+        ORDER BY start_time DESC
+    </select>
+
+    <update id="updateStatus" parameterType="com.xintong.visualinspection.bean.FwqCheckTask" >
+        update check_task set
+        <if test="check_status != null">check_status = #{check_status},</if>
+        update_time=now()
+        WHERE
+        id = #{id}
+    </update>
+
 </mapper>
 
 

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

@@ -7,14 +7,18 @@ package com.xintong.visualinspection.visuallnspection_fjq.service.impl;
  * @date 2018/04/11
  */
 
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.xintong.visualinspection.bean.FwqCheckTask;
+import com.xintong.visualinspection.bean.Organ;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.CommonService;
 import com.xintong.visualinspection.service.TaskService_F;
 import com.xintong.visualinspection.visuallnspection_fjq.dao.FwqTaskDao;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @com.alibaba.dubbo.config.annotation.Service(
         version = "1.0.0",
@@ -27,25 +31,50 @@ public class TaskServiceImpl implements TaskService_F {
     @Autowired
     private FwqTaskDao fwqTaskDao;
 
+    @Reference(version = "1.0.0",
+            application = "${dubbo.application.id}",
+            registry = "${dubbo.registry.address}")
+    private CommonService commonService;
+
     @Override
-    public List<FwqCheckTask> getAllTask() {
-        List<FwqCheckTask> s = new ArrayList<FwqCheckTask>();
-        for(int i=0;i<10;i++){
-            FwqCheckTask t = new FwqCheckTask();
-            t.setArea_id(1);
-            t.setCheck_status(1);
-            t.setChecked_dept(1);
-            t.setCheckman(1);
-            t.setCreate_time(new Date());
-            t.setUpdate_time(new Date());
-            t.setStart_time(new Date());
-            t.setEnd_time(new Date());
-            t.setPeriod_id(1);
-            t.setRemark("");
-            t.setName(i+"------------");
-            s.add(t);
-            fwqTaskDao.addtask(t);
+    public Object getAllTask(Integer page,Integer size,FwqCheckTask fwqCheckTasktemp) {
+        if(!(page.equals(0) && size.equals(0))){
+            PageHelper.startPage(page, size);
+        }
+        List<FwqCheckTask> fwqCheckTaskList = fwqTaskDao.getall(fwqCheckTasktemp==null?new FwqCheckTask():fwqCheckTasktemp);
+
+        Map<Long,Organ> deptMap = commonService.getDeptMap();
+        Map<Long,User> userMap = commonService.getUserMap();
+        for (FwqCheckTask fwqCheckTask:fwqCheckTaskList
+             ) {
+            if(deptMap.get(fwqCheckTask.getChecked_dept())!=null){
+                fwqCheckTask.setChecked_dept_name(deptMap.get(fwqCheckTask.getChecked_dept()).getOrganname());
+            }
+            if(userMap.get(fwqCheckTask.getCheckman())!=null){
+                fwqCheckTask.setCheckman_name(userMap.get(fwqCheckTask.getCheckman()).getTruename());
+            }
+        }
+
+        if(!(page.equals(0) && size.equals(0))){
+            return new PageInfo<FwqCheckTask>(fwqCheckTaskList);
         }
-        return s;
+        return fwqCheckTaskList;
+    }
+
+    @Override
+    public void addTask(FwqCheckTask fwqCheckTask) {
+        fwqTaskDao.addtask(fwqCheckTask);
     }
+
+    @Override
+    public void updateStatus(FwqCheckTask fwqCheckTask) {
+        fwqTaskDao.updateStatus(fwqCheckTask);
+    }
+
+    @Override
+    public FwqCheckTask getTask(FwqCheckTask fwqCheckTask) {
+        return fwqTaskDao.getone(fwqCheckTask);
+    }
+
+
 }

Visuallnspection_fjq/visuallnspection_fjq/src/main/resources/application.properties

@@ -18,11 +18,13 @@ dubbo.protocol.status = server
 ## RegistryConfig Bean
 dubbo.registry.id = fjq_service
 dubbo.registry.address = zookeeper://git.topm.win:9994
+dubbo.reference.check=false
+dubbo.consumer.check=false
 
 
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://localhost:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://git.topm.win:9002/visualinspection_2?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root

Visuallnspection_fjq/visuallnspectioninteface/.idea/workspace.xml

@@ -13,29 +13,32 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
+      <file leaf-file-name="Job.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Job.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="504">
-              <caret line="60" lean-forward="true" selection-start-line="60" selection-end-line="60" />
+            <state relative-caret-position="135">
+              <caret line="11" column="40" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="40" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="install.sh" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/install.sh">
+      <file leaf-file-name="Organ.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Organ.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+            <state relative-caret-position="135">
+              <caret line="13" column="42" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FwqCheckTask.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java">
+      <file leaf-file-name="TaskService_F.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="267">
-              <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
+            <state relative-caret-position="135">
+              <caret line="9" column="56" lean-forward="true" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -43,11 +46,20 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TaskService_F.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java">
+      <file leaf-file-name="DepartmentService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/DepartmentService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
+            <state relative-caret-position="360">
+              <caret line="29" column="39" selection-start-line="29" selection-start-column="39" selection-end-line="29" selection-end-column="39" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Role.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Role.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="11" column="41" selection-start-line="11" selection-start-column="41" selection-end-line="11" selection-end-column="41" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -64,11 +76,54 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="WreckerGroup.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/WreckerGroup.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="60">
+              <caret line="7" column="3" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FwqCheckTask.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="555">
+              <caret line="43" column="28" selection-start-line="43" selection-start-column="17" selection-end-line="43" selection-end-column="28" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CustomJsonDateDeserializer.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/CustomJsonDateDeserializer.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="105">
+              <caret line="15" column="3" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FeeStation.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FeeStation.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="12" column="47" selection-start-line="12" selection-start-column="47" selection-end-line="12" selection-end-column="47" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="Interface" />
         <option value="Class" />
       </list>
     </option>
@@ -82,11 +137,24 @@
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/bean/Role.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/service/UserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/AuthService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/install.sh" />
         <option value="$PROJECT_DIR$/install.bat" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/CodeUtil.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/UserService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/ConstantService.java" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/CacheUtil.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/CommonService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Constant.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FeeStation.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Job.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Organ.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Role.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/WreckerGroup.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/DepartmentService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/CustomJsonDateDeserializer.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java" />
       </list>
     </option>
   </component>
@@ -109,18 +177,16 @@
       </MavenImportingSettings>
     </option>
   </component>
-  <component name="ProjectFrameBounds" fullScreen="true">
-    <option name="x" value="205" />
-    <option name="y" value="403" />
-    <option name="width" value="1640" />
-    <option name="height" value="956" />
+  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
+    <option name="width" value="1440" />
+    <option name="height" value="900" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="PackagesPane">
         <subPane>
           <expand>
@@ -132,7 +198,7 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -168,6 +234,33 @@
             </path>
             <path>
               <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="visualinspection" type="462c0819:PsiDirectoryNode" />
+              <item name="bean" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="visualinspection" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="visuallnspectioninteface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="visualinspection" type="462c0819:PsiDirectoryNode" />
+              <item name="util" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="visuallnspectioninteface" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
             </path>
           </expand>
@@ -182,15 +275,23 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="/usr/local/bin/node" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.side.proportion" value="0.0" />
+    <property name="settings.editor.selected.configurable" value="preferences.updates" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.xintong.visualinspection.util" />
+      <recent name="com.xintong.visualinspection.bean" />
       <recent name="com.xintong.visualinspection.service" />
       <recent name="com.xintong.visuallnspection.bean" />
       <recent name="com.xintong.visuallnspection.service" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean" />
+      <recent name="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service" />
+      <recent name="$PROJECT_DIR$/src/main/java/com/xintong/visualinspection" />
       <recent name="$PROJECT_DIR$" />
     </key>
   </component>
@@ -282,16 +383,16 @@
       <workItem from="1522804176068" duration="3055000" />
       <workItem from="1523151336860" duration="449000" />
       <workItem from="1523428036367" duration="2235000" />
-      <workItem from="1524015022257" duration="1499000" />
+      <workItem from="1524015022257" duration="15178000" />
+      <workItem from="1524904608637" duration="753000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="12586000" />
+    <option name="totallyTimeSpent" value="27018000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -312,8 +413,8 @@
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.2921212" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1602289" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.3260606" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23748212" />
       <window_info anchor="right" id="Bean Validation" order="4" />
       <window_info id="Web" order="3" side_tool="true" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -337,6 +438,67 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Role.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="11" column="41" selection-start-line="11" selection-start-column="41" selection-end-line="11" selection-end-column="41" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/User.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="30" selection-start-line="30" selection-end-line="30" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/WreckerGroup.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="7" column="3" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="555">
+          <caret line="43" column="28" selection-start-line="43" selection-start-column="17" selection-end-line="43" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/CustomJsonDateDeserializer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FeeStation.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="12" column="47" selection-start-line="12" selection-start-column="47" selection-end-line="12" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="7" column="41" selection-start-line="7" selection-start-column="41" selection-end-line="7" selection-end-column="41" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -442,58 +604,245 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/bean/User.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visuallnspection/service/UserService.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/AuthService.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/UserService.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/User.java">
+    <entry file="file://$PROJECT_DIR$/install.sh">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="30" selection-start-line="30" selection-end-line="30" selection-end-column="50" />
+        <state relative-caret-position="60">
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java">
+    <entry file="file://$PROJECT_DIR$/install.bat">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
+        <state relative-caret-position="30">
+          <caret line="2" column="16" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/ConstantService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/JobService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/Constants.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="89" column="32" lean-forward="true" selection-start-line="89" selection-start-column="32" selection-end-line="89" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/AuthorUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/CodeUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/UserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/CacheUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="29" column="18" selection-start-line="29" selection-start-column="18" selection-end-line="29" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/CommonService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="16" column="39" lean-forward="true" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Constant.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="91">
+          <caret line="21" column="45" selection-start-line="21" selection-start-column="45" selection-end-line="21" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FeeStation.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="12" column="47" selection-start-line="12" selection-start-column="47" selection-end-line="12" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Job.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="11" column="40" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="40" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Organ.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="13" column="42" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/Role.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="267">
-          <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
+        <state relative-caret-position="135">
+          <caret line="11" column="41" selection-start-line="11" selection-start-column="41" selection-end-line="11" selection-end-column="41" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/User.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="504">
-          <caret line="60" lean-forward="true" selection-start-line="60" selection-end-line="60" />
+        <state relative-caret-position="315">
+          <caret line="30" selection-start-line="30" selection-end-line="30" selection-end-column="50" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/install.bat">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/WreckerGroup.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="16" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
+        <state relative-caret-position="60">
+          <caret line="7" column="3" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/install.sh">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/DepartmentService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+        <state relative-caret-position="360">
+          <caret line="29" column="39" selection-start-line="29" selection-start-column="39" selection-end-line="29" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/DateUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-347">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/util/CustomJsonDateDeserializer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="15" column="3" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="555">
+          <caret line="43" column="28" selection-start-line="43" selection-start-column="17" selection-end-line="43" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/xintong/visualinspection/service/TaskService_F.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="56" lean-forward="true" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
   </component>
   <component name="masterDetails">
     <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>Spring</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>1.7</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>visuallnspectioninteface</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+                <option value="0.6" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
       <state key="ProjectJDKs.UI">
         <settings>
           <last-edited>1.7</last-edited>
@@ -506,6 +855,18 @@
           </splitter-proportions>
         </settings>
       </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <last-edited>Maven: aopalliance:aopalliance:1.0</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
     </states>
   </component>
 </project>

Visuallnspection_fjq/visuallnspectioninteface/pom.xml

@@ -90,6 +90,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
         </plugins>
 

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

@@ -1,9 +1,10 @@
 package com.xintong.visualinspection.bean;
-import javax.validation.constraints.NotNull;
 
+import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
-import lombok.Data;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 
 /**
  * 
@@ -18,7 +19,7 @@ import lombok.Data;
  *
  */
 @Data
-public class Constant{
+public class Constant implements Serializable {
 	/**
 	 * serialVersionUID:TODO（用一句话描述这个变量表示什么）
 	 *

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

@@ -1,16 +1,16 @@
 package com.xintong.visualinspection.bean;
 
-import java.util.Date;
-import java.util.List;
-
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 文件名：Organ
  * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 @Data
-public class FeeStation {
+public class FeeStation implements Serializable {
     //编号
     private Integer id;
     //组织机构名称

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

@@ -1,5 +1,7 @@
 package com.xintong.visualinspection.bean;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.xintong.visualinspection.util.CustomJsonDateDeserializer;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -20,18 +22,27 @@ public class FwqCheckTask implements Serializable {
     private Date create_time;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date update_time;
+
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonDeserialize(using = CustomJsonDateDeserializer.class)
     private Date start_time;
+
+    @JsonDeserialize(using = CustomJsonDateDeserializer.class)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date end_time;
-    private Integer checkman;
-    private Integer checked_dept;
+    private Long checkman;
+    private String checkman_name;
+    private Long checked_dept;
+    private String checked_dept_name;
+    private String check_period;
     private Integer rule_id;
     private String remark;
-    private Integer recheckman;
+    private Long recheckman;
     private Integer period_id;
     private Integer invalid_from;
 
+    private Long update_user;
+
 
 //            `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '编号',
 //            `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务名称',

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

@@ -2,12 +2,14 @@ package com.xintong.visualinspection.bean;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 文件名：Job
  * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 @Data
-public class Job {
+public class Job implements Serializable {
     //编号
     private Integer id;
     //名称

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

@@ -2,6 +2,7 @@ package com.xintong.visualinspection.bean;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
@@ -10,7 +11,7 @@ import java.util.List;
  * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 @Data
-public class Organ {
+public class Organ implements Serializable {
     //编号
     private Integer id;
     //组织机构名称

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

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

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

@@ -1,16 +1,16 @@
 package com.xintong.visualinspection.bean;
 
-import java.util.Date;
-import java.util.List;
-
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 文件名：Organ
  * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 @Data
-public class WreckerGroup {
+public class WreckerGroup implements Serializable {
     //编号
     private Integer id;
     //组织机构名称

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

@@ -0,0 +1,22 @@
+package com.xintong.visualinspection.service;
+
+import com.xintong.visualinspection.bean.Constant;
+import com.xintong.visualinspection.bean.Job;
+import com.xintong.visualinspection.bean.Organ;
+import com.xintong.visualinspection.bean.User;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文件名：CommonService
+ * 版本信息：日期：2018/4/25 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+public interface CommonService {
+    public Map<String,String> getCommonDataMap();
+    public Map<Long,User> getUserMap();
+    public Map<Long,Organ> getDeptMap();
+    public Map<String,Constant> getCodeMap();
+    public Map<String,List<Constant>> getCodeFlagMap();
+    public Map<Long,Job> getJobMap();
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/ConstantService.java → Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/ConstantService.java

@@ -1,9 +1,9 @@
 package com.xintong.visualinspection.service;
 
-import java.util.List;
-
 import com.xintong.visualinspection.bean.Constant;
 
+import java.util.List;
+
 /**
  * 
  *

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/DepartmentService.java → Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/DepartmentService.java

@@ -1,19 +1,19 @@
 package com.xintong.visualinspection.service;
 
-import java.util.List;
-
 import com.xintong.visualinspection.bean.FeeStation;
 import com.xintong.visualinspection.bean.Organ;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.bean.WreckerGroup;
 
+import java.util.List;
+
 /**
  * 文件名：UserService 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 public interface DepartmentService {
 	public List<Organ> getAll();
 	
-	public List<Organ> getOrgans(Organ organ,User u);
+	public List<Organ> getOrgans(Organ organ, User u);
 
 	public void insert(Organ organ);
 
@@ -26,6 +26,8 @@ public interface DepartmentService {
 	public List<FeeStation> getAllRM();
 	
 	public List<WreckerGroup> getAllWG();
+
+    public List<FeeStation> getAllSA();
 	
 	public FeeStation getFSByDeptId(Integer dept_id);
 	

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/JobService.java → Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/JobService.java

@@ -1,9 +1,9 @@
 package com.xintong.visualinspection.service;
 
-import java.util.List;
-
 import com.xintong.visualinspection.bean.Job;
 
+import java.util.List;
+
 /**
  * 
  *

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

@@ -5,5 +5,8 @@ import com.xintong.visualinspection.bean.FwqCheckTask;
 import java.util.List;
 
 public interface TaskService_F {
-    public List<FwqCheckTask> getAllTask();
+    public Object getAllTask(Integer page,Integer size,FwqCheckTask fwqCheckTask);
+    public void addTask(FwqCheckTask fwqCheckTask);
+    public void updateStatus(FwqCheckTask fwqCheckTask);
+    public FwqCheckTask getTask(FwqCheckTask fwqCheckTask);
 }

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

@@ -18,6 +18,7 @@ public interface UserService extends UserDetailsService {
     public void insert(User user);
     public void update(User user);
     public void delete(Integer id);
+    @Override
     public UserDetails loadUserByUsername(String username);
     public int queryCountByJob(User user);
     public List<User> getAllCheckmans();

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

@@ -1,20 +1,19 @@
 package com.xintong.visualinspection.util;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.xintong.visualinspection.bean.User;
-import com.xintong.visualinspection.service.UserService;
-import org.slf4j.LoggerFactory;
-
 import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Job;
 import com.xintong.visualinspection.bean.Organ;
+import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.ConstantService;
 import com.xintong.visualinspection.service.DepartmentService;
 import com.xintong.visualinspection.service.JobService;
+import com.xintong.visualinspection.service.UserService;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class CacheUtil {
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/util/CodeUtil.java → Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CodeUtil.java

@@ -1,9 +1,9 @@
 package com.xintong.visualinspection.util;
 
-import java.util.List;
-
 import com.xintong.visualinspection.bean.Constant;
 
+import java.util.List;
+
 public class CodeUtil {
 	
 	public static Constant getCodeByFlagAndValue(String flag, String value){

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

@@ -0,0 +1,30 @@
+package com.xintong.visualinspection.util;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 文件名：CustomJsonDateDeserializer
+ * 版本信息：日期：2018/4/26 Copyright 江苏省交通规划设计院 Corporation 2018 版权所有.
+ */
+public class CustomJsonDateDeserializer extends JsonDeserializer<Date> {
+
+    @Override
+    public Date deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String date = jp.getText();
+        try {
+            return format.parse(date);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Apr 18 09:55:51 CST 2018
+#Thu Apr 26 15:03:41 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

@@ -1,5 +1,20 @@
-com/xintong/visualinspection/service/TaskService_F.class
+com/xintong/visualinspection/service/CommonService.class
+com/xintong/visualinspection/util/DateUtil.class
+com/xintong/visualinspection/util/CacheUtil.class
+com/xintong/visualinspection/bean/Organ.class
 com/xintong/visualinspection/bean/Role.class
+com/xintong/visualinspection/service/UserService.class
+com/xintong/visualinspection/bean/FeeStation.class
 com/xintong/visualinspection/bean/User.class
+com/xintong/visualinspection/util/Constants.class
+com/xintong/visualinspection/bean/Constant.class
+com/xintong/visualinspection/service/TaskService_F.class
+com/xintong/visualinspection/service/DepartmentService.class
+com/xintong/visualinspection/util/CodeUtil.class
+com/xintong/visualinspection/util/AuthorUtil.class
 com/xintong/visualinspection/bean/FwqCheckTask.class
-com/xintong/visualinspection/service/UserService.class
+com/xintong/visualinspection/service/JobService.class
+com/xintong/visualinspection/util/CustomJsonDateDeserializer.class
+com/xintong/visualinspection/bean/Job.class
+com/xintong/visualinspection/bean/WreckerGroup.class
+com/xintong/visualinspection/service/ConstantService.class

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

@@ -1,5 +1,20 @@
-/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/bean/FwqCheckTask.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/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/bean/Role.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/service/CommonService.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/service/DepartmentService.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/FwqCheckTask.java
+/Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CacheUtil.java
 /Users/wenhongquan/VisualInspection/Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/service/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/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/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