Index: ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jasper =================================================================== diff -u -r18373 -r18380 Binary files differ Index: ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java =================================================================== diff -u -r18368 -r18380 --- ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java (.../DeviceMaintenanceCusInsManagerImpl.java) (revision 18368) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java (.../DeviceMaintenanceCusInsManagerImpl.java) (revision 18380) @@ -129,8 +129,11 @@ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm"); try{ 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); dmInstance.setRegistrant(dmInstance.getCreateUserName()); dmInstance.setDeviceName(requestParams.get("formName")); Index: ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml =================================================================== diff -u -r18373 -r18380 --- ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml (.../deviceMaintenanceCusReport.jrxml) (revision 18373) +++ ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml (.../deviceMaintenanceCusReport.jrxml) (revision 18380) @@ -97,9 +97,9 @@ - + - + @@ -142,7 +142,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -272,13 +272,13 @@ - + - +