Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java =================================================================== diff -u -r37001 -r37002 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java (.../StatisticalWorkloadHelper.java) (revision 37001) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java (.../StatisticalWorkloadHelper.java) (revision 37002) @@ -236,7 +236,6 @@ +dataIndex.getWorkAmountByPackageSQL("发货数量", params) + ") tl group by tl.userName " + integralSql); - tousseAmountSql += " union all "; //查询一次性物品 Map disposableGoodsMap = new HashMap(); if(CssdUtils.getSystemSetConfigByNameBool("showDisposableGoodsSendAmountInCssdYearWorkloadReport", false)){ @@ -246,6 +245,7 @@ } //核对记录 if(showInvoiceAssistantSender){ + tousseAmountSql += " union all "; tousseAmountSql += String.format("select '核对数量' type,tl.userName,sum(tl.amount) amount"+ sumIntegralSql +" from (" +dataIndex.getWorkAmountByPackageSQL("核对数量", params) + ") tl group by tl.userName " + integralSql); @@ -422,8 +422,8 @@ + ") tl group by tl.userName "); params.extraSelectColumns = ""; params.groupBySql = "" ; - materialAmountSql += " union all "; if(showInvoiceAssistantSender){ + materialAmountSql += " union all "; materialAmountSql += String.format("select '核对数量' type,tl.userName,sum(tl.amount) amount from (" +dataIndex.getWorkAmountByMaterialSQL("核对数量", params, dataSoureOfMaterialsCountOfToussesInReports) + ") tl group by tl.userName ");