Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java =================================================================== diff -u -r35354 -r35357 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 35354) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 35357) @@ -662,12 +662,11 @@ } if(!obj.getIsOnlyQueryComboTousse()){ amountSql = String - .format("select sum(%s) amount %s %s %s %s " + .format("select sum(%s) amount %s %s %s " + "%s from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where %s and ti.operationTime %s %s %s and %s %s %s " + "%s %s %s %s %s %s", amountColumnSql, - getDatePeriodSelectSql(obj.monthlyStr), obj.selectUserName?",case when (ti.operator is null) then '系统用户' else ti.operator end userName":"", obj.selectTousseType ? ",td.tousseType" : "", obj.selectTousseName ? ",td.name tousseName" : "", @@ -695,12 +694,11 @@ groupBySql = groupBySql.replace("td.name", "ti.comboTousseDefinitionName"); } amountSql += String - .format("select sum(%s) amount %s %s %s %s " + .format("select sum(%s) amount %s %s %s " + "%s from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseDefinitionId is not null and ti.comboTousseInstanceId is not null and ti.operationTime %s %s %s and %s %s %s " + "%s %s %s %s %s ", amountColumnSql, - getDatePeriodSelectSql(obj.monthlyStr), obj.selectUserName?",case when (ti.operator is null) then '系统用户' else ti.operator end userName":"", obj.selectTousseType ? ",'"+TousseDefinition.PACKAGE_TYPE_COMBO + "' tousseType" : "", obj.selectTousseName ? ",ti.comboTousseDefinitionName tousseName" : "", Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35353 -r35357 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35353) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35357) @@ -2146,6 +2146,7 @@ workAmountByPackageOfDisinfectionSql = dataIndex.getWorkAmountByPackageSQL("配包数量", params); }else{ int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3); + params.extraSelectColumns = ",td.packageSize packageSize ," + queryDateSQL + " monthstr"; workAmountByPackageOfDisinfectionSql = dataIndex.getWorkAmountByMaterialSQL("配包数量", params,dataSoureOfMaterialsCountOfToussesInReports); } ResultSet disinfectionRs = null;