Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java =================================================================== diff -u -r36898 -r37001 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java (.../StatisticalWorkloadHelper.java) (revision 36898) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java (.../StatisticalWorkloadHelper.java) (revision 37001) @@ -93,8 +93,10 @@ sequenceMap.put("审核数量", ++staticFieldsCount); sequenceMap.put("灭菌数量", ++staticFieldsCount); sequenceMap.put("发货数量", ++staticFieldsCount); - sequenceMap.put("核对数量", ++staticFieldsCount); - + boolean showInvoiceAssistantSender = CssdUtils.getSystemSetConfigByNameBool("showInvoiceAssistantSender", false); + if(showInvoiceAssistantSender){ + sequenceMap.put("核对数量", ++staticFieldsCount); + } if (showInvoicePersonInCharge){ sequenceMap.put("下送数量", ++staticFieldsCount); } @@ -243,10 +245,11 @@ params.includeTousses = true; } //核对记录 - tousseAmountSql += String.format("select '核对数量' type,tl.userName,sum(tl.amount) amount"+ sumIntegralSql +" from (" - +dataIndex.getWorkAmountByPackageSQL("核对数量", params) - + ") tl group by tl.userName " + integralSql); - + if(showInvoiceAssistantSender){ + tousseAmountSql += String.format("select '核对数量' type,tl.userName,sum(tl.amount) amount"+ sumIntegralSql +" from (" + +dataIndex.getWorkAmountByPackageSQL("核对数量", params) + + ") tl group by tl.userName " + integralSql); + } //发货下送责任人 if(showInvoicePersonInCharge){ tousseAmountSql += " union all "; @@ -420,10 +423,11 @@ params.extraSelectColumns = ""; params.groupBySql = "" ; materialAmountSql += " union all "; - materialAmountSql += String.format("select '核对数量' type,tl.userName,sum(tl.amount) amount from (" - +dataIndex.getWorkAmountByMaterialSQL("核对数量", params, dataSoureOfMaterialsCountOfToussesInReports) - + ") tl group by tl.userName "); - + if(showInvoiceAssistantSender){ + materialAmountSql += String.format("select '核对数量' type,tl.userName,sum(tl.amount) amount from (" + +dataIndex.getWorkAmountByMaterialSQL("核对数量", params, dataSoureOfMaterialsCountOfToussesInReports) + + ") tl group by tl.userName "); + } //发货下送责任人 if(showInvoicePersonInCharge){ materialAmountSql += " union all ";