修改bug

VisualInspection/js/appeal_management/appeal_checked.js

@@ -9,7 +9,8 @@ function queryCheckedAppealTask(){
         "end_time": end_time,
         "checked_dept": $("#fsList").val(),
         // "status_search_type":1,
-        "check_status_arr":[14,15,16]
+        "check_status_arr":[14,15,16],
+        "position_id":$("#jobSelect").val()
     }
     var hide = false;
     
@@ -39,6 +40,8 @@ function queryCheckedAppealTask(){
                             'url':"/checkAppeal/getTaskList/",
                             'param':data}
                             );
+    //保存本次查询参数
+    $.zui.store.set('store_param_'+current_url,data);
 }
 
 function showTaskDetail(id){

VisualInspection/js/appeal_management/appeal_list.js

@@ -31,7 +31,25 @@ function initQueryParams() {
         forceParse: 0,
         format: "yyyy-mm-dd"
     });
-    setFeSelect("#fsList");
+    //去上次查询保留的参数
+    var store_params = $.zui.store.get('store_param_'+current_url);
+    var checked_dept = null;
+    var position_id = null;
+    if(store_params) {
+        checked_dept = store_params.checked_dept;
+        position_id = store_params.position_id;
+        $("#start_time").val(store_params.start_time.substr(0,11));
+        $("#end_time").val(store_params.end_time.substr(0,11));
+        // $("#hasScoreList").val(store_params.hasScore);
+    }
+    if(roleContains("STATION")){
+        checked_dept = getCurrentUser().organid;     
+    }
+    setFeSelect("#fsList",checked_dept);
+    if(roleContains("STATION")){
+        $("#fsList").attr('disabled','disabled');
+    }
+    setJobSelect("#jobSelect",position_id);
     //获取页面参数
     var page_params = $.zui.store.get("page_params");
     if(page_params && page_params.status) {
@@ -41,9 +59,9 @@ function initQueryParams() {
 //初始化表行按钮
 function initTableRowBtn() {
     $.zui.store.set("task_table_btn_11",[{func:'seeCheckAudit',text:'处理',icon_class:'icon-tasks'}]);
-    $.zui.store.set("task_table_btn_12",[{func:'showCheck',text:'开始稽查',icon_class:'icon-eye-open'}]);
-    $.zui.store.set("task_table_btn_13",[{func:'showCheck',text:'开始稽查',icon_class:'icon-eye-open'}]);
-    $.zui.store.set("task_table_btn_17",[{func:'showContinueCheck',text:'继续稽查',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_12",[{func:'showAppealCheck',text:'开始稽查',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_13",[{func:'showAppealCheck',text:'开始稽查',icon_class:'icon-eye-open'}]);
+    $.zui.store.set("task_table_btn_17",[{func:'showAppealContinueCheck',text:'继续稽查',icon_class:'icon-eye-open'}]);
     $.zui.store.set("task_table_btn_14",[{func:'seeCheckAudit',text:'详情',icon_class:'icon-tasks'},
                                         {func:'dispatchAppealTaskById',text:'下发',icon_class:'icon-signin'}]);
     // $.zui.store.set("task_table_btn_14",[{func:'showTaskDetail',text:'详情',icon_class:'icon-tasks'}]);
@@ -65,6 +83,7 @@ function queryAppeal(){
         "end_time": end_time,
         "checked_dept":  $("#fsList").val(),
         "check_status": cur_status,
+        "position_id":$("#jobSelect").val()
     }
     var hide = false;
     if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA) || roleContains('STATION')) {
@@ -91,13 +110,21 @@ function queryAppeal(){
                             'url':"/checkAppeal/getTaskList",
                             'param':data}
                             );
-    }
+    //保存本次查询参数
+    $.zui.store.set('store_param_'+current_url,data);
+}
 //查看稽查结果
 function seeCheckAudit(id,task_id){
     // alert("task_id:"+task_id+"---id:"+id)
     // function showTaskDetail1(id){
     var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
     post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
+        if(!data) {
+            layer.msg('未获取到申诉内容！',{
+                time: 2000//20s后自动关闭
+            });
+            return;
+        }
         $.checkTask = rowData;
         $.checkTask.appeal = data;
         console.log("申诉："+$.checkTask.appeal.id);
@@ -152,23 +179,34 @@ function queryUnAssignedTable(){
                                 );
     }
 //进入稽查页面
-function showCheck(id){
-    // $('#myModal').modal({name:"dd"});
-    // alert(id);
+function showAppealCheck(id){
     var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
     post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
+        if(!data) {
+            layer.msg('未获取到申诉内容！',{
+                time: 2000//20s后自动关闭
+            });
+            return;
+        }
         $.checkTask = rowData;
         $.checkTask.appeal = data;
-        console.log("申诉："+$.checkTask.appeal.id);
+        console.log(data);
+        // console.log("申诉："+$.checkTask.appeal.id);
         no_return_common_service('/task/update', {"id":id,"check_status":13})
         changePage("/view/mytask/check.html");
     });
 }
 //进入继续稽查页面
-function showContinueCheck(id){
+function showAppealContinueCheck(id){
     // $('#myModal').modal({name:"dd"});
     var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
     post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
+        if(!data) {
+            layer.msg('未获取到申诉内容！',{
+                time: 2000//20s后自动关闭
+            });
+            return;
+        }
         $.checkTask = rowData;
         $.checkTask.appeal = data;
         changePage("/view/mytask/check.html");

VisualInspection/js/appeal_management/appeal_submited.js

@@ -10,7 +10,8 @@ function querySubmitedAppealTask(){
         "checked_dept":  $("#fsList").val(),
         "status_search_type":2,
         "check_status":11,
-        "check_status_end":14
+        "check_status_end":14,
+        "position_id":$("#jobSelect").val()
     }
     var hide = false;
     if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA) || roleContains('STATION')) {
@@ -38,6 +39,8 @@ function querySubmitedAppealTask(){
                             'url':"/checkAppeal/getTaskList/",
                             'param':data}
                             );
