Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java =================================================================== diff -u -r35244 -r35354 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 35244) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 35354) @@ -662,11 +662,12 @@ } if(!obj.getIsOnlyQueryComboTousse()){ amountSql = String - .format("select sum(%s) amount %s %s %s " + .format("select sum(%s) amount %s %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" : "", @@ -694,11 +695,12 @@ groupBySql = groupBySql.replace("td.name", "ti.comboTousseDefinitionName"); } amountSql += String - .format("select sum(%s) amount %s %s %s " + .format("select sum(%s) amount %s %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" : "",