Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReports.java =================================================================== diff -u -r34167 -r34199 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReports.java (.../CustomReports.java) (revision 34167) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReports.java (.../CustomReports.java) (revision 34199) @@ -238,7 +238,7 @@ reportParams.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseTypeAndPackageSizeSql = ""; - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; //手术器械科室分组设置 String operatingRoomNames = getOperatingRoomNames(); Set operatingRoomNamesSet = null; Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java =================================================================== diff -u -r34126 -r34199 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java (.../WorkQualityCollectionDataIndex.java) (revision 34126) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java (.../WorkQualityCollectionDataIndex.java) (revision 34199) @@ -421,7 +421,7 @@ dateQueryAdapter.dateAdapter(startDay), dateQueryAdapter.dateAdapter(endDay)); params.querySupplyRoom = querySupplyRoom; - params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); params.tousseTypeAndPackageSizeSql = DataIndex .getTousseTypesAndPackageSizesFilterSQL( @@ -635,7 +635,7 @@ dateQueryAdapter.dateAdapter(startDay), dateQueryAdapter.dateAdapter(endDay)); params.querySupplyRoom = querySupplyRoom; - params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); params.tousseTypeAndPackageSizeSql = DataIndex .getTousseTypesAndPackageSizesFilterSQL( @@ -739,7 +739,7 @@ dateQueryAdapter.dateAdapter(startDay), dateQueryAdapter.dateAdapter(endDay)); params.querySupplyRoom = querySupplyRoom; - params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); if(StringUtils.isNotBlank(extraQuery)){ params.extraQuery = extraQuery; } @@ -846,7 +846,7 @@ dateQueryAdapter.dateAdapter(startDay), dateQueryAdapter.dateAdapter(endDay)); params.querySupplyRoom = querySupplyRoom; - params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); params.includeDisposableGoodsInTousse = includeDisposableGoodsInTousse; String sql = String.format("select sum(tl.amount) amount from (" +dataIndex.getWorkAmountByMaterialSQL("配包数量", params,dataSoureOfMaterialsCountOfToussesInReports) @@ -1080,7 +1080,7 @@ reportParams.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; reportParams.extraGroupBy = " group by td.toussetype "; reportParams.extraSelectColumns = " ,td.tousseType tousseType "; String sql = dataIndex.getWorkAmountByPackageSQL("灭菌数量", reportParams); @@ -1142,7 +1142,7 @@ //查询的时间段 String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(queryYear),dateQueryAdapter.dateAdapter(nextYear)); //数据库计算字符串长度的函数名 - String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); ReportQueryParams reportParams = new ReportQueryParams(objectDao); reportParams.betweenSql = betweenSql; @@ -1151,7 +1151,7 @@ reportParams.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseTypeAndPackageSizeSql = ""; - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; // 获取灭菌炉分组 @@ -1215,7 +1215,7 @@ dateQueryAdapter.dateAdapter(startDay), dateQueryAdapter.dateAdapter(endDay)); params.querySupplyRoom = querySupplyRoom; - params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); params.includeDisposableGoods = false; String sql = String.format("select sum(tl.amount) amount from (" @@ -1315,7 +1315,7 @@ dateQueryAdapter.dateAdapter(startDay), dateQueryAdapter.dateAdapter(endDay)); params.querySupplyRoom = querySupplyRoom; - params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); params.includeTousses = false; params.includeDisposableGoods = true; @@ -1526,7 +1526,7 @@ reportParams.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3(dateQueryAdapter.stringFieldToDate("ti.sterileEndTime"),"mm"); reportParams.extraGroupBy = " ,td.tousseType, s.owngroup "; reportParams.extraSelectColumns = " ,td.tousseType tousseType, s.owngroup owngroup "; @@ -4724,7 +4724,7 @@ } reportParams.betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startDay),dateQueryAdapter.dateAdapter(endDay)); reportParams.querySupplyRoom = querySupplyRoom; - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; String sql = dataIndex.getWorkAmountByPackageSQL("灭菌数量", reportParams); tousseBean.setRowNum(list.size()+1); tousseBean.setTitle(StringUtils.isNotBlank(dataIndexNameForDisplay)?dataIndexNameForDisplay:"灭菌物品总包数"); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java =================================================================== diff -u -r34126 -r34199 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java (.../CustomReportsOfXjjqzyy.java) (revision 34126) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java (.../CustomReportsOfXjjqzyy.java) (revision 34199) @@ -294,8 +294,8 @@ String totalSql = null; ReportQueryParams params = new ReportQueryParams(objectDao); //数据库计算字符串长度的函数名 - String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); - params.sqlLengthFunctionName = sqlLengthFunctionName; + //String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = sqlLengthFunctionName; params.querySupplyRoom = querySupplyRoom; // 回收时发现器械缺损不配套例数 缺损不配套的数据显示 /*WorkQualityCollection bean1 = new WorkQualityCollection(); @@ -872,7 +872,7 @@ reportParams.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseTypeAndPackageSizeSql = ""; - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3); // 回收总数的Map Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java =================================================================== diff -u -r33845 -r34199 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java (.../ReportManagerImpl.java) (revision 33845) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java (.../ReportManagerImpl.java) (revision 34199) @@ -233,7 +233,7 @@ params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; params.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; params.tousseTypeAndPackageSizeSql = ""; - params.sqlLengthFunctionName = sqlLengthFunctionName; + //params.sqlLengthFunctionName = sqlLengthFunctionName; params.monthlyStr = wrRendDate; String sql = String.format("select sum(tl.amount) amount, monthstr from (" +dataIndex.getWorkAmountByMaterialSQL("清洗数量", params, dataSoureOfMaterialsCountOfToussesInReports) Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java =================================================================== diff -u -r34126 -r34199 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java (.../CustomReportsOfZsyy.java) (revision 34126) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java (.../CustomReportsOfZsyy.java) (revision 34199) @@ -257,7 +257,7 @@ params.tousseTypeAndPackageSizeSql = ""; //数据库计算字符串长度的函数名 String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); - params.sqlLengthFunctionName = sqlLengthFunctionName; + //params.sqlLengthFunctionName = sqlLengthFunctionName; params.monthlyStr = dateQueryAdapter.dateConverAdapter3("wr.endDate","mm"); // 处理器械总件数 totalSql = String.format("select sum(tl.amount) amount from (" @@ -636,7 +636,7 @@ params.tousseTypeAndPackageSizeSql = ""; //数据库计算字符串长度的函数名 String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); - params.sqlLengthFunctionName = sqlLengthFunctionName; + //params.sqlLengthFunctionName = sqlLengthFunctionName; params.monthlyStr = dateQueryAdapter.dateConverAdapter3("wr.endDate","mm"); // 处理器械总件数 String totalSqlTwo = String.format("select monthstr,sum(tl.amount) amount from (" @@ -1056,7 +1056,7 @@ //查询的时间段 String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(queryYear),dateQueryAdapter.dateAdapter(nextYear)); //数据库计算字符串长度的函数名 - String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); ReportQueryParams reportParams = new ReportQueryParams(objectDao); reportParams.betweenSql = betweenSql; @@ -1065,7 +1065,7 @@ reportParams.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseTypeAndPackageSizeSql = ""; - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3); // 回收总数的Map Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r34185 -r34199 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 34185) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 34199) @@ -935,7 +935,7 @@ dateQueryAdapter.dateAdapter(queryYear), dateQueryAdapter.dateAdapter(nextYear)); reportParams.querySupplyRoom = departCoding; - reportParams.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //reportParams.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3("i.sendTime","mm"); reportParams.extraGroupBy = reportParams.monthlyStr; @@ -1774,7 +1774,7 @@ dateQueryAdapter.dateAdapter(startDate), dateQueryAdapter.dateAdapter(endDate)); params.querySupplyRoom = deptCode ; - params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); params.selectTousseType = true; @@ -7889,7 +7889,7 @@ //查询的时间段 String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startDay),dateQueryAdapter.dateAdapter(endDay)); //数据库计算字符串长度的函数名 - String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); ReportQueryParams params = new ReportQueryParams(objectDao); params.betweenSql = betweenSql; @@ -7898,7 +7898,7 @@ params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; params.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; params.tousseTypeAndPackageSizeSql = ""; - params.sqlLengthFunctionName = sqlLengthFunctionName; + //params.sqlLengthFunctionName = sqlLengthFunctionName; params.isGroup = true; params.monthlyStr = dateQueryAdapter.dateConverAdapter3("wr.endDate",mmOrdd); String sql = null; @@ -8670,8 +8670,8 @@ params.betweenSql = betweenSql; params.querySupplyRoom = orgUnitCoding; //数据库计算字符串长度的函数名 - String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); - params.sqlLengthFunctionName = sqlLengthFunctionName; + //String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = sqlLengthFunctionName; //1.计算申请科室分组为【内部代理灭菌】的【代理灭菌】处理【包数】 2.计算申请科室分组为【临床外部代理灭菌】的【外部代理灭菌】处理【包数】 取数为两者总和 params.extraQuery = " and ( 1=1 " + getProxydisinfectionOrgUnitGroupSql("内部代理灭菌") @@ -9240,7 +9240,7 @@ ReportQueryParams params = new ReportQueryParams(objectDao); params.betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(year + "-01-01 00:00:00"),dateQueryAdapter.dateAdapter(nextYear + " 00:00:00")); params.querySupplyRoom = querySupplyRoom; - params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); params.selectTousseType = false; params.selectTousseName = false; params.isGroup = true; @@ -9593,7 +9593,7 @@ String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startDateTime),dateQueryAdapter.dateAdapter(endDateTime)); //数据库计算字符串长度的函数名 - String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); //按器械包类型和器械包大小过滤 String tousseTypeSql = DataIndex.getTousseTypesFilterSQL(tousseTypes); @@ -9615,7 +9615,7 @@ params.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = ""; params.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; params.tousseTypeAndPackageSizeSql = tousseTypeAndPackageSizeSql; - params.sqlLengthFunctionName = sqlLengthFunctionName; + //params.sqlLengthFunctionName = sqlLengthFunctionName; params.tousseTypes = tousseTypes; params.selectUserName = true; params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = SqlUtils.get_InSql_Extra("tdc.taskGroup", taskGroup); @@ -13308,7 +13308,7 @@ params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = taskGroupSqlWithAliasOfTousseDefinitionIsTd; params.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = tousseGroupSqlWithAliasOfTousseDefinitionIsTd; params.tousseTypeAndPackageSizeSql = tousseTypeAndPackageSizeSql; - params.sqlLengthFunctionName = sqlLengthFunctionName; + //params.sqlLengthFunctionName = sqlLengthFunctionName; params.tousseTypes = tousseTypes; params.selectTousseType = true; params.selectTousseName = true; @@ -13670,7 +13670,7 @@ ReportQueryParams reportParams = new ReportQueryParams(objectDao); String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startTime),dateQueryAdapter.dateAdapter(endTime)); reportParams.betweenSql = betweenSql; - reportParams.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //reportParams.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); reportParams.tousseTypeAndPackageSizeSql = ""; reportParams.includeDisposableGoods = false; reportParams.extraGroupBy = " td.riskLevel,td.tousseType "; @@ -19817,7 +19817,7 @@ reportParams.betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startDay), dateQueryAdapter.dateAdapter(endDay)); - reportParams.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //reportParams.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); reportParams.querySupplyRoom = ""; @@ -22491,7 +22491,7 @@ //数据库计算字符串长度的函数名 String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); - params.sqlLengthFunctionName = sqlLengthFunctionName; + //params.sqlLengthFunctionName = sqlLengthFunctionName; params.isGroup = true; if(StringUtils.isNotBlank(tousseType)){ if(tousseType.contains(",")){ @@ -22954,7 +22954,7 @@ reportParams.querySupplyRoom = departmentCode; //数据库计算字符串长度的函数名 String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; reportParams.isGroup=true; reportParams.extraQuery = " and sr.status<>'"+ SterilizationRecord.STERILIZATION_STATUS_FAILURE +"'"; if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_REUSABLEGOODS_TOTAL) || dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_REUSABLEGOODS_QUALIFIED) || dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_REUSABLEGOODS_QUALIFIEDRATIO)){ @@ -23278,7 +23278,7 @@ reportParams.querySupplyRoom = departmentCode; //数据库计算字符串长度的函数名 String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; reportParams.isGroup=true; reportParams.extraQuery = " and sr.status<>'"+ SterilizationRecord.STERILIZATION_STATUS_FAILURE +"'"; if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_REUSABLEGOODS_TOTAL) || dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_REUSABLEGOODS_QUALIFIED) || dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_REUSABLEGOODS_QUALIFIEDRATIO)){ @@ -27175,7 +27175,7 @@ params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; params.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; params.tousseTypeAndPackageSizeSql = ""; - params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3); // 处理外来器械总件数 Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java =================================================================== diff -u -r34177 -r34199 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 34177) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 34199) @@ -261,13 +261,13 @@ .format("select sum(%s) amount ,rr.recyclingUser userName " + "from RecyclingRecord rr inner join RecyclingItem ri on ri.recyclingRecord_id = rr.id inner join TousseDefinition td on ri.tousseDefinitionId = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where rr.recyclingTime %s %s " - + "and rr.recyclingUser is not null and %s(rr.recyclingUser)<>0 %s %s %s %s " + + "and rr.recyclingUser is not null and rr.recyclingUser<>'' %s %s %s %s " + "group by rr.recyclingUser", amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("rr.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -285,13 +285,13 @@ .format("select sum(%s) amount ,ip.prepareRecycleOperator userName " + "from invoicePlan ip inner join TousseItem ti on ti.recyclingApplication_ID =ip.id inner join TousseDefinition td on td.id = ti.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where ip.prepareRecycleDateTime %s %s " - + "and ip.prepareRecycleOperator is not null and %s(ip.prepareRecycleOperator)<>0 %s %s %s %s " + + "and ip.prepareRecycleOperator is not null and ip.prepareRecycleOperator<>'' %s %s %s %s " + "group by ip.prepareRecycleOperator", amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("ip.handleDepartCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -309,14 +309,14 @@ .format("select " + obj.monthlyStr + " monthstr, sum(%s) amount " + "from RecyclingRecord rr inner join RecyclingItem ri on ri.recyclingRecord_id = rr.id inner join TousseDefinition td on ri.tousseDefinitionId = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where rr.recyclingTime %s %s " - + "and rr.recyclingUser is not null and %s(rr.recyclingUser)<>0 %s %s %s %s " + + "and rr.recyclingUser is not null and rr.recyclingUser<>'' %s %s %s %s " + "group by " + obj.monthlyStr, amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("rr.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -355,7 +355,7 @@ .format("select sum(%s) amount %s %s %s " + "from RecyclingRecord rr inner join RecyclingItem ri on ri.recyclingRecord_id = rr.id inner join TousseDefinition td on ri.tousseDefinitionId = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where rr.recyclingTime %s %s %s and %s %s %s " - + "and rr.operator is not null and %s(rr.operator)<>0 %s %s %s %s %s %s ", + + "and rr.operator is not null and rr.operator<>'' %s %s %s %s %s %s ", amountColumnSql, obj.selectUserName?",rr.operator userName":"", obj.selectTousseType?",td.tousseType":"", @@ -367,7 +367,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("rr.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -876,13 +876,13 @@ + "from TousseInstance ti inner join PackingRecord pr on pr.id = ti.packingRecord_id inner join TousseDefinition td on ti.tousseDefinition_id=td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where pr.packTime %s %s " + " and pr.splitTousseName is null" - + " and pr.inspector is not null and %s(pr.inspector)<>0 %s %s %s %s " + + " and pr.inspector is not null and pr.inspector<>'' %s %s %s %s " + "group by pr.inspector", amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("pr.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -893,14 +893,14 @@ + " from PackingRecord pr inner join TousseDefinition td on pr.tousseDefinitionId = td.parentID " + "inner join TousseInstance ti on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where pr.packTime %s %s " - + " and td.tousseType='%s' and pr.inspector is not null and %s(pr.inspector)<>0 %s %s %s %s " + + " and td.tousseType='%s' and pr.inspector is not null and pr.inspector<>'' %s %s %s %s " + "group by pr.inspector ", amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("pr.orgUnitCoding", obj.querySupplyRoom), TousseDefinition.PACKAGE_TYPE_SPLIT, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -917,14 +917,14 @@ + "inner join TousseInstance tic on tic.id = ti.comboTousseInstanceId " + "inner join PackingRecord pr on tic.tousseDefinition_id=pr.tousseDefinitionId and tic.packingRecord_id=pr.id " + " %s where pr.packTime %s %s " - + "and pr.inspector is not null and %s(pr.inspector)<>0" + + "and pr.inspector is not null and pr.inspector<>''" + " %s %s %s " + "group by pr.inspector", amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("pr.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd); @@ -947,13 +947,13 @@ .format("select sum(%s) amount ,pr.wrapper userName " + "from PackingRecord pr inner join TousseInstance ti on ti.packingRecord_id=pr.id left join PackagingRecord prd on prd.tousseInstance_id=ti.id inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where prd.id is null and pr.packTime %s %s " - + "and pr.wrapper is not null and %s(pr.wrapper)<>0 %s %s %s %s " + + "and pr.wrapper is not null and pr.wrapper<>'' %s %s %s %s " + "group by pr.wrapper", amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("pr.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -991,14 +991,14 @@ .format("select sum(%s) amount ,ti.reviewer userName " + "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.reviewTime %s %s " - + "and ti.reviewer is not null and %s(ti.reviewer)<>0 %s %s %s %s " + + "and ti.reviewer is not null and ti.reviewer<>'' %s %s %s %s " + "group by ti.reviewer", amountColumnSql, joinMaterialInstanceSql, obj.haveCombo?"ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null":"1=1", obj.betweenSql, SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1012,13 +1012,13 @@ .format("select sum(%s) amount ,ti.reviewer userName " + "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.comboTousseInstanceId is not null and ti.reviewTime %s %s " - + "and ti.reviewer is not null and %s(ti.reviewer)<>0 %s %s %s " + + "and ti.reviewer is not null and ti.reviewer<>'' %s %s %s " + "group by ti.reviewer", amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd); @@ -1041,14 +1041,15 @@ .format("select sum(%s) amount ,ti.sterilizationUser userName " + "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID join SterilizationRecord sr on sr.id=ti.sterilizationRecord_id " + " %s where %s and " + dateQueryAdapter.stringFieldToDate("ti.sterileEndTime") + " %s %s " - + "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 and ti.sterilizationRecord_id is not null %s %s %s %s " + //+ "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 and ti.sterilizationRecord_id is not null" + + " %s %s %s %s " + "group by ti.sterilizationUser", amountColumnSql, joinMaterialInstanceSql, obj.haveCombo?"ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null":"1=1", obj.betweenSql, SqlUtils.get_InSql_Extra("sr.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1062,13 +1063,13 @@ .format("select sum(%s) amount ,ti.sterilizationUser userName " + "from TousseInstance ti join SterilizationRecord sr on sr.id=ti.sterilizationRecord_id 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 " + dateQueryAdapter.stringFieldToDate("ti.sterileEndTime") + " %s %s " - + "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 and ti.sterilizationRecord_id is not null %s %s %s " - + "group by ti.sterilizationUser", + //+ "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 and ti.sterilizationRecord_id is not null" + + " %s %s %s group by ti.sterilizationUser", amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("sr.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replace("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd); @@ -1088,7 +1089,8 @@ .format("select sum(%s) amount %s " + "from Invoice i inner join InvoiceItem ii on ii.invoice_id=i.id inner join TousseDefinition td on ii.tousseDefinitionId = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where i.sendTime %s %s %s and %s %s %s " - + "and i.sender is not null and %s(i.sender)<>0 %s %s %s %s %s %s ", + //+ "and i.sender is not null and %s(i.sender)<>0" + + " %s %s %s %s %s %s ", miCountSql, obj.extraSelectColumns, joinMaterialInstanceSql, @@ -1098,7 +1100,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("i.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1112,7 +1114,8 @@ .format(" union all select sum(%s) amount %s " + "from Invoice i inner join TousseInstance ti on ti.invoice_id = i.id inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where %s and i.sendTime %s %s %s and %s %s %s " - + "and i.sender is not null and %s(i.sender)<>0 %s %s %s %s %s ", + //+ "and i.sender is not null and %s(i.sender)<>0" + + " %s %s %s %s %s ", queryDisposableGoodAmountSql, obj.extraSelectColumns, joinMaterialInstanceSql, @@ -1123,7 +1126,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("i.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1150,7 +1153,8 @@ .format("select sum(%s) amount %s " + "from Invoice i inner join TousseInstance ti on ti.invoice_id = i.id inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseInstanceId is not null and i.sendTime %s %s %s and %s %s %s " - + "and i.sender is not null and %s(i.sender)<>0 %s %s %s %s %s", + //+ "and i.sender is not null and %s(i.sender)<>0" + + " %s %s %s %s %s", miCountSql, obj.extraSelectColumns, joinMaterialInstanceSql, @@ -1160,7 +1164,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("i.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1199,14 +1203,15 @@ .format("select " + obj.monthlyStr + " monthstr, sum(%s) amount " + "from Invoice i inner join InvoiceItem ii on ii.invoice_id=i.id inner join TousseDefinition td on ii.tousseDefinitionId = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where i.sendTime %s %s " - + "and i.sender is not null and %s(i.sender)<>0 %s %s %s %s " + //+ "and i.sender is not null and %s(i.sender)<>0 " + + "%s %s %s %s " + "group by " + obj.monthlyStr, amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1219,12 +1224,13 @@ .format("select " + obj.monthlyStr + " monthstr, sum(ii.amount) amount " + "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id " + "where ii.tousseType = '一次性物品' and i.sendTime %s %s " - + "and i.sender is not null and %s(i.sender)<>0 " + //+ "and i.sender is not null and %s(i.sender)<>0 " + "group by " + obj.monthlyStr, obj.betweenSql, - SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName); + SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom) + //,obj.sqlLengthFunctionName + ); } @@ -1248,14 +1254,14 @@ .format("select sum(%s) amount ,i.assistantSender userName " + "from Invoice i inner join TousseInstance ti on ti.invoice_id = i.id inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where %s and i.sendTime %s %s " - + "and i.assistantSender is not null and %s(i.assistantSender)<>0 %s %s %s %s " + + "and i.assistantSender is not null and i.assistantSender<>'' %s %s %s %s " + "group by i.assistantSender", amountColumnSql, joinMaterialInstanceSql, obj.haveCombo?"ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null":"1=1", obj.betweenSql, SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1267,11 +1273,12 @@ .format("select sum(ii.amount) amount ,i.assistantSender userName " + "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id " + "where ii.tousseType = '一次性物品' and i.sendTime %s %s " - + "and i.assistantSender is not null and %s(i.assistantSender)<>0 " + + "and i.assistantSender is not null and i.assistantSender<>'' " + "group by i.assistantSender", obj.betweenSql, - SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName); + SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom) + //,obj.sqlLengthFunctionName + ); } } if(obj.getIsQueryCom()){ @@ -1282,13 +1289,13 @@ .format("select sum(%s) amount ,i.assistantSender userName " + "from Invoice i inner join TousseInstance ti on ti.invoice_id = i.id inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseInstanceId is not null and i.sendTime %s %s " - + "and i.assistantSender is not null and %s(i.assistantSender)<>0 %s %s %s " + + "and i.assistantSender is not null and i.assistantSender<>'' %s %s %s " + "group by i.assistantSender", amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd); @@ -1312,15 +1319,15 @@ .format("select sum(%s) amount ,i.personInCharge userName " + "from Invoice i inner join TousseInstance ti on ti.invoice_id = i.id inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where %s and i.sendTime %s %s " - + "and i.personInCharge is not null and %s(i.personInCharge)<>0 " + + "and i.personInCharge is not null and i.personInCharge<>'' " + "%s %s %s %s " + "group by i.personInCharge", amountColumnSql, joinMaterialInstanceSql, obj.haveCombo?"ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null":"1=1", obj.betweenSql, SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1332,11 +1339,11 @@ .format("select sum(ii.amount) amount ,i.personInCharge userName " + "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id " + "where ii.tousseType = '一次性物品' and i.sendTime %s %s " - + "and i.personInCharge is not null and %s(i.personInCharge)<>0 " + + "and i.personInCharge is not null and i.personInCharge<>'' " + "group by i.personInCharge", obj.betweenSql, SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom) - ,obj.sqlLengthFunctionName + //,obj.sqlLengthFunctionName ); } } @@ -1348,14 +1355,14 @@ .format("select sum(%s) amount ,i.personInCharge userName " + "from Invoice i inner join TousseInstance ti on ti.invoice_id = i.id inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " %s where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseInstanceId is not null and i.sendTime %s %s " - + "and i.personInCharge is not null and %s(i.personInCharge)<>0" + + "and i.personInCharge is not null and i.personInCharge<>''" + " %s %s %s " + "group by i.personInCharge", amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd); @@ -1459,12 +1466,12 @@ .format("select SUM(ti.prepareRecycleAmount) amount %s from invoicePlan ip" + " inner join TousseItem ti on ti.recyclingApplication_ID =ip.id inner join TousseDefinition td on ti.tousseDefinitionId = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + " where ip.prepareRecycleDateTime %s %s " - + " and ip.prepareRecycleOperator is not null and %s(ip.prepareRecycleOperator)<>0 %s %s %s %s " + + " and ip.prepareRecycleOperator is not null and ip.prepareRecycleOperator<>'' %s %s %s %s " + " group by ip.prepareRecycleOperator ", obj.selectUserName ? ",ip.prepareRecycleOperator userName" : "", obj.betweenSql, SqlUtils.get_InSql_Extra("ip.handleDepartCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1490,7 +1497,7 @@ + "from RecyclingRecord rr inner join RecyclingItem ri on ri.recyclingRecord_id = rr.id " + "inner join TousseDefinition td on ri.tousseDefinitionId=td.id join TousseDefinition tdc on tdc.id=td.ancestorID %s " + "where rr.recyclingTime %s %s %s and %s %s %s " - + "and rr.operator is not null and %s(rr.operator)<>0 %s %s %s %s %s %s", + + "and rr.operator is not null and rr.operator<>'' %s %s %s %s %s %s", obj.selectUserName?",rr.operator userName":"", obj.selectTousseType ? ",td.tousseType" : "", obj.selectTousseName ? ",td.name tousseName" : "", @@ -1502,7 +1509,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("rr.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1700,12 +1707,12 @@ .format("select sum(pr.amount) amount %s " + "from PackingRecord pr inner join TousseDefinition td on td.id=pr.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID " + "where pr.packTime %s %s " - + "and pr.inspector is not null and %s(pr.inspector)<>0 %s %s %s %s " + + "and pr.inspector is not null and pr.inspector<>'' %s %s %s %s " + "group by pr.inspector ", obj.selectUserName ? ",pr.inspector userName" : "", obj.betweenSql, SqlUtils.get_InSql_Extra("pr.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1718,12 +1725,12 @@ .format("select count(*) amount %s " + "from PackingRecord pr inner join TousseInstance ti on ti.packingRecord_id=pr.id left join PackagingRecord prd on prd.tousseInstance_id=ti.id inner join TousseDefinition td on td.id=pr.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID " + "where prd.id is null and pr.packTime %s %s " - + "and pr.wrapper is not null and %s(pr.wrapper)<>0 %s %s %s %s " + + "and pr.wrapper is not null and pr.wrapper<>'' %s %s %s %s " + "group by pr.wrapper ", obj.selectUserName ? ",pr.wrapper userName" : "", obj.betweenSql, SqlUtils.get_InSql_Extra("pr.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1751,7 +1758,7 @@ .format("select count(*) amount %s %s %s " + "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + "where %s and ti.reviewTime %s %s %s and %s %s %s " - + "and ti.reviewer is not null and %s(ti.reviewer)<>0 %s %s %s %s %s " + + "and ti.reviewer is not null and ti.reviewer<>'' %s %s %s %s %s " + " %s", obj.selectUserName ? ",ti.reviewer userName" : "", obj.selectTousseType ? ",td.tousseType" : "", @@ -1763,7 +1770,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1779,7 +1786,7 @@ .format("select count(*) amount %s %s %s " + "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID " + "where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is not null and ti.reviewTime %s %s %s and %s %s %s " - + "and ti.reviewer is not null and %s(ti.reviewer)<>0 %s %s %s %s " + + "and ti.reviewer is not null and ti.reviewer<>'' %s %s %s %s " + " %s ", obj.selectUserName ? ",ti.reviewer userName" : "", obj.selectTousseType ? ",td.tousseType" : "", @@ -1790,7 +1797,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1823,8 +1830,9 @@ .format("select %s count(*) 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 join SterilizationRecord sr on sr.id=ti.sterilizationRecord_id %s " + "where %s and " + dateQueryAdapter.stringFieldToDate("ti.sterileEndTime") + " %s %s %s and %s %s %s " - + "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 " - + "and ti.sterilizationRecord_id is not null %s %s %s %s %s " + //+ "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 " + //+ "and ti.sterilizationRecord_id is not null" + + " %s %s %s %s %s " + "%s ", getDatePeriodSelectSql(obj.monthlyStr), obj.selectUserName ? ",ti.sterilizationUser userName " : "", @@ -1839,7 +1847,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1855,8 +1863,9 @@ .format("select %s count(*) 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 join SterilizationRecord sr on sr.id=ti.sterilizationRecord_id %s " + "where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is not null and " + dateQueryAdapter.stringFieldToDate("ti.sterileEndTime") + " %s %s %s and %s %s %s " - + "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 " - + "and ti.sterilizationRecord_id is not null %s %s %s %s " + //+ "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 " + //+ "and ti.sterilizationRecord_id is not null" + + " %s %s %s %s " + "%s ", getDatePeriodSelectSql(obj.monthlyStr), obj.selectUserName ? ",ti.sterilizationUser userName " : "", @@ -1870,7 +1879,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1901,7 +1910,8 @@ + "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id " + "inner join TousseDefinition td on td.id=ii.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID %s " + "where %s and i.sendTime %s %s %s and %s %s %s " - + "and i.sender is not null and %s(i.sender)<>0 %s %s %s %s %s " + //+ "and i.sender is not null and %s(i.sender)<>0" + + " %s %s %s %s %s " + " %s %s ", obj.selectUserName ? ",i.sender userName" : "", obj.selectTousseType ? ",td.tousseType" : "", @@ -1916,7 +1926,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("i.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1935,7 +1945,7 @@ .format("select sum(ii.amount) amount %s %s %s %s " + "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id " + "where ii.tousseType = '一次性物品' and i.sendTime %s %s %s and %s " - + "and i.sender is not null and %s(i.sender)<>0 " + //+ "and i.sender is not null and %s(i.sender)<>0 " + " %s", obj.selectUserName ? ",i.sender userName" : "", obj.selectTousseType ? ",ii.tousseType" : "", @@ -1946,7 +1956,7 @@ obj.querySupplyRoom), SqlUtils.get_InSql_Extra("i.depart",obj.applicationDepart), SqlUtils.getStringFieldInLargeCollectionsPredicate("i.depart", obj.recyDepartGroup, " 1=1 "), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, groupBySql); } } @@ -1960,7 +1970,8 @@ + "inner join TousseDefinition td on td.id=ii.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID %s " + "inner join TousseInstance ti on ti.tousseDefinition_id=td.id " + "where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null and ti.invoice_id = i.id and td.tousseType ='"+ TousseDefinition.PACKAGE_TYPE_COMBO +"' and i.sendTime %s %s %s and %s %s %s " - + "and i.sender is not null and %s(i.sender)<>0 %s %s %s %s %s " + //+ "and i.sender is not null and %s(i.sender)<>0" + + " %s %s %s %s %s " + " %s", obj.selectUserName ? ",i.sender userName" : "", obj.selectTousseType ? ", '"+TousseDefinition.PACKAGE_TYPE_COMBO+"' tousseType" : "", @@ -1974,7 +1985,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("i.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -1991,12 +2002,13 @@ + "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id " + "inner join TousseDefinition td on td.id=ii.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID " + "where i.sendTime %s %s " - + "and i.sender is not null and %s(i.sender)<>0 %s %s %s %s %s " + //+ "and i.sender is not null and %s(i.sender)<>0" + + " %s %s %s %s %s " + "group by %s ", obj.extraSelectColumns, obj.betweenSql, SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -2016,12 +2028,12 @@ .format("select sum(ii.amount) amount %s " + "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id " + "where ii.tousseType = '一次性物品' and i.sendTime %s %s " - + "and i.sender is not null and %s(i.sender)<>0 " + //+ "and i.sender is not null and %s(i.sender)<>0 " + "group by %s ", obj.extraSelectColumns, obj.betweenSql, SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.extraGroupBy); } @@ -2034,13 +2046,13 @@ .format("select sum(ii.amount) amount %s " + "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id inner join TousseDefinition td on td.id=ii.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID " + "where %s and i.sendTime %s %s " - + "and i.assistantSender is not null and %s(i.assistantSender)<>0 %s %s %s %s " + + "and i.assistantSender is not null and i.assistantSender<>'' %s %s %s %s " + "group by i.assistantSender ", obj.selectUserName ? ",i.assistantSender userName" : "", obj.haveCombo?"ii.comboTousseInstanceId is null":"1=1", obj.betweenSql, SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -2055,12 +2067,12 @@ + "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id inner join TousseDefinition td on td.id=ii.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID " + "inner join TousseInstance ti on ti.tousseDefinition_id=td.id " + "where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null and td.tousseType ='"+ TousseDefinition.PACKAGE_TYPE_COMBO +"' and i.sendTime %s %s " - + "and i.assistantSender is not null and %s(i.assistantSender)<>0 %s %s %s " + + "and i.assistantSender is not null and i.assistantSender<>'' %s %s %s " + "group by i.assistantSender ", obj.selectUserName ? ",i.assistantSender userName" : "", obj.betweenSql, SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd); @@ -2071,12 +2083,12 @@ .format("select sum(ii.amount) amount %s " + "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id inner join TousseDefinition td on td.id=ii.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID " + "where i.sendTime %s %s " - + "and i.personInCharge is not null and %s(i.personInCharge)<>0 %s %s %s %s " + + "and i.personInCharge is not null and i.personInCharge<>'' %s %s %s %s " + "group by i.personInCharge ", obj.selectUserName ? ",i.personInCharge userName" : "", obj.betweenSql, SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom), - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -2090,7 +2102,7 @@ .format("select count(*) amount, td.tousseType, td.name tousseName " + "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.signedDate %s %s %s and %s %s %s " - + "and ti.signedUser is not null and %s(ti.signedUser)<>0 %s %s %s %s %s %s " + + "and ti.signedUser is not null and ti.signedUser<>'' %s %s %s %s %s %s " + "group by td.tousseType,td.name", obj.extraJoinCondition, obj.haveCombo?"ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null":"1=1", @@ -2100,7 +2112,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd, obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, @@ -2116,7 +2128,7 @@ .format("select count(*) amount, td.tousseType, td.name tousseName " + "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.comboTousseInstanceId is null and ti.comboTousseDefinitionId is not null and ti.signedDate %s %s %s and %s %s %s " - + "and ti.signedUser is not null and %s(ti.signedUser)<>0 %s %s %s %s %s " + + "and ti.signedUser is not null and ti.signedUser<>'' %s %s %s %s %s " + "group by td.tousseType,td.name ", obj.extraJoinCondition, obj.betweenSql, @@ -2125,7 +2137,7 @@ SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.depart", obj.recyDepartGroup, " 1=1 "), obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd, obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd, - obj.sqlLengthFunctionName, + //obj.sqlLengthFunctionName, obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd, obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"), obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd, Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java =================================================================== diff -u -r34126 -r34199 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java (.../WorkQualityCollectionReportImpl.java) (revision 34126) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java (.../WorkQualityCollectionReportImpl.java) (revision 34199) @@ -248,7 +248,7 @@ reportParams.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseTypeAndPackageSizeSql = ""; - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3); // 回收总数的Map Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java =================================================================== diff -u -r34126 -r34199 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java (.../CustomReportsOfDgsfy.java) (revision 34126) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java (.../CustomReportsOfDgsfy.java) (revision 34199) @@ -287,7 +287,7 @@ reportParams.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseTypeAndPackageSizeSql = ""; - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3); // 回收总数的Map @@ -556,7 +556,7 @@ reportParams.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.taskGroupSqlWithAliasOfTousseDefinitionIsTd = ""; reportParams.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = ""; - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; @@ -695,7 +695,7 @@ + TousseDefinition.PACKAGE_TYPE_COMBO, null); - reportParams.sqlLengthFunctionName = sqlLengthFunctionName; + //reportParams.sqlLengthFunctionName = sqlLengthFunctionName; // 按日进行分组 @@ -1058,7 +1058,7 @@ dateQueryAdapter.dateAdapter(startDate), dateQueryAdapter.dateAdapter(endDate)); params.querySupplyRoom = deptCode ; - params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); + //params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); // 选择所属任务组的 params.extraSelectColumns = " ,td.taskGroup taskGroup ,ti.depart depart ";