Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r18374 -r18382
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18374)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18382)
@@ -12663,8 +12663,7 @@
 //						formName, materialName, tousseName, monitoringType);
 			String whereSql = buildDeviceMaintenaceWhereSQL(startDay, endDay, querySupplyRoom,
 					deviceMaintenanceName);
-			String dataSql = dateQueryAdapter.dateToVarchar1("dmci.maintenanceTime");
-			//CONVERT(varchar(10), qmi.dateTime, 120)  to_char(qmi.dateTime, 'yyyy-MM-dd')
+			String dataSql = dateQueryAdapter.dateToVarchar3("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: forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
===================================================================
diff -u -r17493 -r18382
--- forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java	(.../DateQueryAdapter.java)	(revision 17493)
+++ forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java	(.../DateQueryAdapter.java)	(revision 18382)
@@ -189,6 +189,23 @@
 		return "";
 	}
 	/**
+	 * 时间类型转换成字符串，取年月日时分
+	 * @param property
+	 * @return
+	 */
+	public String dateToVarchar3(String property) {
+		if (StringUtils.isNotBlank(property)) {
+			if (dbConnection.isSqlServer()) {
+				return "CONVERT(varchar(16),"+property+",120)";
+			} else if (dbConnection.isOracle()) {
+				return "to_char("+property+",'yyyy-mm-dd HH24:MI')";
+			} else if (dbConnection.isMySQL()) {
+				return  property ;
+			}
+		}
+		return "";
+	}
+	/**
 	 * 替换sql查询条件的日期
 	 * 
 	 * @param date
Index: ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jasper
===================================================================
diff -u -r18380 -r18382
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml
===================================================================
diff -u -r18380 -r18382
--- ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml	(.../deviceMaintenanceCusReport.jrxml)	(revision 18380)
+++ ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml	(.../deviceMaintenanceCusReport.jrxml)	(revision 18382)
@@ -121,7 +121,7 @@
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="13" isBold="true"/>
 							</textElement>
-							<text><![CDATA[日期]]></text>
+							<text><![CDATA[维护时间]]></text>
 						</staticText>
 						<staticText>
 							<reportElement uuid="63f70f13-ab4d-4113-af49-541c7007b3a2" style="table_TH" x="323" y="0" width="170" height="83"/>
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java
===================================================================
diff -u -r18380 -r18382
--- ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java	(.../DeviceMaintenanceCusInsManagerImpl.java)	(revision 18380)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java	(.../DeviceMaintenanceCusInsManagerImpl.java)	(revision 18382)
@@ -131,9 +131,11 @@
 			String maintenanceTimeStr = requestParams.get("maintenanceTime");
 			String createDateStr = requestParams.get("createDate");
 			Date date = sdf.parse(maintenanceTimeStr);
-			Date createDate = sdf.parse(createDateStr);
 			dmInstance.setMaintenanceTime(date);
-			dmInstance.setCreateDate(createDate);
+			if(StringUtils.isNotBlank(createDateStr) && createDateStr.length() > 14){
+				Date createDate = sdf.parse(createDateStr);
+				dmInstance.setCreateDate(createDate);
+			}
 			dmInstance.setRegistrant(dmInstance.getCreateUserName());
 			dmInstance.setDeviceName(requestParams.get("formName"));