Commit c7b38356 authored by 马超's avatar 马超

值班

parent e75becb6
This diff is collapsed.
......@@ -4,6 +4,8 @@
<%@ page import="java.util.*" %>
<%@ page import="com.censoft.common.db.ConnectionFactory" %>
<%@ page import="com.censoft.common.base.Pub" %>
<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="com.censoft.db.LunarCalendarFestivalUtils" %>
<%!
public static String getMxId(ConnectionFactory cf,Connection conn,String date) {
String mx_id="";
......@@ -38,6 +40,8 @@
String name ="";
String xiuxi ="";
try {
LunarCalendarFestivalUtils nl = new LunarCalendarFestivalUtils();
nl.initLunarCalendarInfo(year+month+day);
StringBuffer sb = new StringBuffer();
sb.append("select t1.zb_user from zb_user_gl t1 where 1=1 ");
sb.append(" and t1.year=? ");
......@@ -74,6 +78,10 @@
Hashtable ht = (Hashtable) v_list_h.get(0);
name = pub.trimNull((String) ht.get("name"));
}
if("".equals(name)){
String nongli =nl.getLunarDay();
name=nongli;
}
if (v_list_xiu != null && v_list_xiu.size() > 0) {
Hashtable ht = (Hashtable) v_list_xiu.get(0);
xiuxi = pub.trimNull((String) ht.get("name"));
......
......@@ -4,6 +4,7 @@
<%@ page import="java.util.*" %>
<%@ page import="com.censoft.common.db.ConnectionFactory" %>
<%@ page import="com.censoft.common.base.Pub" %>
<%@ page import="com.censoft.db.LunarCalendarFestivalUtils" %>
<%!
public static String getMxId(ConnectionFactory cf,Connection conn,String date) {
String mx_id="";
......@@ -54,6 +55,8 @@
String name ="";
String xiuxi ="";
try {
LunarCalendarFestivalUtils nl = new LunarCalendarFestivalUtils();
nl.initLunarCalendarInfo(year+month+day);
conn = com.censoft.db.DBUtil.getConnection();
StringBuffer sb = new StringBuffer();
sb.append("select t1.zb_user,t1.zb_type from zb_user_gl t1 where 1=1 ");
......@@ -97,6 +100,10 @@
ht = (Hashtable) v_list_h.get(0);
name = pub.trimNull((String) ht.get("name"));
}
if("".equals(name)){
String nongli =nl.getLunarDay();
name=nongli;
}
if (v_list_xiu != null && v_list_xiu.size() > 0) {
ht = (Hashtable) v_list_xiu.get(0);
xiuxi = pub.trimNull((String) ht.get("name"));
......
......@@ -4,6 +4,7 @@
<%@ page import="java.util.*" %>
<%@ page import="com.censoft.common.db.ConnectionFactory" %>
<%@ page import="com.censoft.common.base.Pub" %>
<%@ page import="com.censoft.db.LunarCalendarFestivalUtils" %>
<%!
public static String getMxId(ConnectionFactory cf,Connection conn,String date) {
String mx_id="";
......@@ -38,6 +39,8 @@
String name ="";
String xiuxi ="";
try {
LunarCalendarFestivalUtils nl = new LunarCalendarFestivalUtils();
nl.initLunarCalendarInfo(year+month+day);
StringBuffer sb = new StringBuffer();
sb.append("select t1.zb_user from zb_user_gl_bgs t1 where 1=1 ");
sb.append(" and t1.year=? ");
......@@ -74,6 +77,10 @@
Hashtable ht = (Hashtable) v_list_h.get(0);
name = pub.trimNull((String) ht.get("name"));
}
if("".equals(name)){
String nongli =nl.getLunarDay();
name=nongli;
}
if (v_list_xiu != null && v_list_xiu.size() > 0) {
Hashtable ht = (Hashtable) v_list_xiu.get(0);
xiuxi = pub.trimNull((String) ht.get("name"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment