Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java =================================================================== diff -u -r38630 -r38641 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java (.../RealTimeBulletinBoardWorkloadHelper.java) (revision 38630) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java (.../RealTimeBulletinBoardWorkloadHelper.java) (revision 38641) @@ -1079,7 +1079,7 @@ String applyAmountSql = String.format("select 'applyAmount' type,sum(amount) amount,0 urgentAmount from (" +dataIndex.getWorkAmountByPackageSQL("申请数量", params) + ") tl"); - sql += " union all " + applyAmountSql; + sql = applyAmountSql; //当天待回收的包数量 String toBeRecycledAmountSql = "select 'toBeRecycledAmount' type,sum(amount) amount,0 urgentAmount from ( " + getToBeRecycledAmountSql(handleDepartCoding, "", toBeBetweenSql, false) + ") tb "; @@ -1549,7 +1549,7 @@ //当天待发货的总包数 String toBeInvoiceAmountSql = " select 'toBeInvoiceAmount' type,sum(amount) amount,sum(urgentAmount) urgentAmount from ( " + getToBeInvoiceAmountSql(handleDepartCoding, "", toBeBetweenSql) + ") tb "; - sql += " union all " + toBeInvoiceAmountSql; + sql = toBeInvoiceAmountSql; //当天已发货的总包数 String invoicedAmountSql = String.format("select 'invoicedAmount' type,sum(amount) amount,0 urgentAmount from (" +dataIndex.getWorkAmountByPackageSQL("发货数量", params) @@ -1623,7 +1623,7 @@ } }else if("urgentgoodsdetails".equalsIgnoreCase(dataSources)){//加急物品明细追溯模式 return getUrgentGoodsDetails(); - }else if("urgentToussehandleInfo".equals(dataSources)){ + }else if("urgenttoussehandleinfo".equalsIgnoreCase(dataSources)){ return getUrgentToussehandleInfo(); } if(result == null){