Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java =================================================================== diff -u -r38741 -r38742 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java (.../RealTimeBulletinBoardWorkloadHelper.java) (revision 38741) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java (.../RealTimeBulletinBoardWorkloadHelper.java) (revision 38742) @@ -1225,7 +1225,6 @@ }else{ startDate += dateStr + " 00:00:00"; } - startDate = "2024-09-01 00:00:00"; String endDate = dateStr + " 23:59:59"; String betweenSql = " between "+ dateQueryAdapter.dateAdapter(startDate) + " and " + dateQueryAdapter.dateAdapter(endDate); @@ -1272,7 +1271,6 @@ +dataIndex.getWorkAmountByPackageSQL("清洗数量", foreignParams) + ") tl "); sql += " union all " + foreignWashedAmountSql; - //中秋收假回来从这里开始做 //外来器械当天待装配的总包数 String foreignToBePackAmountSql = " select 'foreignToBePackAmount' type,sum(amount) amount,0 urgentAmount from ( " + getToBePackAmountSql(handleDepartCoding, tousseTypesql, betweenSql,dateType) + ") tb ";