值班管理

web/jsp/zbgl/pbgl/action.jsp

@@ -201,6 +201,7 @@
                 }
             }
         }else if("delete".equals(action)){
+            action_msg="重置排班";
             is_oper = cf.executeUpdate(conn, "delete from zb_zdpb where b_time=? and e_time=?"
                     , new Object[]{b_time,e_time});
             if (!is_oper) {
@@ -216,6 +217,7 @@
                 return;
             }
         }else if("changeUser".equals(action)){
+            action_msg="换班日期及人员："+date_left+":"+user_left+" "+date_right+":"+user_right;
             is_oper = cf.executeUpdate(conn, "update zb_user_gl set zb_user=REPLACE(zb_user,?,?) where year=? and zb_type=?"
                     , new Object[]{user_left,user_right,date_left,zb_type_left});
             if (!is_oper) {
@@ -236,7 +238,7 @@
             System.out.println("操作出错了" + cf.getMsg());
             return;
         }
-        Logger.log(conn, "值班管理",action_msg,  add_user, "", request);
+        Logger.log(conn, "话务台值班管理",action_msg,  add_user, "", request);
         conn.commit();
         if (!is_oper) {
             conn.rollback();

web/jsp/zbgl/usergl/right_user_list.jsp

@@ -50,6 +50,7 @@
     <tr class="text-c">
         <th width="30">序号</th>
         <th width="100">姓名</th>
+        <th width="100">排序</th>
         <th width="50">电话号码</th>
         <th width="120">工号</th>
         <th width="140">操作</th>
@@ -72,6 +73,8 @@
         </td>
         <td><%=user_name%>
         </td>
+        <td><%=order_num%>
+        </td>
         <td><%=tel%>
         </td>
         <td><%=gh%>

web/jsp/zbgl/zbjj/action.jsp

@@ -40,7 +40,7 @@
         conn.setAutoCommit(false);
         boolean is_oper = false;
         if("add".equals(action)){
-            action_msg="新增";
+            action_msg="新增交接";
 
             for(int i=0;i<inputSize;i++){
                 String jj_content = pub.trimNull(request.getParameter("jj_neirong_"+(i+1)));

web/jsp/zbgl/zbjj/add_ldps-t.jsp

@@ -88,7 +88,7 @@
                     <span class="c-red">*</span>是否置顶&nbsp;：
                 </label>
                 <div class="formControls col-xs-8 col-sm-10">
-                    <input type="radio" name="is_up" id="is_up_yes" <%if("1".equals(pub.trimNull((String)ht.get("is_up")))){%>checked="checked"<%}%> value="1" >
+                    <input type="radio" name="is_up" id="is_up_yes" checked="checked" value="1" >
                     是
                     <input type="radio"  name="is_up" id="is_up_no" <%if("0".equals(pub.trimNull((String)ht.get("is_up")))){%>checked="checked"<%}%> value="0" >
                     否

web/jsp/zbgl/zbjj/list_ajax.jsp

@@ -46,14 +46,14 @@
             sb.append(" and status = ?");
             list_s.add(status);
         }
-        sb.append(" order by tc_time desc ");
+        sb.append(" order by status asc,tc_time desc ");
         conn = com.censoft.db.DBUtil.getConnection();
         v_list = cf.doPageQueryWithCount(conn, sb.toString(), page_number, page_size, null, list_s.toArray());
         if (v_list == null) {
             out.println("查询出错" + cf.getMsg());
             return;
         }
-        ldps_list = cf.doQuery(conn,"select * from zb_ldps order by is_up desc,add_time desc ",null,new Object[]{});
+        ldps_list = cf.doQuery(conn,"select * from zb_ldps where is_up='1' order by add_time desc ",null,new Object[]{});
 
     Hashtable ht_row = (Hashtable) v_list.get(0);
     String rowCnt = pub.trimNull((String) ht_row.get("ROWCOUNT"));

web/jsp/zbglBgs/pbgl/action.jsp

@@ -235,6 +235,7 @@
                 }
             }
         }else if("delete".equals(action)){
+            action_msg="重置排班";
             is_oper = cf.executeUpdate(conn, "delete from zb_zdpb_bgs where b_time=? and e_time=?"
                     , new Object[]{b_time,e_time});
             if (!is_oper) {
@@ -250,6 +251,7 @@
                 return;
             }
         }else if("changeUser".equals(action)){
+            action_msg="换班日期及人员："+date_left+":"+user_left+" "+date_right+":"+user_right;
             is_oper = cf.executeUpdate(conn, "update zb_user_gl_bgs set zb_user=REPLACE(zb_user,?,?) where year=? and zb_type=?"
                     , new Object[]{user_left,user_right,date_left,zb_type_left});
             if (!is_oper) {

web/jsp/zbglBgs/usergl/right_user_list.jsp

@@ -30,7 +30,7 @@
     StringBuffer sql = new StringBuffer();
     List list = new ArrayList();
     //sql.append("select * from zb_bgs_user order by order_num asc ");
-    sql.append("select t2.id,t2.user_name,t2.tel,t2.gh,t2.order_num from zb_bgs_user t2 left join zb_role_user t1 on " +
+    sql.append("select t2.id,t2.user_name,t2.tel,t2.gh,t2.role_num from zb_bgs_user t2 left join zb_role_user t1 on " +
             "t1.user_id=t2.id  order by t1.role_id asc,t2.role_num asc ");
     try {
         conn = com.censoft.db.DBUtil.getConnection();
@@ -54,6 +54,7 @@
         <th width="30">序号</th>
         <th width="100">姓名</th>
         <th width="100">值班角色</th>
+        <th width="100">角色内排序</th>
         <th width="50">电话号码</th>
         <th width="120">工号</th>
         <th width="140">操作</th>
@@ -69,16 +70,18 @@
                 String user_name = pub.trimNull((String) ht.get("user_name"));
                 String tel = pub.trimNull((String) ht.get("tel"));
                 String gh = pub.trimNull((String) ht.get("gh"));
-                String order_num = pub.trimNull((String) ht.get("order_num"));
+                String role_num = pub.trimNull((String) ht.get("role_num"));
                 String edit_url="./editUser-t.jsp?action=update&user_id="+user_id;
     %>
     <tr <%if(i%2==0){%>id="tr_doub"<%}else{%>id="tr_single"<%}%> class="text-c">
-        <td><%=order_num%>
+        <td><%=i%>
         </td>
         <td><%=user_name%>
         </td>
         <td><%=role_name%>
         </td>
+        <td><%=role_num%>
+        </td>
         <td><%=tel%>
         </td>
         <td><%=gh%>