Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r23617 -r24420 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 23617) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 24420) @@ -6,8 +6,10 @@ import javax.persistence.CascadeType; import javax.persistence.Entity; + import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -32,6 +34,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerGrossRecord; +import com.forgon.tools.util.ForgonDateUtils; /** * @author WangYi 2012-2-24 @@ -69,13 +72,23 @@ * 开始时间 */ private Date startDate; + + /** + * 开始时间(日期时间格式字符串yyyy-MM-dd hh:mm) + */ + private String startDateStr; /** * 结束时间 */ private Date endDate; /** + * 结束时间(日期时间格式字符串yyyy-MM-dd hh:mm) + */ + private String endDateStr; + + /** * 状态 */ private String status; @@ -308,6 +321,22 @@ this.endDate = endDate; } + public String getStartDateStr() { + return ForgonDateUtils.safelyFormatDate(startDate, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null); + } + + public void setStartDateStr(String startDateStr) { + this.startDateStr = startDateStr; + } + + public String getEndDateStr() { + return ForgonDateUtils.safelyFormatDate(endDate, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null); + } + + public void setEndDateStr(String endDateStr) { + this.endDateStr = endDateStr; + } + public Integer getFrequency() { return frequency; }