Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r40354 -r40370 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 40354) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 40370) @@ -8395,9 +8395,38 @@ vo.setOperationRoom(recyclingApplication.getOperationRoom()); } - RecyclingRecord r_record = invoicePlan.getRecyclingRecord(objectDao); - if(r_record != null){ - vo.setRecyclingRecordId(r_record.getId()); + //一个申请单可能有多个回收记录id + RecyclingRecord r_record = null; + if(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION.equals(invoicePlan.getType())){ + List ids = new ArrayList<>(); + ResultSet rs = null; + try { + rs = objectDao.executeSql("select po.id from " + + RecyclingRecord.class.getSimpleName() + + " po where po.recyclingApplication_id=" + invoicePlan.getId() + + " order by po.id asc"); + while(rs.next()){ + ids.add(rs.getLong("id")); + } + } catch (Exception e) { + logger.error(e); + }finally{ + DatabaseUtil.closeResultSetAndStatement(rs); + } + if(CollectionUtils.isNotEmpty(ids)){ + if(ids.size() > 1){ + vo.setRecyclingRecordId(ids.get(0)); + vo.setRecyclingRecordId2(ids.get(1)); + }else{ + vo.setRecyclingRecordId(ids.get(0)); + } + } + }else{ + //此处获取的回收记录 多个只会返回一个 + r_record = invoicePlan.getRecyclingRecord(objectDao); + if(r_record != null){ + vo.setRecyclingRecordId(r_record.getId()); + } } List itemList = new ArrayList(); List applicationItems = invoicePlan.getApplicationItems(); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/OpenToBeRecycledRecordVo.java =================================================================== diff -u -r36204 -r40370 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/OpenToBeRecycledRecordVo.java (.../OpenToBeRecycledRecordVo.java) (revision 36204) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/OpenToBeRecycledRecordVo.java (.../OpenToBeRecycledRecordVo.java) (revision 40370) @@ -18,6 +18,10 @@ private Long recyclingRecordId; /** + * 二次回收记录的id + */ + private Long recyclingRecordId2; + /** * 编号 */ private String serialNumber; @@ -345,5 +349,12 @@ public void setSpecialInfectionColorCode(String specialInfectionColorCode) { this.specialInfectionColorCode = specialInfectionColorCode; } - + + public Long getRecyclingRecordId2() { + return recyclingRecordId2; + } + + public void setRecyclingRecordId2(Long recyclingRecordId2) { + this.recyclingRecordId2 = recyclingRecordId2; + } }