Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r15632 -r15807
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 15632)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 15807)
@@ -434,6 +434,7 @@
     <input type="hidden" id="parm_s_listType" name="parm_s_listType" value="<%=listType%>">
     <input type="hidden" id="parm_s_startTime" name="parm_s_startTime" >
     <input type="hidden" id="parm_s_endTime" name="parm_s_endTime" >
+    <input type="hidden" id="parm_s_timeSearchFmt" name="parm_s_timeSearchFmt" >
     <input type="hidden" id="parm_s_status" name="parm_s_status" value="unFinish">
 </form>
 </body>
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r15732 -r15807
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 15732)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 15807)
@@ -255,13 +255,14 @@
 		//根据开始时间和结束时间来查询
 		String startTime = sqlWhereParamMap.get("startTime");
 		String endTime = sqlWhereParamMap.get("endTime");
-		if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)){
-			this.createTimeFilterSql(sqlBuilder,startTime,endTime);
+		String timeSearchFmt = sqlWhereParamMap.get("timeSearchFmt");
+		if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) && StringUtils.isNotBlank(timeSearchFmt)){
+			this.createTimeFilterSql(sqlBuilder,startTime,endTime,timeSearchFmt);
 		}
 
         //查看申请单时过滤未完成或者已完成状态
         String status = sqlWhereParamMap.get("status");
-		if (StringUtils.isNotEmpty(status)){
+		if (StringUtils.isNotBlank(status)){
 		// if (StringUtils.isNotEmpty(status)  && "todoList".equals(listType)){
 			if ("unFinish".equals(status)){
 				this.createUnFinishFilterSql(sqlBuilder);
@@ -284,12 +285,23 @@
      * @param sqlBuilder 原来的sql
      * @param startTime 开始时间
      * @param endTime 结束时间
+     * @param timeSearchFmt 时间查询的格式(config.js的timeSearchFmt)
      */
-    private void createTimeFilterSql(StringBuilder sqlBuilder,String startTime,String endTime){
-        String start = dateQueryAdapter.dateAdapter(DateUtils.truncate(new Date(Long.parseLong(startTime)), Calendar.DAY_OF_MONTH));
-        //因为要小于结束时间,所以加1天
-        Date dt = DateUtils.addDays(new Date(Long.parseLong(endTime)), 1);
-        String end = dateQueryAdapter.dateAdapter(DateUtils.truncate(dt, Calendar.DAY_OF_MONTH));
+    private void createTimeFilterSql(StringBuilder sqlBuilder,String startTime,String endTime, String timeSearchFmt){
+		String start;
+		String end;
+		//精确到年月日
+		if (timeSearchFmt.indexOf("H") == -1){
+			start = dateQueryAdapter.dateAdapter(DateUtils.truncate(new Date(Long.parseLong(startTime)), Calendar.DAY_OF_MONTH));
+			//因为要小于结束时间,所以加1天
+			Date dt = DateUtils.addDays(new Date(Long.parseLong(endTime)), 1);
+			end = dateQueryAdapter.dateAdapter(DateUtils.truncate(dt, Calendar.DAY_OF_MONTH));
+		}
+		//至少精确到小时
+		else {
+			start = dateQueryAdapter.dateAdapter(new java.sql.Date(Long.parseLong(startTime)));
+			end = dateQueryAdapter.dateAdapter(new java.sql.Date(Long.parseLong(endTime)));
+		}
         sqlBuilder.append(String.format(" AND (po.submitTime >= %s and po.submitTime < %s OR po.recyclingTime >= %s and po.recyclingTime < %s) ",start, end, start, end));
     }
 
Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js
===================================================================
diff -u -r15800 -r15807
--- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js	(.../config.js)	(revision 15800)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js	(.../config.js)	(revision 15807)
@@ -65,5 +65,9 @@
   //显示预回收确认人
   hiddenPreRecyclingConfirmPeople : true,
   //显示回收时间
-  showRecyclingTime : true
+  showRecyclingTime : true,
+  //按照时间查询格式
+  timeSearchFmt : 'Y-m-d H:i',
+  //是否显示按照时间查询
+  showTimeSearch : true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r15602 -r15807
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 15602)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 15807)
@@ -115,5 +115,7 @@
   //外来器械申请时显示原始包定义还是显示最近一次申请的包定义
   isShowForeignTousseAncestorDefinitionForApply : true,
   //是否在点击批量打印后显示未打印的名单
-  isShowNoPrintList : true
+  isShowNoPrintList : true,
+  //是否显示按照时间查询
+  showTimeSearch : true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r15761 -r15807
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 15761)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 15807)
@@ -3438,6 +3438,7 @@
 		}
         document.getElementById('parm_s_startTime').value = value1;
         document.getElementById('parm_s_endTime').value = value2;
+        document.getElementById('parm_s_timeSearchFmt').value = sstsConfig.timeSearchFmt;
         grid.dwrReload();
 	}
 
@@ -3701,35 +3702,35 @@
         quickScreenCombo,
 		// { text : '时间筛选:'},submitTimeCombo,
 		{
-			hidden : sstsConfig.recyclingApplicationVersion != 2,
+			hidden : !sstsConfig.showTimeSearch,
 			text : '开始日期:'
 		}, {
-			xtype : 'datefield',
+			xtype : sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
 			fieldLabel : '开始日期',
-			hidden : sstsConfig.recyclingApplicationVersion != 2,
+			hidden : !sstsConfig.showTimeSearch,
 			name : 'startDate',
+			format : sstsConfig.timeSearchFmt || 'Y-m-d',
+			name : 'startDate',
 			id : 'startDate',
 			readOnly : false,
 			editable : false,
-			altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-			format : 'Y-m-d',
-			width:100
+			width : sstsConfig.timeSearchFmt ? 130 : 100
 		}, {
-			hidden : sstsConfig.recyclingApplicationVersion != 2,
+			hidden : !sstsConfig.showTimeSearch,
 			text : '结束日期:'
 		}, {
-			xtype : 'datefield',
+			xtype : sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
 			fieldLabel : '结束日期',
-			hidden : sstsConfig.recyclingApplicationVersion != 2,
+			hidden : !sstsConfig.showTimeSearch,
 			name : 'endDate',
 			id : 'endDate',
 			readOnly : false,
 			editable : false,
-			altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-			format : 'Y-m-d',
-			width:100
+			// altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+			format : sstsConfig.timeSearchFmt || 'Y-m-d',
+			width : sstsConfig.timeSearchFmt ? 130 : 100
 		},{
-			hidden : sstsConfig.recyclingApplicationVersion != 2,
+			hidden : !sstsConfig.showTimeSearch,
 			xtype : 'button',
 			text : '查询',
 			// iconCls : 'btn_ext_application_search',