值班管理 (cf3d69c2) · Commits · 马超 / zbgl · GitLab

web/jsp/zbgl/pbgl/action.jsp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -178,9 +178,9 @@
	int startIndex=startIndexBefore;		int startIndex=startIndexBefore;
	StringBuffer sql1=new StringBuffer("insert into zb_user_gl (year,zb_type,zb_user,order_num,add_user,add_time) values (?,?,?,?,?,?)");		StringBuffer sql1=new StringBuffer("insert into zb_user_gl (year,zb_type,zb_user,order_num,add_user,add_time) values (?,?,?,?,?,?)");
	Vector zb_type_list = cf.doQuery(conn,"select * from zb_type where mx_id=? order by order_num asc",null,new Object[]{mxId});		Vector zb_type_list = cf.doQuery(conn,"select * from zb_type where mx_id=? order by order_num asc",null,new Object[]{mxId});
	for(int a=0;a<selectDay;a++){
	if(zb_type_list!=null && zb_type_list.size()>0) {		if(zb_type_list!=null && zb_type_list.size()>0) {
	for (int i = 0; i < zb_type_list.size(); i++) {		for (int i = 0; i < zb_type_list.size(); i++) {
			for(int a=0;a<selectDay;a++){
	Hashtable ht = (Hashtable) zb_type_list.get(i);		Hashtable ht = (Hashtable) zb_type_list.get(i);
	String ren_num = pub.trimNull((String) ht.get("ren_num"));		String ren_num = pub.trimNull((String) ht.get("ren_num"));
	String zb_type = pub.trimNull((String) ht.get("zb_type"));		String zb_type = pub.trimNull((String) ht.get("zb_type"));

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -103,7 +103,7 @@
	}		}
	function viewUser(year,month,day) {		function viewUser(year,month,day) {
	var url = './viewUser-t.jsp?year='+year+'&month='+month+'&day='+day;		var url = './viewUser-t.jsp?year='+year+'&month='+month+'&day='+day;
	viewDeptOrUserInfo(year+'年'+month+'月'+day+'日值班表', url, '1000', '500');		viewDeptOrUserInfo(year+'年'+month+'月'+day+'日值班表', url, '1100', '550');
	}		}
	function changeZb() {		function changeZb() {
	var url = './changeZb-t.jsp';		var url = './changeZb-t.jsp';

web/jsp/zbgl/pbgl/selectUser-t.jsp

+49 −67

Original line number	Original line	Diff line number	Diff line
	<%--
	Created by IntelliJ IDEA.
	User: Administrator
	Date: 2020/9/11
	Time: 12:54
	To change this template use File \| Settings \| File Templates.
	--%>


	<%@ page contentType="text/html;charset=UTF-8" language="java" %>		<%@ page contentType="text/html;charset=UTF-8" language="java" %>
	<%@ page import="java.sql.Connection" %>		<%@ page import="java.sql.Connection" %>
	<%@ page import="java.util.*" %>		<%@ page import="java.util.*" %>
	@@ -24,13 +15,9 @@
	if ("".equals(login_id)) {		if ("".equals(login_id)) {
	System.out.println("当前没有用户信息");		System.out.println("当前没有用户信息");
	}		}
	String page_number = pub.trimNull(request.getParameter("page_number"));
	String year = pub.trimNull(request.getParameter("year"));		String year = pub.trimNull(request.getParameter("year"));
	String zb_type = pub.trimNull(request.getParameter("zb_type"));		String zb_type = pub.trimNull(request.getParameter("zb_type"));
	String action = pub.trimNull(request.getParameter("action"));		String action = pub.trimNull(request.getParameter("action"));
	if ("".equals(page_number)) page_number = "1";
	String page_size = pub.trimNull(request.getParameter("page_size"));
	if ("".equals(page_size)) page_size = "10";
	StringBuffer sql = new StringBuffer();		StringBuffer sql = new StringBuffer();
	List list = new ArrayList();		List list = new ArrayList();
	sql.append("select * from zb_user order by id asc");		sql.append("select * from zb_user order by id asc");
	@@ -59,7 +46,7 @@
	}		}
	conn.commit();		conn.commit();
	}		}
	v_list = cf.doPageQueryWithCount(conn, sql.toString(), page_number, page_size, null, list.toArray());		v_list = cf.doQuery(conn, sql.toString(), null, list.toArray());
	if (v_list == null) {		if (v_list == null) {
	out.println("查询用户出错");		out.println("查询用户出错");
	return;		return;
	@@ -77,6 +64,7 @@
	确定		确定
	</a>		</a>
	</div>		</div>
			<div style="width:100%;height:90%;overflow-y: auto">
	<form action="selectUser-t.jsp" method="post" id="groupUser" name="groupUser">		<form action="selectUser-t.jsp" method="post" id="groupUser" name="groupUser">
	<input type="hidden" name="action" id="action" value="update">		<input type="hidden" name="action" id="action" value="update">
	<input type="hidden" name="year" id="year" value="<%=year%>">		<input type="hidden" name="year" id="year" value="<%=year%>">
	@@ -97,14 +85,14 @@
	<%		<%
	Hashtable ht_1 =null;		Hashtable ht_1 =null;
	if (v_list != null && v_list.size() > 0) {		if (v_list != null && v_list.size() > 0) {
	for (int i = 1; i < v_list.size(); i++) {		for (int i = 0; i < v_list.size(); i++) {
	Hashtable ht = (Hashtable) v_list.get(i);		Hashtable ht = (Hashtable) v_list.get(i);
	String user_name = pub.trimNull((String) ht.get("user_name"));		String user_name = pub.trimNull((String) ht.get("user_name"));
	String tel = pub.trimNull((String) ht.get("tel"));		String tel = pub.trimNull((String) ht.get("tel"));
	String gh = pub.trimNull((String) ht.get("gh"));		String gh = pub.trimNull((String) ht.get("gh"));
	%>		%>
	<tr class="text-c">		<tr class="text-c">
	<td><%=i%>		<td><%=i+1%>
	</td>		</td>
	<td >		<td >
	<input type="checkbox" class="info" id="userids" name="userids" value="<%=user_name%>"		<input type="checkbox" class="info" id="userids" name="userids" value="<%=user_name%>"
	@@ -124,13 +112,7 @@
	</tbody>		</tbody>
	</table>		</table>
	</form>		</form>
	<link rel="stylesheet" href="<%=request.getContextPath()%>/css/pagination.css">		</div>
	<script type="text/javascript" src="<%=request.getContextPath()%>/js/jquery.pagination.js"></script>
	<jsp:include page="/common/page_ajax.jsp" >
	<jsp:param name="page_number" value="<%=page_number%>" />
	<jsp:param name="rowCnt" value="<%=rowCnt%>" />
	<jsp:param name="page_size" value="<%=page_size%>" />
	</jsp:include>
	<script type="text/javascript">		<script type="text/javascript">
	var checkAll = function (checkbox) {		var checkAll = function (checkbox) {
	$(".info").prop("checked", checkbox.checked);		$(".info").prop("checked", checkbox.checked);

web/jsp/zbgl/pbgl/viewUser-t.jsp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -80,7 +80,7 @@
	<div class="">		<div class="">
	<form class="form form-horizontal" method="post" id="form1" name="form1" action="export_query.jsp" >		<form class="form form-horizontal" method="post" id="form1" name="form1" action="export_query.jsp" >
	<input type="hidden" value="<%=year+month+day%>" name="exportDate" id="exportDate">		<input type="hidden" value="<%=year+month+day%>" name="exportDate" id="exportDate">
	<div id="content" class="cl pd-5 bk-gray divOverflow" style="overflow:hidden;margin-bottom: 20px;">		<div id="content" class="cl pd-5 bk-gray divOverflow" style="overflow:hidden;margin-bottom: 20px;height: 400px;">
	<%		<%
	if(v_list.size()>0){		if(v_list.size()>0){
	for(int i=0;i<v_list.size();i++){		for(int i=0;i<v_list.size();i++){
	@@ -90,7 +90,7 @@
	String time=getZbTyTime(cf,conn,mxId,zb_type);		String time=getZbTyTime(cf,conn,mxId,zb_type);

	%>		%>
	<div style="width:900px;height:120px;float:left;margin-left: 50px;border:0.5px solid #000;position:relative;">		<div style="width:1000px;height:120px;float:left;margin-left: 50px;border:0.5px solid #000;position:relative;">
	<div style="width:140px;height:120px;float:left;border-right:0.5px solid #000;text-align: center;line-height: 80px;">		<div style="width:140px;height:120px;float:left;border-right:0.5px solid #000;text-align: center;line-height: 80px;">
	<p style="height:30px;"> <%=zb_type%></p>		<p style="height:30px;"> <%=zb_type%></p>
	<p style="height:30px;">(<%=time%>)</p>		<p style="height:30px;">(<%=time%>)</p>

web/jsp/zbgl/pbmx/action.jsp

+0 −51

Original line number	Original line	Diff line number	Diff line
	@@ -122,30 +122,9 @@
	conn.rollback();		conn.rollback();
	return;		return;
	}		}
	for(int n=0;n<mxDay;n++){
	userNames=getUserNames(cf,conn,startIndex,Integer.parseInt(ren_num));
	if(!"".equals(userNames)){
	startIndex = Integer.parseInt(userNames.substring(0,userNames.indexOf("_")));
	userNames = userNames.substring(userNames.indexOf("_")+1,userNames.length()-1);
	}

	is_oper = cf.executeUpdate(conn, "insert into zb_mx_day(mx_id,zb_type,user_name,day,add_user,add_time) values (?,?,?,?,?,?)"
	, new Object[]{mx_id,zb_type_id,userNames,n+1,add_user,add_time});
	if (!is_oper) {
	System.out.println("新增zb_mx_day表出错了" + cf.getMsg());
	conn.rollback();
	return;
	}
	}
	}		}
	}else if("delete".equals(action)){		}else if("delete".equals(action)){
	action_msg="删除";		action_msg="删除";
	is_oper = cf.executeUpdate(conn, "delete from zb_mx_day where mx_id=?",new Object[]{mx_id});
	if (!is_oper) {
	conn.rollback();
	System.out.println("删除zb_mx_day表出错了" + cf.getMsg());
	return;
	}
	is_oper = cf.executeUpdate(conn, "delete from zb_type where mx_id=?",new Object[]{mx_id});		is_oper = cf.executeUpdate(conn, "delete from zb_type where mx_id=?",new Object[]{mx_id});
	if (!is_oper) {		if (!is_oper) {
	conn.rollback();		conn.rollback();
	@@ -185,21 +164,6 @@
	conn.rollback();		conn.rollback();
	return;		return;
	}		}
	for(int n=0;n<mxDay;n++){
	userNames=getUserNames(cf,conn,startIndex,Integer.parseInt(ren_num));
	if(!"".equals(userNames)){
	startIndex = Integer.parseInt(userNames.substring(0,userNames.indexOf("_")));
	userNames = userNames.substring(userNames.indexOf("_")+1,userNames.length()-1);
	}
	is_oper = cf.executeUpdate(conn, "update zb_mx_day set user_name=?,update_user=?,update_time=? where mx_id=? and zb_type=? and day=?"
	, new Object[]{userNames,add_user,add_time,mx_id,zb_type_id,n+1});
	if (!is_oper) {
	System.out.println("修改b_mx_day表出错了" + cf.getMsg());
	conn.rollback();
	return;
	}
	}

	}else{		}else{
	String new_id=UUID.randomUUID().toString().trim().replaceAll("-", "");		String new_id=UUID.randomUUID().toString().trim().replaceAll("-", "");
	is_oper = cf.executeUpdate(conn, "insert into zb_type(id,mx_id,zb_type,b_time,e_time,ren_num,add_user,add_time) values (?,?,?,?,?,?,?,?)"		is_oper = cf.executeUpdate(conn, "insert into zb_type(id,mx_id,zb_type,b_time,e_time,ren_num,add_user,add_time) values (?,?,?,?,?,?,?,?)"
	@@ -209,20 +173,6 @@
	conn.rollback();		conn.rollback();
	return;		return;
	}		}
	for(int n=0;n<mxDay;n++){
	userNames=getUserNames(cf,conn,startIndex,Integer.parseInt(ren_num));
	if(!"".equals(userNames)){
	startIndex = Integer.parseInt(userNames.substring(0,userNames.indexOf("_")));
	userNames = userNames.substring(userNames.indexOf("_")+1,userNames.length()-1);
	}
	is_oper = cf.executeUpdate(conn, "insert into zb_mx_day(mx_id,zb_type,user_name,day,add_user,add_time) values (?,?,?,?,?,?)"
	, new Object[]{mx_id,new_id,userNames,n+1,add_user,add_time});
	if (!is_oper) {
	System.out.println("新增zb_mx_day表出错了" + cf.getMsg());
	conn.rollback();
	return;
	}
	}
	}		}
	if (!is_oper) {		if (!is_oper) {
	System.out.println("修改zb_type表出错了" + cf.getMsg());		System.out.println("修改zb_type表出错了" + cf.getMsg());
	@@ -255,7 +205,6 @@
	return;		return;
	}		}
	}*/		}*/

	is_oper = cf.executeUpdate(conn, "update zb_mx set name=? where id=?", new Object[]{mx_name,mx_id});		is_oper = cf.executeUpdate(conn, "update zb_mx set name=? where id=?", new Object[]{mx_name,mx_id});
	if (!is_oper) {		if (!is_oper) {
	conn.rollback();		conn.rollback();