Index: ssts-web/src/main/resources/mybatis/mappers/invoice/invoice.xml =================================================================== diff -u --- ssts-web/src/main/resources/mybatis/mappers/invoice/invoice.xml (revision 0) +++ ssts-web/src/main/resources/mybatis/mappers/invoice/invoice.xml (revision 24590) @@ -0,0 +1,16 @@ + + + + + + + + + \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java =================================================================== diff -u -r23492 -r24590 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java (.../Invoice.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java (.../Invoice.java) (revision 24590) @@ -1,14 +1,13 @@ package com.forgon.disinfectsystem.entity.invoicemanager; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.Set; import javax.persistence.Column; 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; @@ -24,8 +23,11 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.forgon.Constants; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsInstance; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.idpredicate.IDAble; @@ -217,6 +219,14 @@ return sendTime; } + @Transient + public String getSendTime_YYYYMMDDHHMM() { + if(sendTime != null){ + return new SimpleDateFormat(Constants.DATEFORMAT_YYYYMMDDHHMM).format(sendTime); + } + return ""; + } + public void setSendTime(Date sendTime) { this.sendTime = sendTime; } @@ -285,6 +295,14 @@ return receiptingTime; } + @Transient + public String getReceiptingTime_YYYYMMDDHHMM() { + if(receiptingTime != null){ + return new SimpleDateFormat(Constants.DATEFORMAT_YYYYMMDDHHMM).format(receiptingTime); + } + return ""; + } + public void setReceiptingTime(Date receiptingTime) { this.receiptingTime = receiptingTime; } @@ -370,6 +388,14 @@ public Date getApplicationTime() { return applicationTime; } + + @Transient + public String getApplicationTime_YYYYMMDDHHMM() { + if(applicationTime != null){ + return new SimpleDateFormat(Constants.DATEFORMAT_YYYYMMDDHHMM).format(applicationTime); + } + return ""; + } public void setApplicationTime(Date applicationTime) { this.applicationTime = applicationTime; @@ -379,6 +405,14 @@ return recyclingTime; } + @Transient + public String getRecyclingTime_YYYYMMDDHHMM() { + if(recyclingTime != null){ + return new SimpleDateFormat(Constants.DATEFORMAT_YYYYMMDDHHMM).format(recyclingTime); + } + return ""; + } + public void setRecyclingTime(Date recyclingTime) { this.recyclingTime = recyclingTime; } Index: ssts-web/src/main/resources/local-mybatis-config.xml =================================================================== diff -u -r24524 -r24590 --- ssts-web/src/main/resources/local-mybatis-config.xml (.../local-mybatis-config.xml) (revision 24524) +++ ssts-web/src/main/resources/local-mybatis-config.xml (.../local-mybatis-config.xml) (revision 24590) @@ -7,6 +7,7 @@ +