Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectUser.jsp
===================================================================
diff -u -r12331 -r15526
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectUser.jsp (.../selectUser.jsp) (revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectUser.jsp (.../selectUser.jsp) (revision 15526)
@@ -1,17 +1,52 @@
<%@page import="java.util.List"%>
<%@page import="com.forgon.disinfectsystem.entity.printRecyclingApplicationConfig.PrintConfig"%>
<%@page import="com.forgon.disinfectsystem.printRecyclingApplicationConfig.service.PrintConfigManager"%>
+<%@ page import="com.forgon.systemsetting.service.HttpOptionManager" %>
+<%@ page import="com.forgon.systemsetting.model.HttpOption" %>
+<%@ page import="org.apache.commons.lang.StringUtils" %>
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ include file="/common/taglibs.jsp"%>
<%
-PrintConfigManager printConfigManager = (PrintConfigManager) SpringBeanManger.getBean("printConfigManager");
-List list = printConfigManager.findPrintConfigBySql(" where 1=1 order by orderNum asc");
+ PrintConfigManager printConfigManager = (PrintConfigManager) SpringBeanManger.getBean("printConfigManager");
+ HttpOptionManager httpOptionManager = (HttpOptionManager) SpringBeanManger.getBean("httpOptionManager");
+ List shiftTypes = httpOptionManager.getHttpOptionListById("shiftType");
+ request.setAttribute("shiftTypes",shiftTypes);
+ String shiftType = request.getParameter("shiftType");
+ String sql;
+ if (StringUtils.isBlank(shiftType) || "all".equals(shiftType)){
+ sql = " where 1=1 order by orderNum asc ";
+ }
+ else {
+ sql = " where shiftType = '" + shiftType + "' order by orderNum asc ";
+ }
+ List list = printConfigManager.findPrintConfigBySql(sql);
+ request.setAttribute("list",list);
%>
<%@ include file="/common/clearCache.jsp"%>
选择用户
+
@@ -28,21 +63,34 @@
self.returnValue = id+""+text;
self.close();
});
+ $('#shiftType').on('change',function(){
+ var type = $(this).val();
+ $("form").submit();
+ });
});
-
- <%
- if(list.size()>0){
- for(PrintConfig pc : list){
- %>
-
<%=pc.getShift()%>
- <%
- }
- }
- %>
+
+
+
+
\ No newline at end of file