+    //保存本次查询参数
+    $.zui.store.set('store_param_'+current_url,data);
 }
 
 function showTaskDetail(id){

VisualInspection/js/config.js

@@ -15,8 +15,8 @@ function getserveraddr() {
     if (base_ui_url.indexOf("jsjtyxt.com") != -1) {
         return "http://server_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
-        return "http://10.112.0.199:7001/"
-            //  return "http://localhost:8089/"
+        // return "http://10.112.0.199:7001/"
+             return "http://localhost:8089/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
     } else {

VisualInspection/js/lib/mytable.js

@@ -30,7 +30,7 @@
         this.obj = this;
         $(element).html('');
         if(flag) return;
-        $(element).append('<div class=""><div id="my_table" data-checkable="true" data-sortable="true"></div></div>'
+        $(element).append('<div class=""><div class="my_table" data-checkable="true" data-sortable="true"></div></div>'
                            + '<div id="kkpager" class="" style="text-align:center"></div>');
         this.getRemoteData(element,this.options,this);
         return this;       
@@ -66,7 +66,7 @@
                 element.tt_data=data.list;
                 options.tableData=data.list;
                 obj.setTable(data.list,element, options,p_cur); 
-                if(obj.options.pager){
+                if(obj.options.pager && options.isShoWPager){
                     options.pager = {
                         page_size:10,
                         p_cur : data.pageNum, //页号
@@ -77,9 +77,9 @@
                     obj.setPager();
                 }
                 if(data.list.length<=0){
-                    $("#kkpager").css("display","none");
+                     $("#kkpager").css("display","none");
                 }else{
-                    $("#kkpager").css("display","block");
+                     $("#kkpager").css("display","block");
                 }
             }, function(error) {
                 alert(error);
@@ -101,7 +101,7 @@
             var rowData = formatTableData(tableData, cols, p_cur);
 
             // 使用data参数更新数据：
-            $('#my_table').datatable('load',{
+            $(element).find('.my_table').datatable('load',{
                     cols: cols,
                     rows:rowData
                 }
@@ -170,7 +170,7 @@
             function clearTable(cols,options,element){
                 var checkable = options.checkable;
                 var sortable = options.sortable
-                $('#my_table').datatable( {
+                 $(element).find('.my_table').datatable( {
                     checkable:checkable,
                     sortable:sortable,
                     data: {

VisualInspection/js/lib/tags/bootstrap-tagsinput.css

@@ -0,0 +1,55 @@
+.bootstrap-tagsinput {
+  background-color: #fff;
+  border: 1px solid #ccc;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  display: inline-block;
+  padding: 4px 6px;
+  color: #555;
+  vertical-align: middle;
+  border-radius: 4px;
+  max-width: 100%;
+  line-height: 22px;
+  cursor: text;
+}
+.bootstrap-tagsinput input {
+  border: none;
+  box-shadow: none;
+  outline: none;
+  background-color: transparent;
+  padding: 0 6px;
+  margin: 0;
+  width: auto;
+  max-width: inherit;
+}
+.bootstrap-tagsinput.form-control input::-moz-placeholder {
+  color: #777;
+  opacity: 1;
+}
+.bootstrap-tagsinput.form-control input:-ms-input-placeholder {
+  color: #777;
+}
+.bootstrap-tagsinput.form-control input::-webkit-input-placeholder {
+  color: #777;
+}
+.bootstrap-tagsinput input:focus {
+  border: none;
+  box-shadow: none;
+}
+.bootstrap-tagsinput .tag {
+  margin-right: 2px;
+  color: white;
+}
+.bootstrap-tagsinput .tag [data-role="remove"] {
+  margin-left: 8px;
+  cursor: pointer;
+}
+.bootstrap-tagsinput .tag [data-role="remove"]:after {
+  content: "x";
+  padding: 0px 2px;
+}
+.bootstrap-tagsinput .tag [data-role="remove"]:hover {
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.bootstrap-tagsinput .tag [data-role="remove"]:hover:active {
+  box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}

VisualInspection/js/main.js

@@ -82,15 +82,22 @@ $(document).ready(function () {
         myTree.collapse();
 
         MENU = data;
-        //获取当前页
-        var currentpage = 0;
-        currentpage = $.zui.store.get("currentpage");
-        if (typeof (currentpage) != undefined && currentpage != null) {
-            //改变页面
-            getPageInfo(currentpage);
-        }else{
-            getPageInfo(secondMenus[0]);
-        }
+        //首先要获取任务列表页面的下拉参数，然后才能显示页面
+        getFeeList(function(data1){            
+            getFeePersonList(function(data3){
+                getJobList(function(data2){
+                    //获取当前页
+                    var currentpage = 0;
+                    currentpage = $.zui.store.get("currentpage");
+                    if (typeof (currentpage) != undefined && currentpage != null) {
+                        //改变页面
+                        getPageInfo(currentpage);
+                    }else{
+                        getPageInfo(secondMenus[0]);
+                    }
+                });
+            });
+        });
     }, function (error) { });
 
 });
@@ -123,8 +130,10 @@ function getPageInfo(id) {
             var menu = MENU[i];
             if (menu.id == id) {
                 if (typeof (menu.url) != "undefined") {
-                    changePage(menu.url);
-                    chageToPageUI(menu)
+                    // current_mid = menu.id;
+                    // alert(current_mid);
+                    redirectPage(menu.url);
+                    chageToPageUI(menu);
                     return;
                 }
                 break;
@@ -134,7 +143,9 @@ function getPageInfo(id) {
                     var mtemp = menu.childs[j];
                     if (mtemp.id == id) {
                         if (typeof (mtemp.url) != "undefined") {
-                            changePage(mtemp.url);
+                            // current_mid = menu.id;
+                            // alert(current_mid);
+                            redirectPage(mtemp.url);
                             chageToPageUI(mtemp)
                             return;
                         }
@@ -150,12 +161,16 @@ function getPageInfo(id) {
 
 }
 
-
+var current_url;//当前显示页面url
+var current_mid;//当前显示页面id
 function changePage(url) {
+    // var pre_param = $.zui.store.get('store_param_'+url);
+    // console.log(pre_param);
     if (typeof (url) != "undefined") {
         CURRENT_PAGE_URL = url;
         var page_params = GetQueryString(url);
         $.zui.store.set("page_params", page_params);
+        current_url = url;
         $("#main_content").load(base_ui_url + url);
 
         var name = $.zui.store.get(url); 
@@ -171,7 +186,11 @@ function changePage(url) {
         }
     }
 }
-
+//菜单跳转页面
+function redirectPage(url) {
+    var pre_param = $.zui.store.set('store_param_'+url, null);
+    changePage(url);
+}
 
 function GetQueryString(url)
 {
@@ -198,9 +217,9 @@ function addBreadMenu(url, name, flag){
         }
     }else{
         if(flag)
-            $("#breadcrumb_menu").html('<li murl="'+url+'" mname="'+name+'"><a href="#" onclick="changePage(\''+url+'\')">'+name+'</a></li>');
+            $("#breadcrumb_menu").html('<li murl="'+url+'" mname="'+name+'"><a href="javascript:void(0)" onclick="changePage(\''+url+'\')">'+name+'</a></li>');
         else
-            $("#breadcrumb_menu").append('<li murl="'+url+'" mname="'+name+'"><a href="#" onclick="changePage(\''+url+'\')">'+name+'</a></li>');
+            $("#breadcrumb_menu").append('<li murl="'+url+'" mname="'+name+'"><a href="javascript:void(0)" onclick="changePage(\''+url+'\')">'+name+'</a></li>');
     }        
 }
 

VisualInspection/js/mytask/check.js

@@ -209,7 +209,27 @@ function checkUserCount() {
 }
 
 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: 'checked_dept_name'},
+                {width: 40, text: '稽查人员', type: 'string', flex: true, hide:'false',colClass: '',field: 'checkman_name'},
+                {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() {
@@ -578,7 +598,7 @@ function resetUserImgInfo() {
     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="#"><label id="checked_count"></label></a>）';
+        '（次数：<a href="javascript:void(0)" onclick="showCheckDetailCount()"><label id="checked_count"></label></a>）';
     $("#user_img_container").html(str);
 }
 
@@ -765,23 +785,39 @@ function showInvalid() {
 }
 
 function submitCheck4Appeal() {
+    var appeal_result=1;
+    //询问框
+    layer.confirm('该申诉是否成功？', {
+        btn: ['成功','失败'] //按钮
+    }, 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
+        "check_status": 14,
+        "appeal_id":$.checkTask.appeal.id,
+        "appeal_result":appeal_result
     }
     no_return_common_service("/task/taskEnd/", param, function(data) {
         layer.msg("提交成功", {
             time: 2000 //20s后自动关闭
         });
-        changePage("/view/mytask/task_list.html?status=2");
+        changePage("/view/appeal_management/appeal_list.html?status=12");
     });
-
 }
-
 function showPre4Appeal(id) {
     // $('#myModal').modal({name:"dd"});
     //预览提交把任务状态改为待提交
-    no_return_common_service('/task/update', { "id": $.checkTask.id, "check_status": 17 })
+    no_return_common_service('/task/update', { "id": $.checkTask.id, "check_status": 17})
     changePage("/view/mytask/taskDetail.html");
 }
 
@@ -852,5 +888,6 @@ function saveRecheckResult() {
             offset: 'r',
             time: 2000 //20s后自动关闭
         });
+        $.checkTask.appeal = data;
     });
 }

VisualInspection/js/mytask/checked.js

@@ -9,7 +9,8 @@ function queryCheckedTask(){
         "end_time": end_time,
         "checked_dept": $("#fsList").val(),
         // "status_search_type":1,
-        "check_status_arr":[4,5,6]
+        "check_status_arr":[4,5,6],
+        "position_id":$("#jobSelect").val()
     }
     
     var cols = [
@@ -34,6 +35,8 @@ function queryCheckedTask(){
                             'url':"/task/getTaskList/",
                             'param':data}
                             );
+    //保存上次查询参数
+    $.zui.store.set('store_param_'+current_url,data);
 }
 
 function showTaskDetail(id){

VisualInspection/js/mytask/task_list.js

@@ -31,7 +31,33 @@ function initQueryParams() {
         forceParse: 0,
         format: "yyyy-mm-dd"
     });
-    setFeSelect("#fsList");
+    //去上次查询保留的参数
+    var store_params = $.zui.store.get('store_param_'+current_url);
+    var checked_dept = null;
+    var position_id = null;
+    var checked_person = null;
+    if(store_params) {
+        checked_dept = store_params.checked_dept;
+        position_id = store_params.position_id;
+        checked_person = store_params.checked_person;
+        $("#start_time").val(store_params.start_time.substr(0,11));
+        $("#end_time").val(store_params.end_time.substr(0,11));
+        $("#hasScoreList").val(store_params.hasScore);
+    }
+    if(roleContains("STATION")){
+        checked_dept = getCurrentUser().organid;     
+    }
+    setFeSelect("#fsList",checked_dept);
+    if(roleContains("STATION")){
+        $("#fsList").attr('disabled','disabled');
+    }
+    setJobSelect("#jobSelect",position_id);
+
+    setFeePersonSelect("#feePersonList",checked_person,checked_dept);
+
+    $('#fsList').change(function(){ 
+        setFeePersonSelect("#feePersonList",null,$("#fsList").val());
+    }) 
     //获取页面参数
     var page_params = $.zui.store.get("page_params");
     if(page_params && page_params.status) {
@@ -39,11 +65,13 @@ function initQueryParams() {
     }
     if(cur_status==4){
         $("#dispatchPatchBtn").show(); 
+        $("#checkPersonDiv").show();
     }
 
     if(cur_status==4 || cur_status==5 || cur_status==6){
         $("#hasScoreDiv").show();       
     }
+
 }
 //初始化表行按钮
 function initTableRowBtn() {
@@ -68,7 +96,10 @@ function queryTask(){
         "checked_dept": $("#fsList").val(),
         "check_status":cur_status,
         "hasScore":$("#hasScoreList").val(),
+        "position_id":$("#jobSelect").val(),
+        "checked_person": $("#feePersonList").val(),
     }
+    // console.log(data);
     var hide = false;
     if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA)|| roleContains('STATION')) {
         hide = true;
@@ -98,6 +129,7 @@ function queryTask(){
                             'url':"/task/getTaskList/",
                             'param':data}
                             );
+    $.zui.store.set('store_param_'+current_url,data);
 }
 //进入稽查页面
 function showCheck(id){

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -502,7 +502,7 @@
                                         var liStr="";
                                         for(var mm=0;mm<data[i].list.length;mm++){
                                             var obj = data[i].list[mm];
-                                            liStr+="<li style='list-style-type:none;font-size:11px;color:#777777'>"+obj.start_time.substr(11,5)+"-"+obj.end_time.substr(11,5)+" "+obj.user_name+"</li>";
+                                            liStr+="<li style='list-style-type:none;font-size:12px;color:#777777'>"+obj.start_time.substr(11,5)+"-"+obj.end_time.substr(11,5)+" "+obj.user_name+"</li>";
                                         }
                                         $(".c-"+data[i].class_type+"-"+data[i].lane+" ul").append(liStr);
                                     for(var j=0;j<data[i].list.length;j++){

VisualInspection/js/util/util.js

@@ -157,7 +157,6 @@ function deleteItem4Common(id,url,okCb,offset){
     });
 }
 
-
 function addOrUpdateItem4Common(param,url,okCb){
     no_return_common_service(url, param, function(data) {
         if(okCb) okCb();//重新加载表格数据
@@ -168,20 +167,33 @@ function addOrUpdateItem4Common(param,url,okCb){
         alert(error);
     });
 }
-function setFeSelect(div,selectId){
+function getFeeList(callback){
     get_common_service("/dept/getAllFs",null,function(data){
-        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);
+        $.zui.store.set("cache_fee_station_list",data);
+        callback(data);
     });
 }
-
+function setFeSelect(div,selectId){
+    var feeList = $.zui.store.get("cache_fee_station_list");
+    if(feeList){
+        setFeeSelectValue(feeList,div,selectId);
+    }else{
+        get_common_service("/dept/getAllFs",null,function(data){
+            setFeeSelectValue(data,div,selectId);
+        });
+    }
+}
+function setFeeSelectValue(data,div,selectId){
+    var optStr = '<option value="">全部</option>';
+    for(var i in data) {
+        if(data[i].deptid==selectId)
+            optStr += '<option value="'+data[i].deptid+'" selected="selected">'+data[i].name+'</option>';
+        else
+            optStr += '<option value="'+data[i].deptid+'">'+data[i].name+'</option>';
+    }
+    $(div).html('');
+    $(div).html(optStr);
+}
 function setLaneSelect(div,selectId){
     var optStr = '';
     var data =[];
@@ -393,20 +405,132 @@ function setTeamUserSelect(div,selectId,classId){
         $(div).html(optStr);
     });
 }
-
-function setJobSelect(div,selectId){
+function getJobList(callback){
     var param={
         "dept_id":1
     };
     post_common_service("/job/getList/",param,function(data){
-        var optStr = '<option value="">全部</option>';
-        for(var i in data) {
-            if(data[i].id==selectId)
-                optStr += '<option value="'+data[i].id+'" selected="selected">'+data[i].name+'</option>';
-            else
-                optStr += '<option value="'+data[i].id+'">'+data[i].name+'</option>';
+        $.zui.store.set("cache_job_list",data);
+        callback(data);
+    });
+}
+function setJobSelect(div,selectId){
+    var jobList = $.zui.store.get("cache_job_list");
+    if(jobList) {
+        setJobSelectValue(jobList,div,selectId);
+    }else{
+        var param={
+            "dept_id":1
+        };
+        post_common_service("/job/getList/",param,function(data){
+            setJobSelectValue(data,div,selectId);
+        });
+    }
+}
+
+function setJobSelectValue(data,div,selectId){
+    var optStr = '<option value="">全部</option>';
+    for(var i in data) {
+        if(data[i].id==selectId)
+            optStr += '<option value="'+data[i].id+'" selected="selected">'+data[i].name+'</option>';
+        else
+            optStr += '<option value="'+data[i].id+'">'+data[i].name+'</option>';
+    }
+    $(div).html('');
+    $(div).html(optStr);
+}
+var cache_fee_person_list_map;
+function getFeePersonList(callback){
+    // var param={
+    //     "dept_id":1
+    // };
+    post_common_service("/user/getFsUserList/",{},function(data){
+        $.zui.store.set("cache_fee_person_list",data);
+        var map= new Map();
+        for(var i=0;i<data.length;i++) {
+            if(!map.get(data[i].organid)){
+                map.put(data[i].organid,[]);
+            }
+            var arr = map.get(data[i].organid);
+            arr.push(data[i]);
         }
-        $(div).html('');
-        $(div).html(optStr);
+        cache_fee_person_list_map = map;
+        callback(data);
     });
+}
+function setFeePersonSelect(div,selectId,deptId){
+    var jobList = $.zui.store.get("cache_fee_person_list");
+    if(deptId) {
+        var map = cache_fee_person_list_map;
+        jobList = map.get(deptId);
+    }
+    if(jobList) {
+        setFeePersonSelectValue(jobList,div,selectId);
+    }else{
+        post_common_service("/user/getFsUserList/",{},function(data){
+            setFeePersonSelectValue(data,div,selectId);
+        });
+    }
+}
+
+function setFeePersonSelectValue(data,div,selectId){
+    var optStr = '<option value="">全部</option>';
+    for(var i in data) {
+        if(data[i].id==selectId)
+            optStr += '<option value="'+data[i].id+'" selected="selected">'+data[i].truename+'</option>';
+        else
+            optStr += '<option value="'+data[i].id+'">'+data[i].truename+'</option>';
+    }
+    $(div).html('');
+    $(div).html(optStr);
+}
+
+/**
+ * 自定义Map对象
+ */
+function Map() {
+ 
+    var mapObj = {};
+ 
+    this.put = function (key, value) {
+        mapObj[key] = value;
+    };
+ 
+    this.remove = function (key) {
+        if (mapObj.hasOwnProperty(key)) {
+            delete mapObj[key];
+        }
+    };
+ 
+    this.get = function (key) {
+        if (mapObj.hasOwnProperty(key)) {
+            return mapObj[key];
+        }
+        return null;
+    };
+ 
+    this.getKeys = function () {
+        var keys = [];
+        for(var k in mapObj){
+            keys.push(k);
+        }
+        return keys;
+    };
+ 
+    // 遍历map
+    this.each = function(fn){
+        for(var key in mapObj){
+            fn(key, mapObj[key]);
+        }
+    };
+ 
+    this.toString = function () {
+        var str = "{";
+        for(var k in mapObj){
+            str += "\""+ k+"\" : \""+mapObj[k]+"\",";
+        }
+        str = str.substring(0,str.length - 1) ;
+        str += "}";
+        return str;
+    }
 }

VisualInspection/view/appeal_management/appeal_checked.html

@@ -19,6 +19,13 @@
                     <button class="btn btn-primary " type="button" onclick="queryCheckedAppealTask()">查询</button>
                 </div>
             </div>
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">职位</label>
+                <div class="col-sm-2" style="width:200px;">
+                    <select class="form-control" id="jobSelect">
+                    </select>
+                </div>
+            </div>
         </form>
     </div>
     <br>
@@ -53,7 +60,25 @@
             forceParse: 0,
             format: "yyyy-mm-dd"
         });
-        setFeSelect("#fsList");
+        //去上次查询保留的参数
+        var store_params = $.zui.store.get('store_param_'+current_url);
+        var checked_dept = null;
+        var position_id = null;
+        if(store_params) {
+            checked_dept = store_params.checked_dept;
+            position_id = store_params.position_id;
+            $("#start_time").val(store_params.start_time.substr(0,11));
+            $("#end_time").val(store_params.end_time.substr(0,11));
+            // $("#hasScoreList").val(store_params.hasScore);
+        }
+        if(roleContains("STATION")){
+            checked_dept = getCurrentUser().organid;     
+        }
+        setFeSelect("#fsList",checked_dept);
+        if(roleContains("STATION")){
+            $("#fsList").attr('disabled','disabled');
+        }
+        setJobSelect("#jobSelect",position_id);
         queryCheckedAppealTask();
     });
 </script>

VisualInspection/view/appeal_management/appeal_list.html

@@ -21,6 +21,13 @@
                         <button class="btn btn-primary " type="button" id="conditional_query" onclick="queryAppeal()">查询</button>
                     </div>
                 </div>
+                <div class="form-group">
+                    <label for="exampleInputAccount1" class="col-sm-1">职位</label>
+                    <div class="col-sm-2" style="width:200px;">
+                        <select class="form-control" id="jobSelect">
+                        </select>
+                    </div>
+                </div>
             </form>
         </div>
         <hr style="margin-top:0px;">

VisualInspection/view/appeal_management/appeal_submited.html

@@ -19,6 +19,13 @@
                     <button class="btn btn-primary " type="button" onclick="querySubmitedAppealTask()">查询</button>
                 </div>
             </div>
+             <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">职位</label>
+                <div class="col-sm-2" style="width:200px;">
+                    <select class="form-control" id="jobSelect">
+                    </select>
+                </div>
+            </div>
         </form>
     </div>
     <br>
@@ -53,7 +60,25 @@
             forceParse: 0,
             format: "yyyy-mm-dd"
         });
-        setFeSelect("#fsList");
+        //去上次查询保留的参数
+        var store_params = $.zui.store.get('store_param_'+current_url);
+        var checked_dept = null;
+        var position_id = null;
+        if(store_params) {
+            checked_dept = store_params.checked_dept;
+            position_id = store_params.position_id;
+            $("#start_time").val(store_params.start_time.substr(0,11));
+            $("#end_time").val(store_params.end_time.substr(0,11));
+            // $("#hasScoreList").val(store_params.hasScore);
+        }
+        if(roleContains("STATION")){
+            checked_dept = getCurrentUser().organid;     
+        }
+        setFeSelect("#fsList",checked_dept);
+        if(roleContains("STATION")){
+            $("#fsList").attr('disabled','disabled');
+        }
+        setJobSelect("#jobSelect",position_id);
         querySubmitedAppealTask();
     });
 </script>

VisualInspection/view/common/commoncsslink.html

@@ -8,5 +8,6 @@
 <link rel="stylesheet" type="text/css" href="/js/lib/slide/css/bootstrap-slider.min.css">
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">
 <link rel="stylesheet" type="text/css" href="/js/lib/webuploader/webuploader.css">  
+<link rel="stylesheet" type="text/css" href="/js/lib/tags/bootstrap-tagsinput.css"> 
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/uploader/zui.uploader.min.css">
 <link href="/node_modules/zui/dist/lib/chosen/chosen.min.css" rel="stylesheet">

VisualInspection/view/common/commonscriptlink.html

@@ -21,6 +21,7 @@
 <script src="/js/lib/webuploader/webuploader.js"></script>
 <script type="text/javascript" src="/js/lib/combotree/icontains.js"></script>
 <script type="text/javascript" src="/js/lib/combotree/comboTreePlugin.js"></script>
+<script src="/js/lib/tags/tagsbootstrap-tagsinput.min.js"></script>
 <script src="/js/util/util.js"></script>
 <script src="/js/util/service.js"></script>
 <script src="/js/constant/constant.js"></script>

VisualInspection/view/mytask/check.html

@@ -19,7 +19,7 @@
                     <!-- 使用图片 -->
                     <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="#" onclick="showCheckDetailCount()">次数<label id="checked_count"></label></a>
+                    <a href="javascript:void(0)" onclick="showCheckDetailCount()">次数<label id="checked_count"></label></a>
                 </div>
                 <div class="col-sm-1">
                     <button class="btn btn-primary " type="button" onclick="showChangeUser()">更改考核人员</button>
@@ -180,6 +180,9 @@
         </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>

VisualInspection/view/mytask/checked.html

@@ -15,10 +15,27 @@
                     <select class="form-control" id="fsList">
                     </select>
                 </div>
+                <div id="hasScoreDiv" style="display:none;" class="form-group col-sm-2">
+                    <label for="exampleInputAccount1" class="col-sm-5">扣分</label>
+                    <div class="col-sm-7">
+                        <select class="form-control" id="hasScoreList">
+                            <option value="" selected>全部</option>
+                            <option value="1">有</option>
+                            <option value="2">无</option>    
+                        </select>
+                    </div>
+                </div>
                 <div class="col-sm-2">
                     <button class="btn btn-primary " type="button" onclick="queryCheckedTask()">查询</button>
                 </div>
             </div>
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">职位</label>
+                <div class="col-sm-2" style="width:200px;">
+                    <select class="form-control" id="jobSelect">
+                    </select>
+                </div>
+            </div>
         </form>
     </div>
     <hr style="margin-top:0px;">
@@ -53,7 +70,19 @@
             forceParse: 0,
             format: "yyyy-mm-dd"
         });
-        setFeSelect("#fsList");
+        //去上次查询保留的参数
+        var store_params = $.zui.store.get('store_param_'+current_url);
+        var checked_dept = null;
+        var position_id = null;
+        if(store_params) {
+            checked_dept = store_params.checked_dept;
+            position_id = store_params.position_id;
+            $("#start_time").val(store_params.start_time.substr(0,11));
+            $("#end_time").val(store_params.end_time.substr(0,11));
+            $("#hasScoreList").val(store_params.hasScore);
+        }
+        setFeSelect("#fsList",checked_dept);
+        setJobSelect("#jobSelect",position_id);
         queryCheckedTask();
     });
 </script>

VisualInspection/view/mytask/checked_task_list..html

@@ -0,0 +1,5 @@
+
+<div class="container-fluid ">
+    <hr style="margin-top:0px;">
+    <div class="datatable" id="checked_user_task_datatable"></div>
+</div>

VisualInspection/view/mytask/taskDetail.html

@@ -129,8 +129,10 @@
     function initBtns() {
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_2",["#submitBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_3",["#submitBtn"]);
+        $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_7",["#submitBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_12",["#submitAppealBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_13",["#submitAppealBtn"]);
+        $.zui.store.set("task_detail_btn_"+ROLE_JICHA+"_17",["#submitAppealBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA_ADMIN+"_4",["#backBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA_ADMIN+"_6",["#backConfirmBtn"]);
         $.zui.store.set("task_detail_btn_"+ROLE_JICHA_ADMIN+"_11",["#assignBtn"]);
@@ -275,19 +277,34 @@
     }
 
     function submitCheck4Appeal(){
+        var appeal_result=1;
+        //询问框
+        layer.confirm('该申诉是否成功？', {
+            btn: ['成功','失败'] //按钮
+        }, function(){
+            appeal_result=1;
+            submitAppealResult(appeal_result);
+        }, function(){
+            appeal_result=2;
+            submitAppealResult(appeal_result);
+        });     
+    }
+    function submitAppealResult(appeal_result){
         var param = {
             "id": $.checkTask.id,
-            "check_status":14
+            "check_status": 14,
+            "appeal_id":$.checkTask.appeal.id,
+            "appeal_result":appeal_result
         }
         no_return_common_service("/task/update/",param,function(data){
-             layer.msg("提交成功", {
+            layer.msg("提交成功", {
                 time: 2000//20s后自动关闭
-             });
-            changePage("/view/mytask/task_list.html?status=13");
+            });
+            var currentpage = $.zui.store.get("currentpage");
+            getPageInfo(currentpage);
+            // changePage("/view/appeal_management/appeal_list.html?status=13");
         });
-        
     }
-
     var appealLayer;
     function showAppeal(){
         // appealLayer = showPopup4Common('申诉',saveAppeal,'600px','#appealDetail-div');

VisualInspection/view/mytask/task_list.html

@@ -18,10 +18,27 @@
                         <select class="form-control" id="fsList">
                         </select>
                     </div>
-                    <!--<div class="col-sm-4">
-                        <select class="form-control" id="fsUserList">
+                </div>
+                <div id="checkPersonDiv" style="display:none;"  class="form-group col-sm-2">
+                    <label for="exampleInputAccount1" class="col-sm-5">考核人</label>
+                    <div class="col-sm-7">
+                        <select class="form-control" id="feePersonList">
                         </select>
-                    </div>-->
+                    </div>
+                </div>
+                
+                <div class="form-group col-sm-2">
+                    <button class="btn btn-primary " type="button" onclick="queryTask()">查询</button>
+                    <div id="dispatchPatchBtn" style="float:right;display:none;">
+                        <button class="btn btn-success" type="button" onclick="dispatchTaskPatch()"><i class="icon icon-plus-sign"></i> 一键下发</button>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">职位</label>
+                <div class="col-sm-2" style="width:200px;">
+                    <select class="form-control" id="jobSelect">
+                    </select>
                 </div>
                 <div id="hasScoreDiv" style="display:none;" class="form-group col-sm-2">
                     <label for="exampleInputAccount1" class="col-sm-5">扣分</label>
@@ -33,12 +50,6 @@
                         </select>
                     </div>
                 </div>
-                <div class="form-group col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryTask()">查询</button>
-                    <div id="dispatchPatchBtn" style="float:right;display:none;">
-                        <button class="btn btn-success" type="button" onclick="dispatchTaskPatch()"><i class="icon icon-plus-sign"></i> 一键下发</button>
-                    </div>
-                </div>
             </div>
         </form>
     </div>

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

@@ -71,5 +71,6 @@ public class CheckAppeal {
     private Long recheckman;
     //第二次稽查人
     private String recheckman_name;
-    
+    //申诉结果
+    private Integer appeal_result;
 }

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

@@ -82,4 +82,12 @@ public class Task{
     private Integer[] check_status_arr;
     
     private Integer class_type;
+    
+    private Integer position_id;
+    
+    private Integer period_id;
+    //申诉结果
+    private Integer appeal_result;
+    //申诉id
+    private Long appeal_id;
 }

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

@@ -77,7 +77,8 @@ public class CheckAppealController extends BaseController {
     @RequestMapping(value = "/update")
     public String update(@Valid @RequestBody CheckAppeal checkAppeal){
     	checkAppealService.update(checkAppeal);
-    	return super.returnSuccessResult("修改成功");
+    	CheckAppeal ca = checkAppealService.getById(checkAppeal.getId());
+    	return super.returnSuccessResult("修改成功",ca);
     }
     
     /**

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

@@ -16,10 +16,12 @@ import org.springframework.web.bind.annotation.RestController;
 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.Task;
 import com.xintong.visualinspection.bean.TaskStatus;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.bean.UserClassCount;
+import com.xintong.visualinspection.service.CheckAppealService;
 import com.xintong.visualinspection.service.TaskService;
 import com.xintong.visualinspection.util.AuthorUtil;
 import com.xintong.visualinspection.util.CacheUtil;
@@ -35,8 +37,9 @@ public class TaskController extends BaseController {
 
     @Autowired
     private TaskService taskService;
-
-   
+    @Autowired
+    private CheckAppealService checkAppealService;
+    
     /**
      * 添加考核任务
      * @return
@@ -80,6 +83,12 @@ public class TaskController extends BaseController {
     	User user = getCurrentUser(request);
     	task.setUpdate_user(new Long(user.getId()));
     	taskService.update(task);
+    	if(task.getAppeal_result()!=null && task.getAppeal_id()!=null){
+    		CheckAppeal checkAppeal = new CheckAppeal();
+    		checkAppeal.setId(task.getAppeal_id());
+    		checkAppeal.setAppeal_result(task.getAppeal_result());
+    		checkAppealService.update(checkAppeal);
+    	}
     	return super.returnSuccessResult("修改成功");
     }
     
@@ -272,4 +281,17 @@ public class TaskController extends BaseController {
     	List<UserClassCount> countList = taskService.getUserCount(task);
     	return super.returnSuccessResult(countList);
     }
+    
+    /**
+     * 查询一个周期用户被考核任务详情
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getUserCheckedTaskByPage/{page}/{size}")
+    public String getUserCheckedTaskByPage(@PathVariable Integer page,@PathVariable Integer size,@RequestBody Task task){
+    	List<Task> taskList = taskService.getTaskList(task);
+    	return super.returnSuccessResult(new PageInfo(taskList));
+    }
 }

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

@@ -204,9 +204,4 @@ public class UserController extends BaseController {
         	throw new BusinessException(20001);
         }
     }
-
-
-    
-    
-    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/TaskDao.java

@@ -31,4 +31,5 @@ public interface TaskDao  {
     public void deleteInvalidTaskCount(Long task_id);
     public void updateInvalidTaskCount(Task task);
     public List<UserClassCount> getUserCount(Task task);
+    public List<Task> getUserCountTask(Task task);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/CheckAppealMapper.xml

@@ -14,8 +14,7 @@
         <result column="appeal_reason" property="appeal_reason" jdbcType="VARCHAR" />
         <result column="recheck_result" property="recheck_result" jdbcType="VARCHAR" />
         <result column="remark" property="remark" jdbcType="VARCHAR" />
-        <result column="remark" property="appeal_reason" jdbcType="VARCHAR" />
-        <result column="remark" property="recheck_result" jdbcType="VARCHAR" />
+        <result column="appeal_result" property="appeal_result" jdbcType="VARCHAR" />
         
         
         <result column="name" property="name" jdbcType="VARCHAR" />
@@ -70,6 +69,7 @@
         SET
         <if test="check_status != null">check_status = #{check_status}</if>
         <if test="recheck_result != null">recheck_result = #{recheck_result}</if>
+        <if test="appeal_result != null">appeal_result = #{appeal_result}</if>
         WHERE
         id = #{id}
     </update>

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

@@ -21,6 +21,7 @@
         <result column="remark" property="remark" jdbcType="VARCHAR" />
         <result column="check_period" property="check_period" jdbcType="VARCHAR" />
         <result column="class_type" property="class_type" jdbcType="INTEGER" />
+        <result column="period_id" property="period_id" jdbcType="INTEGER" />
     </resultMap>
     <resultMap id="taskStatusMap" type="com.xintong.visualinspection.bean.TaskStatus">
         <id property="id" column="ID"/>
@@ -58,27 +59,28 @@
     </select>
     
     <select id="getList" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >
-        SELECT *,
-        		CONCAT(substr(start_time,1,16),'-',substr(end_time,12,5)) as check_period,
-              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=check_status) as check_status_name
-        FROM check_task
+        SELECT t.*,
+        		CONCAT(substr(t.start_time,1,16),'-',substr(t.end_time,12,5)) as check_period,
+              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=t.check_status) as check_status_name
+        FROM check_task t left join t_sys_users u on t.checked_person=u.id
         WHERE 1=1
-        	<if test="check_status != null">AND check_status = #{check_status}</if>
-        	<if test="check_status_end != null">AND check_status &lt;= #{check_status_end}</if>
-        	<if test="start_time != null">AND start_time &gt;= #{start_time}</if>
-        	<if test="end_time != null">AND end_time &lt;= #{end_time}</if>
-        	<if test="checked_dept != null">AND checked_dept = #{checked_dept}</if>
-        	<if test="checkman != null">AND checkman = #{checkman}</if>
-        	<if test="recheckman != null">AND recheckman = #{recheckman}</if>
-        	<if test="checked_person != null">AND checked_person = #{checked_person}</if>
+        	<if test="check_status != null">AND t.check_status = #{check_status}</if>
+        	<if test="check_status_end != null">AND t.check_status &lt;= #{check_status_end}</if>
+        	<if test="start_time != null">AND t.start_time &gt;= #{start_time}</if>
+        	<if test="end_time != null">AND t.end_time &lt;= #{end_time}</if>
+        	<if test="checked_dept != null">AND t.checked_dept = #{checked_dept}</if>
+        	<if test="checkman != null">AND t.checkman = #{checkman}</if>
+        	<if test="recheckman != null">AND t.recheckman = #{recheckman}</if>
+        	<if test="checked_person != null">AND t.checked_person = #{checked_person}</if>
+        	<if test="position_id != null">AND u.positionid = #{position_id}</if>
         	<if test="hasScore == 1">AND 
-        		id in (select task_id from check_score)
+        		t.id in (select task_id from check_score)
         	</if>
         	<if test="hasScore == 2">AND 
-        		id not in (select task_id from check_score)
+        		t.id not in (select task_id from check_score)
         	</if>
         	<if test="dispatch_ids != null and dispatch_ids.length > 0">AND
-        		id in 
+        		t.id in 
         		<foreach collection="dispatch_ids" item="dispatch_id" index="index"
 		            open="(" close=")" separator=",">
 		            #{dispatch_id}
@@ -87,32 +89,33 @@
     </select>
     
     <select id="getListInStatus" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >
-        SELECT *,
-        		CONCAT(substr(start_time,1,16),'-',substr(end_time,12,5)) as check_period,
-              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=check_status) as check_status_name
-        FROM check_task
+        SELECT t.*,
+        		CONCAT(substr(t.start_time,1,16),'-',substr(t.end_time,12,5)) as check_period,
+              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=t.check_status) as check_status_name
+        FROM check_task t left join t_sys_users u on t.checked_person=u.id
         WHERE 1=1
        		<if test="check_status_arr != null and check_status_arr.length > 0">AND
-        		check_status in 
+        		t.check_status in 
         		<foreach collection="check_status_arr" item="status" index="index"
 		            open="(" close=")" separator=",">
 		            #{status}
 		        </foreach>
         	</if>
-        	<if test="start_time != null">AND start_time &gt;= #{start_time}</if>
-        	<if test="end_time != null">AND end_time &lt;= #{end_time}</if>
-        	<if test="checked_dept != null">AND checked_dept = #{checked_dept}</if>
-        	<if test="checkman != null">AND checkman = #{checkman}</if>
-        	<if test="recheckman != null">AND recheckman = #{recheckman}</if>
-        	<if test="checked_person != null">AND checked_person = #{checked_person}</if>
+        	<if test="start_time != null">AND t.start_time &gt;= #{start_time}</if>
+        	<if test="end_time != null">AND t.end_time &lt;= #{end_time}</if>
+        	<if test="checked_dept != null">AND t.checked_dept = #{checked_dept}</if>
+        	<if test="checkman != null">AND t.checkman = #{checkman}</if>
+        	<if test="recheckman != null">AND t.recheckman = #{recheckman}</if>
+        	<if test="checked_person != null">AND t.checked_person = #{checked_person}</if>
+        	<if test="position_id != null">AND u.positionid = #{position_id}</if>
         	<if test="hasScore == 1">AND 
-        		id in (select task_id from check_score)
+        		t.id in (select task_id from check_score)
         	</if>
         	<if test="hasScore == 2">AND 
-        		id not in (select task_id from check_score)
+        		t.id not in (select task_id from check_score)
         	</if>
         	<if test="dispatch_ids != null and dispatch_ids.length > 0">AND
-        		id in 
+        		t.id in 
         		<foreach collection="dispatch_ids" item="dispatch_id" index="index"
 		            open="(" close=")" separator=",">
 		            #{dispatch_id}
@@ -120,18 +123,19 @@
         	</if>
     </select>
     <select id="getListByChecked" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >
-        SELECT *,
-        	  CONCAT(substr(start_time,1,16),'-',substr(end_time,11,6)) as check_period,
-              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=check_status) as check_status_name
-        FROM check_task
+        SELECT t.*,
+        	  CONCAT(substr(t.start_time,1,16),'-',substr(t.end_time,11,6)) as check_period,
+              (select a.code_name from sys_code a where a.code_flag='task_status' and a.code_value=t.check_status) as check_status_name
+        FROM check_task  t left join t_sys_users u on t.checked_person=u.id
         WHERE 1=1
-        	<if test="check_status != null">AND check_status &gt;= #{check_status}</if>
-        	<if test="start_time != null">AND start_time &gt;= #{start_time}</if>
-        	<if test="end_time != null">AND end_time &lt;= #{end_time}</if>
-        	<if test="checked_dept != null">AND checked_dept = #{checked_dept}</if>
-        	<if test="checkman != null">AND checkman = #{checkman}</if>
-        	<if test="recheckman != null">AND recheckman = #{recheckman}</if>
-        	<if test="checked_person != null">AND checked_person = #{checked_person}</if>
+        	<if test="check_status != null">AND t.check_status &gt;= #{check_status}</if>
+        	<if test="start_time != null">AND t.start_time &gt;= #{start_time}</if>
+        	<if test="end_time != null">AND t.end_time &lt;= #{end_time}</if>
+        	<if test="checked_dept != null">AND t.checked_dept = #{checked_dept}</if>
+        	<if test="checkman != null">AND t.checkman = #{checkman}</if>
+        	<if test="recheckman != null">AND t.recheckman = #{recheckman}</if>
+        	<if test="period_id != null">AND t.period_id = #{period_id}</if>
+        	<if test="checked_person != null">AND t.checked_person = #{checked_person}</if>
     </select>
 
 	<select id="getListBySubmited" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >