Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r15495 -r15505 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15495) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15505) @@ -11822,7 +11822,8 @@ + "rr.recyclingTime recyclingTime," + "fta.tousseName tousseName," + "fta.supplierName supplierName," - + "cb.personInCharge personInCharge " + + "cb.personInCharge personInCharge," + + "cw.WashAndDisinfectRecord_ID washAndDisinfectRecordId " + "from RecyclingRecord rr " + "inner join ClassifyBasket_RecyclingRecord cr on cr.RecyclingRecord_ID=rr.id " @@ -11851,6 +11852,8 @@ String invoicePlanID = StringTools.defaultString(result.getString("invoicePlanID")); ForeignTousseAfterUseDeliveryVO vo = voMap.get(invoicePlanID); String personInCharge = StringTools.defaultString(result.getString("personInCharge")); + String washAndDisinfectRecordId = StringTools.defaultString(result.getString("washAndDisinfectRecordId")); + personInCharge = (washAndDisinfectRecordId.equals("") ? "" : personInCharge); //怕用户录入了清洗记录,然后又把他删除了,但是在书库中只删除关系表 if (vo == null) { vo = new ForeignTousseAfterUseDeliveryVO();