Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r14838 -r14840 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 14838) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 14840) @@ -28,6 +28,7 @@ import com.forgon.disinfectsystem.common.Constants; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; +import com.forgon.disinfectsystem.vo.TousseItemVo; import com.forgon.tools.hibernate.ObjectDao; /** @@ -142,6 +143,8 @@ @JsonIgnore private List applicationItems;// 申请的物品 + + private List newTousseItemVos = new ArrayList(); @JsonIgnore private List invoice; // 发货单 @@ -306,8 +309,20 @@ } public void setApplicationItems(List applicationItems) { + setNewTousseItemVos(applicationItems); this.applicationItems = applicationItems; } + + public void setNewTousseItemVos(List applicationItems) { + if(TYPE_BORROWINGSINGLE.equals(getType()) && CollectionUtils.isNotEmpty(applicationItems)){ + for(TousseItem ti : applicationItems){ + TousseItemVo vo = new TousseItemVo(); + vo.setTousseName(ti.getTousseName()); + vo.setAmount(ti.getAmount()); + newTousseItemVos.add(vo); + } + } + } @OneToMany(mappedBy = "invoicePlan", fetch = FetchType.LAZY) public List getInvoice() { @@ -754,9 +769,9 @@ public String getLendGoodsBrief() { List lendGoodsBriefList = new ArrayList(); String[] lendGoodsBriefArray = null; - if(TYPE_BORROWINGSINGLE.equals(getType()) && CollectionUtils.isNotEmpty(applicationItems)){ + if(TYPE_BORROWINGSINGLE.equals(getType()) && CollectionUtils.isNotEmpty(newTousseItemVos)){ Map map = new HashMap(); - for(TousseItem ti : applicationItems){ + for(TousseItemVo ti : newTousseItemVos){ if(map.get(ti.getTousseName()) == null){ map.put(ti.getTousseName() , ti.getAmount()); }else{