Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r14840 -r14844 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 14840) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 14844) @@ -144,8 +144,6 @@ @JsonIgnore private List applicationItems;// 申请的物品 - private List newTousseItemVos = new ArrayList(); - @JsonIgnore private List invoice; // 发货单 @@ -309,21 +307,9 @@ } 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() { return invoice; @@ -767,29 +753,35 @@ } public String getLendGoodsBrief() { + return lendGoodsBrief; + } + + public void setLendGoodsBrief(String lendGoodsBrief) { + this.lendGoodsBrief = lendGoodsBrief; + } + + public void tousseItemList2LendGoodsBrief(){ List lendGoodsBriefList = new ArrayList(); String[] lendGoodsBriefArray = null; - if(TYPE_BORROWINGSINGLE.equals(getType()) && CollectionUtils.isNotEmpty(newTousseItemVos)){ - Map map = new HashMap(); - for(TousseItemVo ti : newTousseItemVos){ - if(map.get(ti.getTousseName()) == null){ - map.put(ti.getTousseName() , ti.getAmount()); - }else{ - map.put(ti.getTousseName() , map.get(ti.getTousseName()) + ti.getAmount()); + if(TYPE_BORROWINGSINGLE.equals(getType())){ + if(CollectionUtils.isNotEmpty(applicationItems)){ + Map map = new HashMap(); + for(TousseItem ti : applicationItems){ + if(map.get(ti.getTousseName()) == null){ + map.put(ti.getTousseName() , ti.getAmount()); + }else{ + map.put(ti.getTousseName() , map.get(ti.getTousseName()) + ti.getAmount()); + } } + for(String key : map.keySet()){ + lendGoodsBriefList.add(key + "x" + map.get(key)); + } } - for(String key : map.keySet()){ - lendGoodsBriefList.add(key + "x" + map.get(key)); - } } lendGoodsBriefArray = new String[lendGoodsBriefList.size()]; lendGoodsBriefList.toArray(lendGoodsBriefArray); - return StringUtils.join(lendGoodsBriefArray, ","); + setLendGoodsBrief(StringUtils.join(lendGoodsBriefArray, ",")); } - - public void setLendGoodsBrief(String lendGoodsBrief) { - this.lendGoodsBrief = lendGoodsBrief; - } @Transient public TousseItem findTousseItemById(Long id) { Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r14791 -r14844 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14791) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 14844) @@ -347,6 +347,30 @@ String message = committedStatus ? "提交成功" : "保存成功"; try{ + //省医需求:如果是借物单,则将申请物品明细转换至物品简要属性 + if(InvoicePlan.TYPE_BORROWINGSINGLE.equals(application.getType())){ + application.tousseItemList2LendGoodsBrief(); + if(StringUtils.isBlank(application.getLendGoodsBrief())){ + if(CollectionUtils.isNotEmpty(newTousseItemVoList)){ + List lendGoodsBriefList = new ArrayList(); + String[] lendGoodsBriefArray = null; + Map map = new HashMap(); + for(TousseItemVo ti : newTousseItemVoList){ + if(map.get(ti.getTousseName()) == null){ + map.put(ti.getTousseName() , ti.getAmount()); + }else{ + map.put(ti.getTousseName() , map.get(ti.getTousseName()) + ti.getAmount()); + } + } + for(String key : map.keySet()){ + lendGoodsBriefList.add(key + "x" + map.get(key)); + } + lendGoodsBriefArray = new String[lendGoodsBriefList.size()]; + lendGoodsBriefList.toArray(lendGoodsBriefArray); + application.setLendGoodsBrief(StringUtils.join(lendGoodsBriefArray, ",")); + } + } + } String msg = recyclingApplicationManager.saveRecyclingApplication(application, newTousseItemVoList, committedStatus); if (StringUtils.isNotBlank(msg)){