Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UrgentNeedGoodsProcessingCycleHelper.java =================================================================== diff -u -r40376 -r41153 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UrgentNeedGoodsProcessingCycleHelper.java (.../UrgentNeedGoodsProcessingCycleHelper.java) (revision 40376) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UrgentNeedGoodsProcessingCycleHelper.java (.../UrgentNeedGoodsProcessingCycleHelper.java) (revision 41153) @@ -366,14 +366,14 @@ "join WashAndDisinfectRecord wr on wr.id=cw.WashAndDisinfectRecord_ID " + "where tdci.isCleanedEntirely='是' and wr.endDate is not null " + "group by ci.recyclingRecordId,ci.tousseDefinitionID " + - ") b on b.recyclingRecordId=rr.id " + - "and b.tousseDefinitionID=ri.tousseDefinitionId "; + ") bWashDate on bWashDate.recyclingRecordId=rr.id " + + "and bWashDate.tousseDefinitionID=ri.tousseDefinitionId "; /*washTimeFromRecyclingItemSql = ",(select sum(case when wr.endDate is null then 0 else "+ datediffWashTime +" end) " + "from ClassifyBasket_WashRecord cwwashTime " + "join "+ WashAndDisinfectRecord.class.getSimpleName() +" wr on wr.id=cwwashTime.WashAndDisinfectRecord_ID " + "where cwwashTime.ClassifyBasket_ID in(select ciwashTime.classifybasket_id from "+ ClassifiedItem.class.getSimpleName() +" ciwashTime " + " where ciwashTime.recyclingRecordId=rr.id and ciwashTime.tousseDefinitionID=ri.tousseDefinitionId and td.isCleanedEntirely='是')) washTime ";*/ - washTimeFromRecyclingItemSql = ",b.washTime "; + washTimeFromRecyclingItemSql = ",bWashDate.washTime "; } String washStartTimeSql = queryWashStartTime?",(select min(wr.startDate) from "+ WashAndDisinfectRecord.class.getSimpleName() +" wr " + "join ClassifyBasket_WashRecord cw on cw.WashAndDisinfectRecord_ID=wr.id "