Index: forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
===================================================================
diff -u -r18382 -r18388
--- forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java	(.../DateQueryAdapter.java)	(revision 18382)
+++ forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java	(.../DateQueryAdapter.java)	(revision 18388)
@@ -206,6 +206,23 @@
 		return "";
 	}
 	/**
+	 * 时间类型转换成字符串，取年月日时分
+	 * @param property
+	 * @return
+	 */
+	public String dateToVarchar4(String property) {
+		if (StringUtils.isNotBlank(property)) {
+			if (dbConnection.isSqlServer()) {
+				return "CONVERT(varchar(19),"+property+",120)";
+			} else if (dbConnection.isOracle()) {
+				return "to_char("+property+",'yyyy-mm-dd HH24:MI:SS')";
+			} else if (dbConnection.isMySQL()) {
+				return  property ;
+			}
+		}
+		return "";
+	}
+	/**
 	 * 替换sql查询条件的日期
 	 * 
 	 * @param date
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r18382 -r18388
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18382)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18388)
@@ -12663,7 +12663,7 @@
 //						formName, materialName, tousseName, monitoringType);
 			String whereSql = buildDeviceMaintenaceWhereSQL(startDay, endDay, querySupplyRoom,
 					deviceMaintenanceName);
-			String dataSql = dateQueryAdapter.dateToVarchar3("dmci.maintenanceTime");
+			String dataSql = dateQueryAdapter.dateToVarchar4("dmci.maintenanceTime");
 			String sql =  " select " + dataSql + " dateStr,"
 						+ " fd.formName formName,dmci.projectName projectName,dmci.id dmciId,fi.createUserName createUserName,"
 						+ " fdi.name fdiName, fdi.orderNumber orderNum,fdio.value,fiov.id "
Index: ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js
===================================================================
diff -u -r18373 -r18388
--- ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js	(.../deviceMaintenanceCostomInsForm.js)	(revision 18373)
+++ ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js	(.../deviceMaintenanceCostomInsForm.js)	(revision 18388)
@@ -451,7 +451,7 @@
 					name : 'maintenanceTime',
 					value : new Date(),
 					editable : false,
-					format : 'Y-m-d H:i',
+					format : 'Y-m-d H:i:s',
 					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',
 					allowBlank : false,
 					anchor : '95%'
@@ -515,7 +515,7 @@
 				top.Ext.getCmp("formDefinitionId").setValue(result.data.formDefinition.id);
 				top.Ext.getCmp("formName").setValue(result.data.formDefinition.formName);
 				top.Ext.getCmp("projectName").setValue(result.data.projectName);
-				top.Ext.getCmp('maintenanceTime').setValue(top.Ext.util.Format.date(new Date(result.data.maintenanceTime.time),"Y-m-d H:i"));
+				top.Ext.getCmp('maintenanceTime').setValue(top.Ext.util.Format.date(new Date(result.data.maintenanceTime.time),"Y-m-d H:i:s"));
 				top.Ext.getCmp("createUserName").setValue(result.data.createUserName);
 				top.Ext.getCmp("createDate").setValue(Ext.util.Format.date(new Date(result.data.createDate.time), 'Y-m-d H:i'));
 				top.Ext.getCmp("remark").setValue(result.data.remark);
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java
===================================================================
diff -u -r18382 -r18388
--- ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java	(.../DeviceMaintenanceCusInsManagerImpl.java)	(revision 18382)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java	(.../DeviceMaintenanceCusInsManagerImpl.java)	(revision 18388)
@@ -126,14 +126,15 @@
 	@Override
 	public void saveDeviceMaintenanceCusI(DeviceMaintenanceCusI dmInstance,Map<String, String> requestParams) {
 		// 设置维护时间
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat sdfCre=new SimpleDateFormat("yyyy-MM-dd HH:mm");
 		try{
 			String maintenanceTimeStr = requestParams.get("maintenanceTime");
 			String createDateStr = requestParams.get("createDate");
 			Date date = sdf.parse(maintenanceTimeStr);
 			dmInstance.setMaintenanceTime(date);
 			if(StringUtils.isNotBlank(createDateStr) && createDateStr.length() > 14){
-				Date createDate = sdf.parse(createDateStr);
+				Date createDate = sdfCre.parse(createDateStr);
 				dmInstance.setCreateDate(createDate);
 			}
 			dmInstance.setRegistrant(dmInstance.getCreateUserName());
Index: ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.js
===================================================================
diff -u -r18373 -r18388
--- ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.js	(.../deviceMaintenanceCostomInsView.js)	(revision 18373)
+++ ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.js	(.../deviceMaintenanceCostomInsView.js)	(revision 18388)
@@ -54,8 +54,8 @@
 	var columns = [
 	    {header : "设备名称",width : 250,dataIndex : 'formDefinition.formName', renderer : modifyRecord},
 	    {header : "项目名称",width : 120,dataIndex : 'projectName'},
-	    {header : "维护时间",width : 120,dataIndex : 'maintenanceTime',renderer : myDateFormatByMinute},
-	    {header : "登记时间",width : 120,dataIndex : 'createDate',renderer : myDateFormatByMinute},
+	    {header : "维护时间",width : 150,dataIndex : 'maintenanceTime',renderer : myDateFormatBySecond},
+	    {header : "登记时间",width : 150,dataIndex : 'createDate',renderer : myDateFormatByMinute},
 	    {header : "登记人",width : 120,dataIndex : 'createUserName'},
 	    {id : 'remark',header : "备注",width : 120,dataIndex : 'remark'}
 	];