Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/js/assess_management/assess_item.js

@@ -45,7 +45,8 @@
          edittype = "add"
          loadData(nodedata);
          $("#add_btn").html("添加");
-         $('#addModal').modal('show')
+         $('#addModal').modal('show');
+         $(".check_item_score").hide();
      })
 
      $("#dept_edit").on("click", function() {
@@ -61,6 +62,7 @@
          loadData(nodedata)
          $("#add_btn").html("修改");
          $('#addModal').modal('show');
+         $(".check_item_score").hide();
      });
 
      $("#dept_delete").on("click", function() {
@@ -81,6 +83,18 @@
         }, function(error){ })
      });
 
+     // 增加考核项
+     $("#add_check_item").click(function(){
+         var nodedata = check_item_tree.getSelectedNodes();
+         edittype = "add"
+         $("#add_btn").data("tree_flag",1);
+         loadData(nodedata);
+         $("#add_btn").html("添加");
+         $('#addModal').modal('show');
+         $(".check_item_score").show();
+         $("#add_btn").data("tree_flag",0);
+     })
+
      $('.datatable').datatable({
          checkable: false,
          sortable: false,
@@ -173,8 +187,10 @@ function delete_check_item(id ){
      function getTree(obj,rowObj){
         var userdata = {};
         userdata["checked"] = false;
-        userdata["data"] = [++seq, obj.name, (obj.score!=null?obj.score:""), '<a href="javascript:void(0)" onclick="modify_check_item('+ obj.id +')"  ><i class="icon icon-edit"></i> 修改</a><a href="javascript:void(0)" onclick="delete_check_item('+ obj.id +')" ><i class="icon icon-remove-circle"></i> 删除</a>'];
-        rowObj.push(userdata);
+        if(obj.score != null){
+            userdata["data"] = [++seq, obj.name, (obj.score!=null?obj.score:""), '<a href="javascript:void(0)" onclick="modify_check_item('+ obj.id +')"  ><i class="icon icon-edit"></i> 修改</a><a href="javascript:void(0)" onclick="delete_check_item('+ obj.id +')" ><i class="icon icon-remove-circle"></i> 删除</a>'];
+            rowObj.push(userdata);
+        }
 
         if(obj.subCheckItem!=null){
             for(var i=0; i<obj.subCheckItem.length;i++ ){
@@ -257,6 +273,7 @@ function delete_check_item(id ){
              zdataItem["name"] = m.name;
              zdataItem["open"] = true;
              zdataItem["children"] = addobj(m);
+              zdataItem.open = true ;
              zdata.push(zdataItem);
          }
          check_item_tree = $.fn.zTree.init($("#check_rule_tree"), setting, zdata)
@@ -270,6 +287,9 @@ function delete_check_item(id ){
          for (var i = 0; i < data.subCheckItem.length; i++) {
              var m = data.subCheckItem[i];
              var zdataItem = {};
+             if(m.score != null){
+                 continue;
+             }
              zdataItem["id"] = m.id;
              zdataItem["value"] = m.id;
              zdataItem["pId"] = data.id;
@@ -278,6 +298,7 @@ function delete_check_item(id ){
              zdataItem["name"] = m.name;
              zdataItem["open"] = true;
              zdataItem["children"] = addobj(m);
+             zdataItem.open = true ;
              zdata.push(zdataItem);
          }
          return zdata;
@@ -317,7 +338,17 @@ function loadData(nodedata) {
             selectvalue: pnode.length > 0 ? pnode[0].id : null
         });
     }else{
-        $(".check_item_group").hide();
+        if($("#add_btn").data("tree_flag")==1){
+            dept_selectinput = new TreeSelect({
+                element: '#check_item_select',
+                data: zdata,
+                valueKey: "id",
+                placeholder: "选择考核项分类"
+            });
+            $(".check_item_group").show();
+        }else{
+            $(".check_item_group").hide();
+        }
     }
 }
 
@@ -338,6 +369,18 @@ function addCheckItem() {
         return ;
     }
 
+    if(!$(".check_item_score").is(":hidden")){
+        if(pid==null){
+            tip("请选择考核项分类");
+            return ;
+        }
+        if(score == ''){
+            tip("请选择考核项的分数");
+            return ;
+        }
+    }
+
+
     var data = {
         "name": name,
         "score":score,

VisualInspection/js/assess_management/assess_way.js

@@ -9,8 +9,8 @@ function queryTable(){
     var cols = [
                     {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
                     {width: 160, text: '考核办法', flex: false,colClass: 'text-center',field:'name'},
-                    {width: 80, text: '被考核部门',  flex: true, colClass: 'text-center',field:'checked_dept_id'},
-                    {width: 100, text: '被考核职位',  flex: true, colClass: 'text-center',field:'checked_position_id'},
+                    {width: 80, text: '被考核部门',  flex: true, colClass: 'text-center',field:'checked_dept_name'},
+                    {width: 100, text: '被考核职位',  flex: true, colClass: 'text-center',field:'checked_position_name'},
                     {width: 100, text: '考核项',  flex: false, type: 'string',colClass: 'text-center modity-flag',field:'checked_item_num' },
                     {width: 80, text: '操作',  flex: false, colClass: 'text-center',field:'id',oper:[
                          {func:'deleteCheckRule',text:'删除',col_class:'icon-remove-circle'}
@@ -21,6 +21,7 @@ function queryTable(){
                             'url':"/checkRule/getAllRule/",
                             'param':data}
                             );
+     $('#addModal').modal('hide');
 }
 
 // 删除
@@ -30,34 +31,110 @@ function deleteCheckRule(id){
 
 function showAddCheckRule(){
     $('#check_rule_name,#dep_id,#position_id').val('');
-    showPopup4Common('添加考核办法',function(){
-       return addOrUpdateCheckRule("/checkRule/add");
-    },'400px');
+    // showPopup4Common('添加考核办法',function(){
+    //    return addOrUpdateCheckRule("/checkRule/add");
+    // },'400px');
+     $('#addModal').modal('show');
+}
+
+var all_data = [];
+
+var dept_selectinput;
+
+// 查询所有的考核项
+get_common_service("/dept/get/all","",function(data){
+    all_data = [];
+    for (var i = 0; i < data.length; i++) {
+        var m = data[i];
+        var zdataItem = {};
+        zdataItem["id"] = m.id;
+        zdataItem["value"] = m.id;
+        zdataItem["pId"] = null;
+        zdataItem["name"] = m.organname;
+        zdataItem["children"] = addobj(m);
+        all_data.push(zdataItem);
+    }
+    dept_init();
+},function(error){})
+
+function addobj(data) {
+    var zdata = [];
+    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];
+            var zdataItem = {};
+            zdataItem["id"] = m.id;
+            zdataItem["value"] = m.id;
+            zdataItem["pId"] = data.id;
+            zdataItem["icon"] = "";
+            zdataItem["name"] = m.organname;
+            zdataItem["children"] = addobj(m);
+            zdata.push(zdataItem);
+        }
+        return zdata;
+    } else {
+        return [];
+    }
+}
+
+
+
+$("#check_item_select").delegate("#treeSelect_panel_0","blur",function(){
+    if($("#treeSelect_panel_0").is(":hidden")){
+        if(dept_selectinput.value !="" && dept_selectinput.value != null){
+            getJob(dept_selectinput.value);
+        }
+    }
+})
+
+
+function dept_init(){
+    dept_selectinput = new TreeSelect({
+            element: '#check_item_select',
+            data: all_data,
+            valueKey: "id",
+            placeholder: "请选择部门"
+    });
+}
+
+/**
+ * 检索部门下的职位
+ */
+function getJob(dept_id){
+    var data = {"dept_id": dept_id};
+    post_common_service("/job/getList", data , function(data){
+        $("#position_id").empty();
+         $("#position_id").append("<option value=''>请选择职位</option>");
+        for(var i=0;i<data.length;i++){
+            $("#position_id").append("<option value='"+data[i].id+"'>"+data[i].name+"</option>")
+        }
+    }, function(error){});
 }
 
 /**
  * 添加考核办法 - 保存
  */
-function addOrUpdateCheckRule(url){
+function addOrUpdateCheckRule(){
     if(idVal("check_rule_name") == ''){
         tip("请输入考核办法");
         return false;
     }
-    if(idVal("dep_id") == ''){
-        tip("请选择部门");
-        return false;
-    }
     if(idVal("position_id") == ''){
         tip("请选择职位");
         return false;
     }
+    if(dept_selectinput.value==null || dept_selectinput.value==''){
+        tip("请选择部门信息");
+        return false ;
+    }
     var param ={
         "name":idVal("check_rule_name") ,
-        "checked_dept_id":idVal("dep_id"),
+        "checked_dept_id":dept_selectinput.value,
         "checked_position_id":idVal("position_id"),
         "checked_person_type":1
     };
-    addOrUpdateItem4Common(param,url,queryTable);
+    addOrUpdateItem4Common(param,"/checkRule/add",queryTable);
 }
 
 function idVal(id){

VisualInspection/js/assess_management/assess_way_edit.js

@@ -201,9 +201,10 @@ function delete_check_item(id ){
      function getTree(obj,rowObj){
         var userdata = {};
         userdata["checked"] = false;
-        userdata["data"] = [++seq, obj.name, (obj.score!=null?obj.score:""), '<a href="javascript:void(0)" onclick="delete_check_item('+ obj.id +')" ><i class="icon icon-remove-circle"></i> 删除</a>'];
-        rowObj.push(userdata);
-
+        if(obj.score != null){
+            userdata["data"] = [++seq, obj.name, (obj.score!=null?obj.score:""), '<a href="javascript:void(0)" onclick="delete_check_item('+ obj.id +')" ><i class="icon icon-remove-circle"></i> 删除</a>'];
+            rowObj.push(userdata);
+        }
         if(obj.subCheckItem!=null){
             for(var i=0; i<obj.subCheckItem.length;i++ ){
                 getTree(obj.subCheckItem[i],rowObj);
@@ -289,6 +290,7 @@ function delete_check_item(id ){
              zdataItem["score"] = m.score ;
              zdataItem["name"] = m.name;
              zdataItem["children"] = addobj(m);
+             zdataItem.open = true ;
              zdata.push(zdataItem);
          }
          check_item_tree = $.fn.zTree.init($("#department_tree"), setting, zdata)
@@ -306,6 +308,7 @@ function delete_check_item(id ){
              zdataItem["score"] = m.score ;
              zdataItem["name"] = m.name;
              zdataItem["children"] = addobj(m);
+             zdataItem.open = true ;
              all_data.push(zdataItem);
          }
      },function(error){})
@@ -319,6 +322,9 @@ function delete_check_item(id ){
          for (var i = 0; i < data.subCheckItem.length; i++) {
              var m = data.subCheckItem[i];
              var zdataItem = {};
+              if(m.score != null){
+                 continue;
+              }
              zdataItem["id"] = m.id;
              zdataItem["value"] = m.id;
              zdataItem["pId"] = data.id;
@@ -326,6 +332,7 @@ function delete_check_item(id ){
              zdataItem["icon"] = "";
              zdataItem["name"] = m.name;
              zdataItem["children"] = addobj(m);
+             zdataItem.open = true ;
              zdata.push(zdataItem);
          }
          return zdata;

VisualInspection/js/config.js

@@ -1,6 +1,6 @@
-var base_ui_url = "http://192.168.68.126:8081/";
-var base_server_url = "http://192.168.68.126:8089/";
+// var base_ui_url = "http://192.168.68.126:8081/";
+// var base_server_url = "http://192.168.68.126:8089/";
 var base_image_server_url = "http://192.168.68.126:8080/";
 
-// var base_ui_url = "http://192.168.31.233:8080/";
-// var base_server_url = "http://192.168.31.233:8089/";
+var base_ui_url = "http://localhost:8080/";
+var base_server_url = "http://localhost:8089/";

VisualInspection/js/mytask/check.js

@@ -1,214 +1,219 @@
-function initCheck(){
-    
-        // 仅选择日期
-        $("#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) {
-            setFeSelect("#fsList",$.checkTask.deptid);
-            setLaneSelect("#lane",$.checkTask.checked_location);
-            get_common_service('user/getUserById/'+$.checkTask.checked_person, null, function(data){
-               changePersonContent(data);
-            }) 
-            //查询评分情况
-            queryScores();
-        }
+function initCheck() {
+
+    alert(getVideoPosition())
+
+    // 仅选择日期
+    $("#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) {
+        setFeSelect("#fsList", $.checkTask.deptid);
+        setLaneSelect("#lane", $.checkTask.checked_location);
+        get_common_service('user/getUserById/' + $.checkTask.checked_person, null, function (data) {
+            changePersonContent(data);
+        })
+        //查询评分情况
+        queryScores();
+    }
 }
 
-function initInfo(){
+function initInfo() {
 
 }
 // 使用data参数更新数据：
-function queryScores(){
+function queryScores() {
     var data = {
         "task_id": $.checkTask.id
     }
     var cols = [
-                {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
-                {width: 160, text: '评分记录', type: 'string', flex: true, sort: 'down',field: 'content'},
-                {width: 80, text: '分数', type: 'string', flex: true, colClass: '',field: 'check_item_score'},
-                // {width: 80, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'},
-                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
-                    oper:[
-                        {func:'showEditScore',text:'修改',icon_class:'icon-edit'},
-                        {func:'deleteScore',text:'删除',icon_class:'icon-remove-circle'}
-                    ]
-                }
-            ];
-    
+        { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
+        { width: 160, text: '评分记录', type: 'string', flex: true, sort: 'down', field: 'content' },
+        { width: 80, text: '分数', type: 'string', flex: true, colClass: '', field: 'check_item_score' },
+        // {width: 80, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'},
+        {
+            width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+            oper: [
+                { func: 'showEditScore', text: '修改', icon_class: 'icon-edit' },
+                { func: 'deleteScore', text: '删除', icon_class: 'icon-remove-circle' }
+            ]
+        }
+    ];
+
     // var pager = {
     //     page_size:10
     // }
-    $('#score_datatable').mytable({'cols':cols,
-                            'url':"/score/getScoreList/",
-                            'param':data}
-                            );
+    $('#score_datatable').mytable({
+        'cols': cols,
+        'url': "/score/getScoreList/",
+        'param': data
+    }
+    );
 }
-function showEditScore(id){
+function showEditScore(id) {
     // deleteItem4Common(id,"/score/delete/",queryScores);
-    var rowData=getItemByIdFromArr(id,$('#score_datatable').mytable('getTableData'));
+    var rowData = getItemByIdFromArr(id, $('#score_datatable').mytable('getTableData'));
     // scoreDetailLayer = showPopup4Common('修改考核项',null,['600px','500px'],'#score-detail-div');
     // var rowData=getItemByIdFromArr(id,$('#score_datatable').mytable('getTableData'));
     showPics(rowData.pics);
     // $("#scoreContent").val(rowData.content);
 }
 
-function deleteScore(id){
-    deleteItem4Common(id,"/score/delete/",queryScores);
+function deleteScore(id) {
+    deleteItem4Common(id, "/score/delete/", queryScores);
 }
 
-function showPics(pics,divId){
-    var picStr='';
-    if(!divId) divId = '#img_container';
+function showPics(pics, divId) {
+    var picStr = '';
+    if (!divId) divId = '#img_container';
     $(divId).html(picStr);
-    if(pics){
+    if (pics) {
         var picArr = pics.split(',');
-        for(var i in picArr){
-            var pic = '<div id="img_item_'+i+'" class="col-md-4 col-sm-6 col-lg-3">'
-                +  '<a href="javascript:void(0)" onclick="removeImg(\'#img_item_'+i+'\')" style="float:right;position:absolute;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
-                +  '<a class="card lightbox-toggle" href="'+picArr[i]+'" style="position:absolute">'
-                +      '<img class="pic-class img-thumbnail" style="width:100px;height:70px;" src="'+picArr[i]+'" alt="">'
-                +  '</a>'
-                +'</div>';
-            picStr+=pic;
+        for (var i in picArr) {
+            var pic = '<div id="img_item_' + i + '" class="col-md-4 col-sm-6 col-lg-3">'
+                + '<a href="javascript:void(0)" onclick="removeImg(\'#img_item_' + i + '\')" style="float:right;position:absolute;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
+                + '<a class="card lightbox-toggle" href="' + picArr[i] + '" style="position:absolute">'
+                + '<img class="pic-class img-thumbnail" style="width:100px;height:70px;" src="' + picArr[i] + '" alt="">'
+                + '</a>'
+                + '</div>';
+            picStr += pic;
         }
         $(divId).html(picStr);
         $('a.lightbox-toggle').lightbox();
     }
 }
 
-function removeImg(img_id){
+function removeImg(img_id) {
     $(img_id).remove();
 }
 
-function clearAllImg(){
+function clearAllImg() {
     $('#img_container').empty();
 }
 var changePersonLayer;
-function showChangeUser(){
-    var param ={
-        'organid':$.checkTask.dept_id
+function showChangeUser() {
+    var param = {
+        'organid': $.checkTask.dept_id
     };
-    post_common_service("/user/getUserList/",param,function(data){
-        changePersonLayer = showPopup4Common('更改人员',null,'800px');
+    post_common_service("/user/getUserList/", param, function (data) {
+        changePersonLayer = showPopup4Common('更改人员', null, '800px');
         $("#user_container").empty();
-        var userStr="";
-        for(var i in data){
+        var userStr = "";
+        for (var i in data) {
             var name = data[i].truename;
-            if(data[i].workno) name=data[i].workno+" "+name;
+            if (data[i].workno) name = data[i].workno + " " + name;
             var pic = "../../images/body-bg.png";
-            if(data[i].pic) pic=data[i].pic;
-            str='<div style="width:100px;float:left;margin:5px;">'
-                    +'<a class="card" href="javascript:void(0)" onclick="changePerson(\''+data[i].id+'\')">'
-                    +   '<img src="'+pic+'" alt="" style="height:100px">'
-                    // +   '<a href="#" onclick="changePerson(\''+name+'\')">'+name+'<a href="'+data[i].pic+'class="lightbox-toggle" data-toggle="lightbox" data-group="image-group-1"><img src="../../images/img4.jpg" class="img-rounded" alt="" width="50px"></a></a>'
-                    +  '<div class="card-heading"><strong>'+name+'</strong></div>'
-                    +'</a>'
-                +'</div>';
-            userStr+=str;
+            if (data[i].pic) pic = data[i].pic;
+            str = '<div style="width:100px;float:left;margin:5px;">'
+                + '<a class="card" href="javascript:void(0)" onclick="changePerson(\'' + data[i].id + '\')">'
+                + '<img src="' + pic + '" alt="" style="height:100px">'
+                // +   '<a href="#" onclick="changePerson(\''+name+'\')">'+name+'<a href="'+data[i].pic+'class="lightbox-toggle" data-toggle="lightbox" data-group="image-group-1"><img src="../../images/img4.jpg" class="img-rounded" alt="" width="50px"></a></a>'
+                + '<div class="card-heading"><strong>' + name + '</strong></div>'
+                + '</a>'
+                + '</div>';
+            userStr += str;
         }
         $("#user_container").html(userStr);
     })
 }
 
-function changePerson(id){
+function changePerson(id) {
     // $('#checked_person').html(id);
-    get_common_service('user/getUserById/'+id, null, function(data){
+    get_common_service('user/getUserById/' + id, null, function (data) {
         changePersonContent(data);
-    }) 
+    })
     layer.close(changePersonLayer);
 }
 
-function changePersonContent(data){
+function changePersonContent(data) {
     var name = data.truename;
-    if(data.workno) name=data.workno+" "+data.truename;
+    if (data.workno) name = data.workno + " " + data.truename;
     $("#checked_person").html(name);
-    $("#person_img").attr("href",data.pic);
-    $("#person_img > img").attr("src",data.pic);
+    $("#person_img").attr("href", data.pic);
+    $("#person_img > img").attr("src", data.pic);
     $('a.lightbox-toggle').lightbox();
 }
 var scoreLayer;
-function showScore(){
-    scoreLayer = showPopup4Common('选择考核项',null,['400px','500px'],'#items-div');
+function showScore() {
+    scoreLayer = showPopup4Common('选择考核项', null, ['400px', '500px'], '#items-div');
     buildTree();
 }
-function buildTree(){
-     var zTreeObj;
-     var zNodes = [];
-     check_item_tree = $.fn.zTree.init($("#items_tree"), {}, zNodes);
+function buildTree() {
+    var zTreeObj;
+    var zNodes = [];
+    check_item_tree = $.fn.zTree.init($("#items_tree"), {}, zNodes);
 
-     getCheckItems();
+    getCheckItems();
 }
-function getCheckItems(){
+function getCheckItems() {
     function zTreeOnRename(event, treeId, treeNode, isCancel) {
-         alert(treeNode.tId + ", " + treeNode.name);
-     }
+        alert(treeNode.tId + ", " + treeNode.name);
+    }
 
-     function zTreeOnRemove(event, treeId, treeNode) {
-         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 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
+        }
+    };
 
-     get_common_service('checkItem/getAll',null,function(data) {
-         zdata = [];
-         for (var i = 0; i < data.length; i++) {
-             var m = data[i];
+    get_common_service('checkItem/getAll', null, function (data) {
+        zdata = [];
+        for (var i = 0; i < data.length; i++) {
+            var m = data[i];
             //  var zdataItem = {};
             //  zdataItem["id"] = m.id;
             //  zdataItem["value"] = m.id;
@@ -217,19 +222,19 @@ function getCheckItems(){
             //  zdataItem["name"] = m.name;
             //  zdataItem["open"] = true;
             //  zdataItem["children"] = addobj(m);
-             zdata.push(genNode(m));
-         }
-         menu_tree = $.fn.zTree.init($("#items_tree"), setting, zdata)
-     }, function(error) {
+            zdata.push(genNode(m));
+        }
+        menu_tree = $.fn.zTree.init($("#items_tree"), setting, zdata)
+    }, function (error) {
 
-     });
+    });
 }
 function addobj(data) {
-     var zdata = [];
-     if (typeof(data.subCheckItem) != "undefinde" && data.subCheckItem != null &&
-         data.subCheckItem.length > 0) {
-         for (var i = 0; i < data.subCheckItem.length; i++) {
-             var m = data.subCheckItem[i];
+    var zdata = [];
+    if (typeof (data.subCheckItem) != "undefinde" && data.subCheckItem != null &&
+        data.subCheckItem.length > 0) {
+        for (var i = 0; i < data.subCheckItem.length; i++) {
+            var m = data.subCheckItem[i];
             //  var zdataItem = {};
             //  zdataItem["id"] = m.id;
             //  zdataItem["value"] = m.id;
@@ -241,105 +246,114 @@ function addobj(data) {
             //     zdataItem["name"] = m.name+'('+m.score+')';
             //  zdataItem["open"] = true;
             //  zdataItem["children"] = addobj(m);
-             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;
-        zdataItem["children"] = addobj(m);    
-        return   zdataItem;
- }
- 
- function zTreeOnClick(event, treeId, treeNode) {
+            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;
+    zdataItem["children"] = addobj(m);
+    return zdataItem;
+}
+
+function zTreeOnClick(event, treeId, treeNode) {
     //alert(treeNode.name);
     var imgArr = $("#img_container .pic-class");
-    var picsStr="";
-    if(imgArr && imgArr.length>0) {
-        for(var i=0;i<imgArr.length;i++){
-            picsStr+=imgArr[i].src+","
+    var picsStr = "";
+    if (imgArr && imgArr.length > 0) {
+        for (var i = 0; i < imgArr.length; i++) {
+            picsStr += imgArr[i].src + ","
         }
-        picsStr = picsStr.substr(0,picsStr.length-1);
+        picsStr = picsStr.substr(0, picsStr.length - 1);
     }
     var param = {
-        'task_id':$.checkTask.id,
-        'pics':picsStr,
-        'name':treeNode.value,
-        'content':treeNode.value,
-        'check_item_id':treeNode.id,
-        'checkman':treeNode.id,
-        'checked_person':$.checkTask.checked_person,
-        'checked_dept':$.checkTask.checked_dept
+        'task_id': $.checkTask.id,
+        'pics': picsStr,
+        'name': treeNode.value,
+        'content': treeNode.value,
+        'check_item_id': treeNode.id,
+        'checkman': treeNode.id,
+        'checked_person': $.checkTask.checked_person,
+        'checked_dept': $.checkTask.checked_dept
     };
-    no_return_common_service("/score/add",param, function(data){
-        if(scoreLayer) layer.close(scoreLayer);
+    no_return_common_service("/score/add", param, function (data) {
+        if (scoreLayer) layer.close(scoreLayer);
         //查询评分情况
         queryScores();
         layer.msg(data, {
             time: 2000//20s后自动关闭
         });
     });
- }
+}
 
- function submitCheck(){
-        var param = {
-            "id": $.checkTask.id,
-            "check_status":4
-        }
-        no_return_common_service("/task/taskEnd/",param,function(data){
-             layer.msg(data, {
-                time: 2000//20s后自动关闭
-             });
-            changePage("/view/mytask/unchecked.html");
-        });
-        
+function submitCheck() {
+    var param = {
+        "id": $.checkTask.id,
+        "check_status": 4
     }
-function showPre(id){
+    no_return_common_service("/task/taskEnd/", param, function (data) {
+        layer.msg(data, {
+            time: 2000//20s后自动关闭
+        });
+        changePage("/view/mytask/unchecked.html");
+    });
+
+}
+function showPre(id) {
     // $('#myModal').modal({name:"dd"});
     changePage("/view/mytask/taskDetail.html");
 }
 function showInvalid() {
-    invalidLayer = showPopup4Common('申请无效',function(){
+    invalidLayer = showPopup4Common('申请无效', function () {
         saveValidReason();
-    },['400px','500px'],'#invalid_div');
+    }, ['400px', '500px'], '#invalid_div');
 
 }
-function saveValidReason(){
+function saveValidReason() {
     var param = {
         "task_id": $.checkTask.id,
-        "apply_reason":$("#apply_reason").val()
+        "apply_reason": $("#apply_reason").val()
     }
-    no_return_common_service("/checkApply/add/",param,function(data){
+    no_return_common_service("/checkApply/add/", param, function (data) {
         layer.msg("申请提交成功", {
             time: 2000//20s后自动关闭
-            });
+        });
         changePage("/view/mytask/unchecked.html");
     });
 }
 
 
-function score(score){
-    alert("扣分："+score);
+function score(score) {
+    alert("扣分：" + score);
     $('#scoreWin').modal('toggle');
 }
 
-function refuseApply(){
+function refuseApply() {
     alert("拒绝申请");
     $('#refuseApplyWin').modal('toggle');
 }
 
-function agreeApply(){
+function agreeApply() {
     alert("同意申请");
+}
+
+
+function getVideoPosition() {
+    var X = $('#tabContent1').offset().top;
+    var Y = $('#tabContent1').offset().left;
+    var width = $('#tabContent1').width();
+    var height = $('#tabContent1').height();
+    return X + "|" + Y+ "|" +width+ "|" + height;
 }

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -1,8 +1,10 @@
   
    $(document).ready(function() {
 
+         $("#main_content_title").html("收费人员排班")
+
         // 用户的dept_id
-        var user_dept_id = 12 ;
+        var user_dept_id = '' ;
         
         // 收费小组type
         var team_type = 1 ;
@@ -23,18 +25,38 @@
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":getCurrentMonthFirst(),
-                "end_time":getCurrentMonthLast()
+                "end_time":getCurrentMonthLast(),
+                 'type':team_type
             }
             if(data_param != undefined){
                 data = data_param ;
             }
             getTeamClass(data,function(data){
                 var newEvents = [];
+
+                 // 这里轮训给每天都增加一个事件
+               
+                var date = new Date();
+                var end_date =new Date(getCurrentMonthLast2()) ;
+                if(data_param != undefined){
+                    date =  new Date(data_param.start_time);
+                    end_date = new Date(data_param.end_time) ;
+                }
+
+
+                for(var i =0;i<31;i++){
+                    if( date.setDate(i+1) <= end_date ){
+                        var obj =  {id:-1 ,desc:'详细排班' ,title: '+详细排班',  start:date.format('yyyy-MM-dd'), end: date.format('yyyy-MM-dd'),color:'#bd7b46'};
+                        newEvents.push(obj);
+                    }
+                }
+
                 // console.log(data);
                 for(var i=0;i<data.length;i++){
                     var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: data[i].start_time, end: data[i].end_time};
                     newEvents.push(obj);
                 }
+               
                 calendar.addEvents(newEvents);
             })
         }
@@ -72,6 +94,17 @@
             return new Date(nextMonthFirstDay-oneDay).toLocaleDateString()+" 00:00:00";
         }
 
+
+        // 当月最后一天
+        function getCurrentMonthLast2(){
+            var date=new Date();
+            var currentMonth=date.getMonth();
+            var nextMonth=++currentMonth;
+            var nextMonthFirstDay=new Date(date.getFullYear(),nextMonth,1);
+            var oneDay=1000*60*60*24;
+            return new Date(nextMonthFirstDay-oneDay).toLocaleDateString()+" 23:59:00";
+        }
+
         // 上一个月或者下个月的第一天或者最后一天
         function getMonthByCondition(pre_or_after,first_or_last){
             if(first_or_last == 'first'){
@@ -92,8 +125,13 @@
         }
 
         $('#calendar').calendar().on("clickEvent.zui.calendar", function(event) {
-            // console.log(event);
-            click_function(event.event.start);
+            // console.log(event。event.id);
+            if(event.event.id == -1){
+                // 这边负责添加整个页面的数据 按车道排班
+                $('#add_fee_station').modal();
+            }else{
+                click_function(event.event.start);
+            }
         });
 
         /**
@@ -107,7 +145,8 @@
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":date.format("yyyy-MM-dd 00:00:00"),
-                "end_time": date.format("yyyy-MM-dd 00:00:00")
+                "end_time": date.format("yyyy-MM-dd 00:00:00"),
+                 'type':team_type
             }
 
             getTeamClass(data,function(data){
@@ -139,7 +178,8 @@
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":getMonthByCondition(date_cursor,'first').format("yyyy-MM-dd 00:00:00"),
-                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00")
+                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00"),
+                 'type':team_type
             }
             updateCalendar(data);
         });
@@ -150,7 +190,8 @@
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":getMonthByCondition(date_cursor,'first').format("yyyy-MM-dd 00:00:00"),
-                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00")
+                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00"),
+                 'type':team_type
             }
             updateCalendar(data);
         });

VisualInspection/js/teamClass/check_team_schedule.js

@@ -1,8 +1,10 @@
     
    $(document).ready(function() {
 
+         $("#main_content_title").html("稽查人员排班")
+
         // 用户的dept_id
-        var user_dept_id = 1 ;
+        var user_dept_id = '' ;
         
         // 稽查小组type
         var team_type = 2 ;
@@ -23,7 +25,8 @@
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":getCurrentMonthFirst(),
-                "end_time":getCurrentMonthLast()
+                "end_time":getCurrentMonthLast(),
+                 'type':team_type
             }
             if(data_param != undefined){
                 data = data_param ;
@@ -108,7 +111,8 @@
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":date.format("yyyy-MM-dd 00:00:00"),
-                "end_time": date.format("yyyy-MM-dd 00:00:00")
+                "end_time": date.format("yyyy-MM-dd 00:00:00"),
+                 'type':team_type
             }
 
             getTeamClass(data,function(data){
@@ -140,7 +144,8 @@
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":getMonthByCondition(date_cursor,'first').format("yyyy-MM-dd 00:00:00"),
-                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00")
+                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00"),
+                 'type':team_type
             }
             updateCalendar(data);
         });
@@ -151,7 +156,8 @@
             var data = {
                 "dept_id": user_dept_id ,
                 "start_time":getMonthByCondition(date_cursor,'first').format("yyyy-MM-dd 00:00:00"),
-                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00")
+                "end_time": getMonthByCondition(date_cursor,'last').format("yyyy-MM-dd 00:00:00"),
+                 'type':team_type
             }
             updateCalendar(data);
         });
@@ -168,7 +174,7 @@
             for(var i=0;i<$("select[id*='_term']").length;i++){
                 if($("select[id*='_term']").eq(i).val()!=""){
                     var obj = {
-                        "class_type":i+1,
+                        "class_type":4,
                         "team_id":$("select[id*='_term']").eq(i).val(),
                         "work_date": $("#save_term_class").data("date")+" 00:00:00",
                         "start_time": $("#save_term_class").data("date")+" 00:00:00",

VisualInspection/view/assess_management/assess_item.html

@@ -27,7 +27,7 @@
                     <div class="panel-heading">
                         <span class="title">考核项详情</span>
                         <div class="panel-actions">
-                            <!--<button type="button" class="btn" data-toggle="tooltip" title="添加人员"><i class="icon-plus"></i></button>-->
+                            <button type="button" class="btn" id="add_check_item" title="添加考核项"><i class="icon-plus"></i></button>
                         </div>
                     </div>
                     <div class="panel-body no-padding" style="padding:0">
@@ -56,10 +56,10 @@
                                 <input type="text" id="check_item_name" class="form-control" placeholder="名称">
                             </div>
                         </div>
-                        <div class="form-group">
+                        <div class="form-group check_item_score">
                             <label for="exampleInputAccount4" class="col-sm-2">分数：</label>
                             <div class="col-md-6 col-sm-10">
-                                <input type="text" id="check_item_score" class="form-control" placeholder="分数 / 目录可不填">
+                                <input type="text" id="check_item_score" class="form-control" placeholder="分数">
                             </div>
                         </div>
                         <div class="form-group check_item_group">

VisualInspection/view/assess_management/assess_way.html

@@ -29,40 +29,51 @@
             </div>
           
         </div>
-        <!-- 对话框HTML -->
-        <div id="form-div" style="display:none;text-align:center;">
-                <!-- 添加对话框 -->
-                <div class="container-fluid" style="margin-top:20px;">
-                    <form class="form-horizontal">
-                        <div class="form-group">
-                            <label for="exampleInputAccount4" class="col-sm-3">考核办法</label>
-                            <div class="col-md-8 col-sm-8">
-                                <input type="text" class="form-control" id="check_rule_name" placeholder="考核办法">
+
+        <div class="modal fade" id="addModal">
+            <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">
+                        <div class="container-fluid ">
+                            <div class="container-fluid" style="margin-top:20px;">
+                                <form class="form-horizontal">
+                                    <div class="form-group">
+                                        <label for="exampleInputAccount4" class="col-sm-2">考核办法</label>
+                                        <div class="col-md-8 col-sm-8">
+                                            <input type="text" class="form-control" id="check_rule_name" placeholder="考核办法">
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="exampleInputPassword4" class="col-sm-2">考核对象</label>
+                                        <div class="col-md-5 col-sm-5">
+                                            <div id="check_item_select"></div>
+                                        </div>
+                                        <div class="col-md-3 col-sm-3">
+                                            <select type="text" id="position_id" class="form-control" >
+                                                <option value="" selected>请选择职位</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <div class="col-sm-offset-2 col-sm-10">
+                                            <button type="button" id="add_btn" class="btn btn-default" onclick="addOrUpdateCheckRule()">添加</button>
+                                        </div>
+                                    </div>
+                                </form>
                             </div>
                         </div>
-                        <div class="form-group">
-                            <label for="exampleInputPassword4" class="col-sm-3">考核对象</label>
-                            <div class="col-md-4 col-sm-4">
-                                <select type="text" id="dep_id" class="form-control" >
-                                    <option value="" selected>请选择部门</option>
-                                    <option value="1">1</option>
-                                </select>
-                            </div>
-                            <div class="col-md-4 col-sm-4">
-                                <select type="text" id="position_id" class="form-control" >
-                                    <option value="" selected>请选择职位</option>
-                                     <option value="2">2</option>
-                                </select>
-                            </div>
-                        </div>    
-                    </form>
+                    </div>
                 </div>
-                <!--添加对话框结束-->
+            </div>
         </div>
-        <!-- 考核办法  end -->    
 
 <script src="/js/assess_management/assess_way.js?_inline"></script>
-
+<script type="text/javascript" src="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.js?__inline"></script>
+<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/dashboard/zui.dashboard.min.css">
 <style type="text/css">
     td.modity-flag{
        text-decoration: underline;

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -47,14 +47,14 @@
                             </select>
                         </div>
                     </div>
-                    <div class="form-group">
+                    <!--<div class="form-group">
                         <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">全班</label>
                         <div class="col-md-6 col-sm-8">
                             <select id="all_term" type="text" class="form-control class_team_4" >
                                 <option value=''>请选择班组</option>
                             </select>
                         </div>
-                    </div>
+                    </div>-->
                     <hr>
                     <div class="form-group">
                         <div class="col-sm-12">
@@ -70,6 +70,64 @@
 </div>
 </div>
 <!--对话框 结束-->
+
+
+<div class="modal fade" id="add_fee_station">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            
+        </div>
+        <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">
+            <!-- 添加对话框 -->
+            <div class="container-fluid ">
+                <div class="form-horizontal">
+                    <div class="form-group">
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">早班</label>
+                        <div class="col-md-6 col-sm-8">
+                            <select id="mooring_term" type="text" class="form-control class_team_1" >
+                                <option value=''>请选择班组</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">中班</label>
+                        <div class="col-md-6 col-sm-8">
+                            <select id="middle_term" type="text" class="form-control class_team_2" >
+                                <option value=''>请选择班组</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">晚班</label>
+                        <div class="col-md-6 col-sm-8">
+                            <select id="night_term" type="text" class="form-control class_team_3" >
+                                <option value=''>请选择班组</option>
+                            </select>
+                        </div>
+                    </div>
+                    <hr>
+                    <div class="form-group">
+                        <div class="col-sm-12">
+                            <button  style="float:right;margin-right:10px;" id="close_btn" class="btn btn">关闭</button>
+                            <button type="submit" style="float:right;margin-right:10px;" id="save_term_class" class="btn btn-info">生成今日排班</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!--添加对话框结束-->
+    </div>
+    </div>
+</div>
+</div>
+
+
+
+
 <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">   
 <script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
 <script src="/js/teamClass/charge_team_schedule.js"></script>

VisualInspection/view/term_management/check_stuff_schedule.html

@@ -23,7 +23,7 @@
             <!-- 添加对话框 -->
             <div class="container-fluid ">
                 <div class="form-horizontal">
-                    <div class="form-group">
+                    <!--<div class="form-group">
                         <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">早班</label>
                         <div class="col-md-6 col-sm-8">
                             <select id="mooring_term" type="text" class="form-control class_team_1" >
@@ -46,7 +46,7 @@
                                 <option value=''>请选择班组</option>
                             </select>
                         </div>
-                    </div>
+                    </div>-->
                     <div class="form-group">
                         <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">全班</label>
                         <div class="col-md-6 col-sm-8">

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

@@ -27,4 +27,7 @@ public class CheckRule {
     
     // 考核项数量
     private int checked_item_num ;
+    
+    // 被考核的职位名称
+    private String checked_position_name;
 }

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

@@ -12,4 +12,7 @@ public class Job {
     private Integer id;
     //名称
     private String name;
+    
+    // 部门id
+    private Long dept_id;
 }

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

@@ -44,4 +44,7 @@ public class TeamClass {
     private Integer class_type;
     
     private String team_name ;
+    
+    private Integer type ;
+    
 }

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

@@ -0,0 +1,41 @@
+package com.xintong.visualinspection.controller;
+
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.Job;
+import com.xintong.visualinspection.service.CheckRuleItemService;
+import com.xintong.visualinspection.service.JobService;
+
+/**
+ * 文件名：CheckRuleIem
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@RestController
+@RequestMapping("/job")
+public class JobController extends BaseController {
+
+	@Autowired
+	private JobService jobService ;
+	
+	/**
+     * 增加考核项
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getList")
+    public String add(@Valid @RequestBody Job job){
+    	List<Job> jlist = jobService.getJobList(job) ;
+    	return super.returnSuccessResult(jlist);
+    }
+    
+}

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

@@ -186,6 +186,7 @@ public class TaskController extends BaseController {
     public String getTaskList(@PathVariable Integer page,@PathVariable Integer size, @RequestBody Task task){
     	PageHelper.startPage(page, size); 
     	List<Task> taskList = taskService.getTaskList(task);
+    	if(taskList==null) return super.returnSuccessResult(new PageInfo(new ArrayList()));
     	return super.returnSuccessResult(new PageInfo(taskList));
     }
     

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

@@ -2,6 +2,7 @@ package com.xintong.visualinspection.controller;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.TeamClass;
+import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.TeamClassService;
 
 /**
@@ -112,9 +114,10 @@ public class TeamClassController extends BaseController {
      * @since  1.0.0
      */
     @RequestMapping(value = "/getClassList")
-    public String getClassList(@RequestBody TeamClass teamClass){
+    public String getClassList(@RequestBody TeamClass teamClass,HttpServletRequest request){
     	if(teamClass.getDept_id()==null){
-    		throw new BusinessException(20901);
+    		User u = getCurrentUser(request);
+    		teamClass.setDept_id(u.getOrganid()+0L);
     	}
     	if(teamClass.getStart_time()==null){
     		throw new BusinessException(20902);

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

@@ -2,9 +2,11 @@ package com.xintong.visualinspection.controller;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpRequest;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,6 +16,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.Team;
+import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.TeamService;
 
 /**
@@ -91,13 +94,13 @@ public class TeamController extends BaseController {
      * @since  1.0.0
      */
     @RequestMapping(value = "/getTeamByDeptId/{page}/{size}")
-    public String getTeamByDeptId(@RequestBody Team team,@PathVariable Integer page,@PathVariable Integer size){
+    public String getTeamByDeptId(@RequestBody Team team,@PathVariable Integer page,@PathVariable Integer size,HttpServletRequest request ){
     	if(team.getDept_id()==null){
-    		throw new BusinessException(20901);
+    		User u = getCurrentUser(request);
+    		team.setDept_id(u.getOrganid()+0L);
     	}
     	PageHelper.startPage(page, size);
-    	List<Team> teamList = teamService.getByDeptId(team.getDept_id());
-//    	return super.returnSuccessResult(teamList);
+    	List<Team> teamList = teamService.getList(team) ;
     	return super.returnSuccessResult(new PageInfo(teamList));
     }
     

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

@@ -0,0 +1,18 @@
+package com.xintong.visualinspection.dao.master;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.xintong.visualinspection.bean.Job;
+
+/**
+ * 文件名：JobDao
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Mapper
+public interface JobDao  {
+    
+	public List<Job> getJobList(Job obj);
+   
+}

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

@@ -19,4 +19,5 @@ public interface TeamDao  {
     public void update(Team team);
     public void delete(Long id);
 	public List<Team> getTeamByName(Team team);
+	public List<Team> getList(Team obj);
 }

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

@@ -7,6 +7,7 @@
         <result column="checked_person_type" property="checked_person_type" jdbcType="INTEGER" />
         <result column="checked_item_num" property="checked_item_num" jdbcType="INTEGER"/>
         <result column="checked_position_id" property="checked_position_id" jdbcType="INTEGER" />
+        <result column="checked_position_name" property="checked_position_name" jdbcType="VARCHAR" />
         <result column="checked_dept_id" property="checked_dept_id" jdbcType="INTEGER" />
         <collection property="check_items" ofType="com.xintong.visualinspection.bean.CheckItem"  
         	javaType="ArrayList">
@@ -24,7 +25,8 @@
   	</select>  
   	
   	<select id="getAllAndCountItem"  resultMap="BaseResultMap" parameterType="com.xintong.visualinspection.bean.CheckRule" >
-		SELECT o.*,(SELECT COUNT(1) FROM check_rule_item t WHERE t.rule_id =o.id) AS checked_item_num FROM check_rule o
+		SELECT o.*,(SELECT COUNT(1) FROM check_rule_item t WHERE t.rule_id =o.id) AS checked_item_num ,sj.name AS checked_position_name  FROM check_rule o 
+			LEFT JOIN sys_job sj ON o.checked_position_id = sj.id
 		<if test="name!=null">
 			WHERE o.name like CONCAT('%',#{name},'%') 		
 		</if>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xintong.visualinspection.dao.master.JobDao" >
+
+   <select id="getJobList" parameterType="com.xintong.visualinspection.bean.Job" resultType="com.xintong.visualinspection.bean.Job">
+   		SELECT * FROM sys_job WHERE 1=1 
+   		<if test="dept_id!=null">
+   			AND department_id=#{dept_id}
+   		</if>
+   </select>
+    
+</mapper>

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

@@ -25,13 +25,13 @@
     </select>
     
     <select id="getClassList" parameterType="com.xintong.visualinspection.bean.TeamClass" resultMap="BaseResultMap" >
-        SELECT t.* ,st.name as team_name
+        SELECT * FROM ( SELECT t.* ,st.name as team_name,st.type
         FROM sys_team_class t left join sys_team st ON t.team_id = st.id
         WHERE 1=1
         <if test="dept_id != null">AND t.dept_id = #{dept_id}</if>
         <if test="start_time != null">AND t.work_date &gt;= #{start_time}</if>
         <if test="end_time != null">AND t.work_date &lt;= #{end_time}</if>
-        ORDER BY t.work_date ASC ,t.class_type ASC
+        ORDER BY t.work_date ASC ,t.class_type ASC) tc WHERE tc.type =#{type}
     </select>
 
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.TeamClass" >

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

@@ -25,6 +25,19 @@
         WHERE dept_id = #{dept_id}
     </select>
     
+    
+    <select id="getList" parameterType="java.lang.Long" resultMap="BaseResultMap" >
+        SELECT *
+        FROM sys_team
+        WHERE 1=1 
+        <if test="dept_id!=null">
+        	AND dept_id = #{dept_id}
+        </if>
+        <if test="type!=null">
+           AND type = #{type}
+        </if>
+    </select>
+    
     <select id="getTeamByName" parameterType="com.xintong.visualinspection.bean.Team" resultMap="BaseResultMap" >
         SELECT *
         FROM sys_team

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/JobService.java

@@ -0,0 +1,21 @@
+package com.xintong.visualinspection.service;
+
+import java.util.List;
+
+import com.xintong.visualinspection.bean.Job;
+
+/**
+ * 
+ *
+ * ConstantService
+ * 
+ * tiger
+ * tiger
+ * 2017年5月4日 上午10:41:40
+ * 
+ * @version 1.0.0
+ *
+ */
+public interface JobService {
+    public List<Job> getJobList(Job obj);
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/TeamService.java

@@ -21,6 +21,7 @@ public interface TeamService {
     public List<Team> getAll();
     public Team getById(Long id);
     public List<Team> getByDeptId(Long deptId);
+    public List<Team> getList(Team team);
     public void insert(Team team);
     public void update(Team team);
     public void delete(Long id);

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

@@ -163,7 +163,7 @@ public class CheckRuleServiceImpl extends BaseService implements CheckRuleServic
 		List<CheckRule> lists = checkRuleDao.getAllAndCountItem(checkRule);
 		for(CheckRule c:lists){
 			if(c.getChecked_dept_id()!=null){
-				Organ obj = CacheUtil.deptMap.get(c.getChecked_dept_id());
+				Organ obj = CacheUtil.deptMap.get(c.getChecked_dept_id().intValue());
 				if(obj!=null){
 					c.setChecked_dept_name(obj.getOrganname());					
 				}

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

@@ -0,0 +1,33 @@
+package com.xintong.visualinspection.service.impl;
+
+import java.util.List;
+
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xintong.visualinspection.bean.Job;
+import com.xintong.visualinspection.dao.master.JobDao;
+import com.xintong.visualinspection.service.BaseService;
+import com.xintong.visualinspection.service.JobService;
+
+/**
+ * 文件名：UserServiceImpl
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Service
+public class JobServiceImpl extends BaseService implements JobService {
+
+    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(JobServiceImpl.class);
+
+    @Autowired
+    private JobDao jobDao ;
+
+	@Override
+	public List<Job> getJobList(Job obj) {
+		return jobDao.getJobList(obj);
+	}
+	
+
+  
+}

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

@@ -46,9 +46,21 @@ public class TaskServiceImpl extends BaseService implements TaskService {
 		// TODO Auto-generated method stub
 		List<Task> taskList = taskDao.getList(task);
 		for(Task t : taskList) {
-			t.setCheckman_name(((User)CacheUtil.userMap.get(t.getCheckman())).getTruename());
-			t.setChecked_person_name(((User)CacheUtil.userMap.get(t.getChecked_person())).getTruename());
-			t.setChecked_dept_name(((Organ)CacheUtil.deptMap.get(t.getChecked_dept())).getOrganname());
+			if(t.getCheckman() != null){
+				t.setCheckman_name(((User)CacheUtil.userMap.get(t.getCheckman())).getTruename());
+			}
+			if(t.getChecked_person() != null){
+				t.setChecked_person_name(((User)CacheUtil.userMap.get(t.getChecked_person())).getTruename());
+			}
+			if(t.getChecked_dept() != null){
+				if(CacheUtil.deptMap.get(t.getChecked_dept())!=null){
+					t.setChecked_dept_name(((Organ)CacheUtil.deptMap.get(t.getChecked_dept())).getOrganname());
+				}
+				
+				
+			}
+			
+			
 		}
 		return taskList;
 	}

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

@@ -49,6 +49,11 @@ public class TeamServiceImpl extends BaseService implements TeamService {
 		return teamDao.getByDeptId(deptId);
 	}
 
+	@Override
+	public List<Team> getList(Team team) {
+		// TODO Auto-generated method stub
+		return teamDao.getList(team);
+	}
 
 	@Override
 	public void insert(Team team) {