Index: ssts-web/src/main/webapp/jasperRtp/washUnUnqualifiedReportDetail.jasper
===================================================================
diff -u -r19197 -r26557
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r26457 -r26557
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 26457)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 26557)
@@ -1694,20 +1694,23 @@
* @param obj
* @return
*/
- public static String getQMAmountSqlByFormNames(String[] formNames, ReportQueryParams obj) {
+ public static String getQMAmountSqlByFormNames(String[] formNames, ReportQueryParams obj, boolean filterMaterialIsNull) {
String groupByToken = "";
if (StringUtils.isNotBlank(obj.monthlyStr)){
groupByToken = obj.monthlyStr + " monthstr,";
}
-
+ String filterMaterialIsNullSql = "";
+ if(filterMaterialIsNull){
+ filterMaterialIsNullSql = " and qmd.material is not null ";
+ }
String sql = "select " + groupByToken
+ "sum(qmd.amount) as amount from QualityMonitoringInstance qi ,FormInstance fi,FormDefinition fd,QualityMonitoringGoods qmd "
+ "where qi.id = fi.id and fi.formDefinition_id = fd.id and qi.id=qmd.qualityMonitoringInstance_id "
+ SqlUtils.get_LikeSql("fd.formName", formNames)
+ "and qi.datetime " + obj.betweenSql + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", obj.querySupplyRoom)
- + "and fd.formType = '质量监测'";
+ + "and fd.formType = '质量监测' " + filterMaterialIsNullSql;
if (StringUtils.isNotBlank(obj.monthlyStr)){
sql += " group by " + obj.monthlyStr;
Index: ssts-web/src/main/webapp/jasperRtp/washUnUnqualifiedReportDetail.jrxml
===================================================================
diff -u -r19197 -r26557
--- ssts-web/src/main/webapp/jasperRtp/washUnUnqualifiedReportDetail.jrxml (.../washUnUnqualifiedReportDetail.jrxml) (revision 19197)
+++ ssts-web/src/main/webapp/jasperRtp/washUnUnqualifiedReportDetail.jrxml (.../washUnUnqualifiedReportDetail.jrxml) (revision 26557)
@@ -43,6 +43,9 @@
+
+
+
@@ -156,6 +159,45 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java
===================================================================
diff -u -r25397 -r26557
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java (.../CustomReportsOfDgsfy.java) (revision 25397)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java (.../CustomReportsOfDgsfy.java) (revision 26557)
@@ -407,7 +407,7 @@
reportParams.querySupplyRoom = querySupplyRoom;
reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3("qi.dateTime","mm");
- String qualityMonitoringSql = DataIndex.getQMAmountSqlByFormNames(new String[]{"包装不合格","包装不及格"}, reportParams);
+ String qualityMonitoringSql = DataIndex.getQMAmountSqlByFormNames(new String[]{"包装不合格","包装不及格"}, reportParams, false);
ResultSet result = objectDao.executeSql(qualityMonitoringSql);
bean.setRowNum(list.size()+1);
@@ -480,7 +480,7 @@
endDay);
reportParams.querySupplyRoom = querySupplyRoom;
- String sql = DataIndex.getQMAmountSqlByFormNames(new String[]{"包装不合格","包装不及格"}, reportParams);
+ String sql = DataIndex.getQMAmountSqlByFormNames(new String[]{"包装不合格","包装不及格"}, reportParams, false);
String sql2 = "select sum(p.amount) from packingrecord p"
+ " where p.packTime >= "
@@ -1375,7 +1375,7 @@
Map amountMap = getWashWorkloadAmountMap(sql);
// 清洗不合格数量
- String unQualitySql = DataIndex.getQMAmountSqlByFormNames(new String[]{"清洗不合格","清洗不及格"}, params);
+ String unQualitySql = DataIndex.getQMAmountSqlByFormNames(new String[]{"清洗不合格","清洗不及格"}, params, true);
Integer unQualityAmount = dataIndex.getAmountBySql(unQualitySql);
Index: ssts-web/src/main/webapp/jasperRtp/washUnUnqualifiedReportSum.jasper
===================================================================
diff -u -r19197 -r26557
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/washUnUnqualifiedReportSum.jrxml
===================================================================
diff -u -r19197 -r26557
--- ssts-web/src/main/webapp/jasperRtp/washUnUnqualifiedReportSum.jrxml (.../washUnUnqualifiedReportSum.jrxml) (revision 19197)
+++ ssts-web/src/main/webapp/jasperRtp/washUnUnqualifiedReportSum.jrxml (.../washUnUnqualifiedReportSum.jrxml) (revision 26557)
@@ -34,6 +34,9 @@
+
+
+
@@ -105,6 +108,27 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r26388 -r26557
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 26388)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 26557)
@@ -6754,7 +6754,7 @@
Map amountMap = getWashWorkloadAmountMap(sql);
// 清洗不合格数量
- String unQualitySql = DataIndex.getQMAmountSqlByFormNames(new String[]{"清洗不合格","清洗不及格"}, params);
+ String unQualitySql = DataIndex.getQMAmountSqlByFormNames(new String[]{"清洗不合格","清洗不及格"}, params, true);
Integer unQualityAmount = dataIndex.getAmountBySql(unQualitySql);