Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r40555 -r40613 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 40555) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 40613) @@ -4540,6 +4540,15 @@ + ", po.urgent,po.specialInfection,po.tousseBarcodes") +" from InvoicePlan po " + extraJoin; String whereSql = getWaitingforRecyclingInvoicePlansCommonWhereSql(true); + //zsyy-377 增加对包实例查询的日期范围限制 + int days = CssdUtils.getQueryPeroidOfModule("waitRecycleList"); + if(days == 0){ + days = 180; + } + String[] defaultQueryStartDateAndEndDateArray = CssdUtils.getQueryPeroidOfModule(days); + if(defaultQueryStartDateAndEndDateArray != null){ + whereSql += " and " + dateQueryAdapter.dateAreaSql("po.submitTime", defaultQueryStartDateAndEndDateArray[0] + " 00:00:00", defaultQueryStartDateAndEndDateArray[1] + " 23:59:59"); + } if (StringUtils.isNotBlank(handleDepartCoding)) { whereSql += String.format(" and po.handleDepartCoding='%s'", handleDepartCoding); }