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

VisualInspection/js/assess_management/assess_way_edit.js

@@ -4,6 +4,9 @@
  var all_data = [] ;
  var check_rule_id ;
  var check_item_tree = null;
+
+var check_rule_tree = null ;
+
  var edittype = "add";
  var cols = [{
      width: 10,
@@ -39,7 +42,7 @@
      var zTreeObj;
      var zNodes = [];
      check_item_tree = $.fn.zTree.init($("#department_tree"), {}, zNodes);
-
+     check_rule_tree = $.fn.zTree.init($("#check_rule_tree"), {}, zNodes);
      getCheckItems();
 
      $("#dept_add").on("click", function() {
@@ -311,6 +314,7 @@ function delete_check_item(id ){
              zdataItem.open = true ;
              all_data.push(zdataItem);
          }
+          check_rule_tree = $.fn.zTree.init($("#check_rule_tree"), setting2, all_data)
      },function(error){})
 
  }
@@ -374,14 +378,18 @@ function loadData(nodedata) {
 
 
 function addCheckItem() {
-    //获取名称
-    var data = {
-        "rule_id": check_rule_id,
-        "id":dept_selectinput.value
+    //获取名称 所有已经勾选的
+    var nodedata = check_rule_tree.getCheckedNodes();
+    var datas = [] ;
+    for(var i=0;i< nodedata.length; i++ ){
+        if(nodedata[i].children.length >0 ){
+            continue;
+        }
+        datas.push({ "rule_id":check_rule_id,"id":nodedata[i].id });
     }
 
     if (edittype == "add") {
-        post_common_service( "checkRuleItem/add",data,function(data){
+        post_common_service( "checkRuleItem/add/list",datas,function(data){
             layer.msg('添加成功！', {
                 time: 2000, //20s后自动关闭
             }, function() {
@@ -402,4 +410,41 @@ function isSelfOrChild(id, node) {
         }
     }
     return false;
-}
+}
+
+
+var setting2 = {
+         data: {
+             simpleData: {
+                 enable: true,
+                 idKey: "id",
+                 pIdKey: "pId",
+                 rootPId: null
+             }
+         },
+         view: { //表示tree的显示状态
+             selectMulti: false //表示禁止多选
+         },
+         check: { //表示tree的节点在点击时的相关设置
+             enable: true, //是否显示radio/checkbox
+             chkStyle: "checkbox", //值为checkbox或者radio表示
+             checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+             radioType: "level" //设置tree的分组
+         },
+         callback: {
+           
+         },
+         edit: {
+             enable: true,
+             drag: {
+                 autoExpandTrigger: true,
+                 isMove: true,
+                 prev: false,
+                 next: true,
+                 inner: true,
+                 autoOpenTime: 0
+             },
+             showRenameBtn: false,
+             showRemoveBtn: false
+         }
+     };

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -101,10 +101,10 @@
                     //     $(".thread_charge").append("<th>进口车道"+(i+1)+"</th>");
                     // }
                     for(var i=0;i<entrance_number;i++){
-                        $(".thread_charge").append("<th>进口车道"+(i+1)+"</th>");
+                        $(".thread_charge").append("<th>入口"+(i+1)+"</th>");
                     }
                     for(var i=0;i<exit_number;i++){
-                         $(".thread_charge").append("<th>出口车道"+(i+1)+"</th>");
+                         $(".thread_charge").append("<th>出口"+(i+1)+"</th>");
                     }
                 }
             },function(error){
@@ -262,7 +262,7 @@
                              $(".tr-1").append("<td>"+ classCode["1"].class_name +" "+classCode["1"].start_time+" - "+classCode["1"].end_time +"</td>");
                             var selectv = "<select class='form-control'>"
                                     // console.log(data[i]);
-                            selectv += ("<option value=''>请选择人员</option>");
+                            selectv += ("<option value=''>请选择</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                     var obj = data[i].users[j];
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
@@ -285,7 +285,7 @@
                             $(".tr-2").append("<td>"+ classCode[2].class_name +" "+classCode[2].start_time+" - "+classCode[2].end_time +"</td>");
                               $(".tr-2").data("cache",data[i]);
                             var selectv2 = "<select class='form-control'>"
-                            selectv2 += ("<option value=''>请选择人员</option>");
+                            selectv2 += ("<option value=''>请选择</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                  if(data[i].users[j]!=null)
                                 selectv2 += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>")
@@ -307,7 +307,7 @@
                              $(".tr-3").append("<td>"+ classCode[3].class_name +" "+classCode[3].start_time+" - "+classCode[3].end_time +"</td>");
                              $(".tr-3").data("cache",data[i]);
                             var selectv3 = "<select class='form-control'>"
-                            selectv3 += ("<option value=''>请选择人员</option>");
+                            selectv3 += ("<option value=''>请选择</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                  if(data[i].users[j]!=null)
                                 selectv3 += "<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>"

VisualInspection/view/assess_management/assess_way_edit.html

@@ -54,28 +54,23 @@
             <div class="modal-body">
                 <div class="container-fluid ">
                     <form class="form-horizontal">
-                        <!--<div class="form-group">
-                            <label for="exampleInputAccount4" class="col-sm-2">名称：</label>
-                            <div class="col-md-6 col-sm-10">
-                                <input type="text" id="check_item_name" class="form-control" placeholder="名称">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <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="分数">
-                            </div>
-                        </div>-->
-                        <div class="form-group check_item_group">
+                        
+                        <!--<div class="form-group check_item_group">
                             <label for="exampleInputPassword4" class="col-sm-3">考核项名称：</label>
                             <div class="col-md-6 col-sm-9">
                                 <div id="check_item_select"></div>
+                            </div>
+                        </div>-->
 
+                        <div class="form-group check_item_group" >
+                            <div class="col-sm-offset-1 col-md-11 col-sm-11" style="height:320px;overflow:auto;" >
+                                <ul id="check_rule_tree" class="ztree">
+                                </ul>
                             </div>
                         </div>
 
                         <div class="form-group">
-                            <div class="col-sm-offset-3 col-sm-10">
+                            <div class="col-sm-offset-2 col-sm-10">
                                 <button type="button" id="add_btn" class="btn btn-default" onclick="addCheckItem()">添加</button>
                             </div>
                         </div>

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -70,7 +70,7 @@
 
 
 <div class="modal fade" id="add_fee_station">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-lg" style="width:1000px;" >
         <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>
@@ -127,6 +127,9 @@
     div.day{
         text-align: center ;
     }
+    .content .events div:first-child{
+        background-color:chocolate !important ;
+    }
 </style>
 <script>
     $(document).ready(function() {

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

@@ -1,5 +1,7 @@
 package com.xintong.visualinspection.controller;
 
+import java.util.List;
+
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,21 @@ public class CheckRuleItemController extends BaseController {
     }
     
     /**
+     * 增加考核项列表
+     * @param checkItem
+     * @return
+     */
+    @RequestMapping(value = "/add/list")
+    public String add(@Valid @RequestBody List<CheckItem> checkItems){
+    	if(checkItems ==null && checkItems.size()==0){
+    		throw new BusinessException(20002);
+    	}
+    	String returnMsg = checkRuleItemService.insertList(checkItems);
+    	return super.returnSuccessResult(returnMsg==null?"增加成功":returnMsg);
+    }
+    
+    
+    /**
      * 删除考核项
      * @return
      * String

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

@@ -21,5 +21,7 @@ public interface TeamClassDao  {
     public void deleteByDeptWorkdate(TeamClass teamClass);
     
     public List<TeamClass> getClassCode(ClassCode teamClass);
+    
+    public List<TeamClass> getClassListForCharge(TeamClass teamClass);
    
 }

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

@@ -24,6 +24,16 @@
         WHERE id = #{id}
     </select>
     
+    <select id="getClassListForCharge" parameterType="com.xintong.visualinspection.bean.TeamClass" resultMap="BaseResultMap" >
+        SELECT * FROM ( SELECT t.id,t.work_date,t.dept_id,t.class_type,t.team_id,t.start_time,t.end_time,st.user_ids ,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) tc WHERE tc.type =#{type}
+    </select>
+    
     <select id="getClassList" parameterType="com.xintong.visualinspection.bean.TeamClass" resultMap="BaseResultMap" >
         SELECT * FROM ( SELECT t.id,t.work_date,t.dept_id,t.class_type,t.team_id,t.start_time,t.end_time,t.user_ids ,st.name as team_name,st.type
         FROM sys_team_class t left join sys_team st ON t.team_id = st.id

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

@@ -1,5 +1,7 @@
 package com.xintong.visualinspection.service;
 
+import java.util.List;
+
 import com.xintong.visualinspection.bean.CheckItem;
 
 /**
@@ -17,4 +19,5 @@ import com.xintong.visualinspection.bean.CheckItem;
 public interface CheckRuleItemService {
     public String insert(CheckItem checkItem);
     public void delete(CheckItem checkItem);
+    public String insertList(List<CheckItem> checkItems);
 }

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

@@ -1,8 +1,11 @@
 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 org.springframework.transaction.annotation.Transactional;
 
 import com.xintong.visualinspection.bean.CheckItem;
 import com.xintong.visualinspection.bean.CheckRule;
@@ -42,5 +45,14 @@ public class CheckRuleItemServiceImpl extends BaseService implements CheckRuleIt
 		checkRuleItemDao.insert(checkItem);
 		return null ;
 	}
+
+
+	@Override
+	public String insertList(List<CheckItem> checkItems) {
+		for(CheckItem obj : checkItems){
+			String error = insert(obj) ;
+		}
+		return null;
+	}
   
 }

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

@@ -51,20 +51,23 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 
 	@Override
 	public List<TeamClass> getClassListAndUsers(TeamClass teamClass) {
-		List<TeamClass> lists = teamClassDao.getClassList(teamClass);
+		
+		List<TeamClass> lists = teamClassDao.getClassListForCharge(teamClass);
 		for(TeamClass obj : lists){
-			String[] user_ids = obj.getUser_ids().split(",");
-			List<User> userList = new ArrayList<>();
-			for(int i=0;i<user_ids.length;i++){
-				User u = CacheUtil.userMap.get(Integer.valueOf(user_ids[i]) +0L); 
-				if( u != null){
-					User user =new User();
-					user.setId(u.getId());
-					user.setTruename(u.getTruename());
-					userList.add(user);
+			if(obj.getUser_ids()!=null){				
+				String[] user_ids = obj.getUser_ids().split(",");
+				List<User> userList = new ArrayList<>();
+				for(int i=0;i<user_ids.length;i++){
+					User u = CacheUtil.userMap.get(Integer.valueOf(user_ids[i]) +0L); 
+					if( u != null){
+						User user =new User();
+						user.setId(u.getId());
+						user.setTruename(u.getTruename());
+						userList.add(user);
+					}
 				}
+				obj.setUsers(userList);
 			}
-			obj.setUsers(userList);
 		}
 		return lists;
 	}