Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcarddefinition/IDCardDefinition.java =================================================================== diff -u -r12799 -r14852 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcarddefinition/IDCardDefinition.java (.../IDCardDefinition.java) (revision 12799) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcarddefinition/IDCardDefinition.java (.../IDCardDefinition.java) (revision 14852) @@ -52,6 +52,8 @@ * 标识牌定义的使用次数,等于关联的标识牌实例的使用次数之和 */ private Long useAmount = 0L; + + private Long lastTousseInstanceId; @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -95,6 +97,21 @@ this.useAmount = useAmount; } + public Long getLastTousseInstanceId() { + return lastTousseInstanceId; + } + + public void setLastTousseInstanceId(Long lastTousseInstanceId) { + this.lastTousseInstanceId = lastTousseInstanceId; + } + + public void safelySetLastTousseInstanceId(Long lastTousseInstanceId) { + if(this.lastTousseInstanceId == null){ + this.lastTousseInstanceId = lastTousseInstanceId; + }else if(lastTousseInstanceId > this.lastTousseInstanceId){ + this.lastTousseInstanceId = lastTousseInstanceId; + } + } public Double getPrice() { if (price == null) { price = 0.0; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinstance/IDCardInstance.java =================================================================== diff -u -r12799 -r14852 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinstance/IDCardInstance.java (.../IDCardInstance.java) (revision 12799) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinstance/IDCardInstance.java (.../IDCardInstance.java) (revision 14852) @@ -34,6 +34,8 @@ private Long useAmount = 0L; private Long recyclingErrorID; + + private Long lastTousseInstanceId; @Transient public List getTousseInstances(ObjectDao dao) { @@ -82,7 +84,12 @@ } public void setUseAmount(Long useAmount) { - this.useAmount = useAmount; + if(useAmount == null){ + this.useAmount = 0L; + }else{ + this.useAmount = useAmount; + } + } public Long getRecyclingErrorID() { @@ -93,6 +100,22 @@ this.recyclingErrorID = recyclingErrorID; } + public Long getLastTousseInstanceId() { + return lastTousseInstanceId; + } + + public void setLastTousseInstanceId(Long lastTousseInstanceId) { + this.lastTousseInstanceId = lastTousseInstanceId; + } + + public void safelySetLastTousseInstanceId(Long lastTousseInstanceId) { + if(this.lastTousseInstanceId == null){ + this.lastTousseInstanceId = lastTousseInstanceId; + }else if(lastTousseInstanceId > this.lastTousseInstanceId){ + this.lastTousseInstanceId = lastTousseInstanceId; + } + } + // 校验关联信息是否正确 @Transient public boolean isAssociatedInfoValid() {