值班

web/jsp/zbgl/jrzb/list-t.jsp

@@ -74,9 +74,9 @@
                         String time=getZbTyTime(cf,conn,mxId,zb_type);
 
             %>
-            <div style="width:1280px;height:200px;float:left;margin-left: 50px;
+            <div style="width:1280px;height:190px;float:left;margin-left: 50px;
             border:0.5px solid #000;position:relative;<%if(i==0){%>margin-top:5px;<%}%>">
-                <div style="font-size: 16px;width:200px;height:200px;float:left;border-right:0.5px solid #000;text-align: center;line-height: 150px;">
+                <div style="font-size: 16px;width:200px;height:190px;float:left;border-right:0.5px solid #000;text-align: center;line-height: 150px;">
                     <p style="height:30px;"> <%=zb_type%></p>
                     <p style="height:30px;">(<%=time%>)</p>
                 </div>
@@ -85,7 +85,7 @@
                     for(int n=0;n<user_names.length;n++){
                         String telphone=getTel(cf,conn,user_names[n]);
                 %>
-                <div style="text-align:center;width:160px;height:200px;line-height:200px;float:left;position: relative">
+                <div style="text-align:center;width:160px;height:190px;line-height:190px;float:left;position: relative">
                     <p style="height:100px;line-height: 150px;margin:0px;">
                         <img src="../../images/user.png"/>
                     </p>

web/log/loglist_ajax.jsp

@@ -21,10 +21,13 @@
     if ("".equals(page_size)) page_size = "10";
     List list_s = new ArrayList();
     StringBuffer sb = new StringBuffer();
-    sb.append("select t1.*,t2.login_name from t_book_log t1 left join t_book_admin t2  on t2.login_id=t1.add_user where 1=1 ");
+    sb.append("select t1.*,t2.login_name,t3.user_name as name1,t4.user_name as name2 from t_book_log t1 left join t_book_admin t2  on t2.login_id=t1.add_user " +
+            " left join zb_user t3  on t3.id=t1.add_user left join zb_bgs_user t4  on t4.id=t1.add_user where 1=1 ");
     String s_login_name = pub.trimNull(request.getParameter("s_login_name"));
     if (!"".equals(s_login_name)) {
-        sb.append(" and t2.login_name like ? ");
+        sb.append(" and （t2.login_name like ? or t3.user_name like ? or t4.user_name like ?)");
+        list_s.add("%" + s_login_name + "%");
+        list_s.add("%" + s_login_name + "%");
         list_s.add("%" + s_login_name + "%");
     }
     String s_action = pub.trimNull(request.getParameter("s_action"));
@@ -88,6 +91,14 @@
             for (int i = 1; i < v_list.size(); i++) {
                 Hashtable ht = (Hashtable) v_list.get(i);
                 String login_name = pub.trimNull((String) ht.get("login_name"));
+                String name1 = pub.trimNull((String) ht.get("name1"));
+                String name2 = pub.trimNull((String) ht.get("name2"));
+                if(!"".equals(name1)){
+                    login_name=name1;
+                }
+                if(!"".equals(name2)){
+                    login_name=name2;
+                }
                 String action = pub.trimNull((String) ht.get("action"));
                 String model = pub.trimNull((String) ht.get("model"));
                 String add_time = pub.trimNull((String) ht.get("add_time"));