Index: ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jrxml
===================================================================
diff -u -r12331 -r15147
--- ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jrxml (.../packingUnqualifieReport.jrxml) (revision 12331)
+++ ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jrxml (.../packingUnqualifieReport.jrxml) (revision 15147)
@@ -37,7 +37,7 @@
-
+
@@ -46,6 +46,9 @@
+
+
+
@@ -63,29 +66,29 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -94,10 +97,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -109,10 +123,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -122,93 +147,107 @@
-
+
-
+
-
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
-
-
-
-
-
Index: ssts-web/src/main/webapp/jasperRtp/packingUnqualifieReport.jasper
===================================================================
diff -u -r12331 -r15147
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r15136 -r15147
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15136)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15147)
@@ -1524,18 +1524,17 @@
String title = iterator.next();
PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean();
bean.setDate(queryDate);
- bean.setResult("" + tousseTypeMap.get(title));
+ bean.setResult(tousseTypeMap.get(title));
bean.setTitle(title);
bean.setTitleSort(sourceSortMap.get(title));
returnList.add(bean);
}
PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean();
bean.setDate(queryDate);
- bean.setResult("" + totalAmount);
+ bean.setResult(totalAmount);
String title = "配包总数";
bean.setTitle(title);
bean.setTitleSort(sourceSortMap.get(title));
- returnList.add(bean);
// 质量监测不合格数列
String monitoringSql = "select qu.inspectitem,sum(qu.amount) from qualitymonitoringconfig qm ,QualityMonitoring qu"
+ " where qu.inspectitem = qm.name and qm.responsibilitypart = '装配管理' and qm.departcodes like '%"+deptCode+"%' "
@@ -1547,65 +1546,76 @@
+ " group by qu.inspectitem";
Integer unqualifiedAmount = getQualityMonitoringSourceForPacking(
monitoringSql, queryDate, returnList);
+ bean.setTotalAmount(totalAmount);
+ bean.setUnqualifiedAmount(unqualifiedAmount);
+ returnList.add(bean);
+// PackingFractionDefectiveBean bean1 = new PackingFractionDefectiveBean();
+//// bean1.setTitleSort(11);
+//// bean1.setTitle("不合格率");
+// bean1.setTotalAmount(totalAmount);
+// bean1.setUnqualifiedAmount(unqualifiedAmount);
+// bean1.setDate(queryDate);
+// returnList.add(bean1);
// 不合格率列
- PackingFractionDefectiveBean bean2 = getFractionDefectiveForPacking(
- totalAmount, unqualifiedAmount, queryDate);
- returnList.add(bean2);
+// PackingFractionDefectiveBean bean2 = getFractionDefectiveForPacking(
+// totalAmount, unqualifiedAmount, queryDate);
+// returnList.add(bean2);
}
// 月合计汇总行
- Map totalRowMap = new HashMap();
- Integer monthUnqualifiedAmount = 0; // 月不合格总数
- for (PackingFractionDefectiveBean bean : returnList) {
- String title = bean.getTitle();
- String result = bean.getResult();
- if (!title.equals("不合格率") && totalRowMap.get(title) == null) {
- totalRowMap.put(title, Integer.valueOf(result));
- } else if (!title.equals("不合格率")
- && totalRowMap.get(title) != null) {
- totalRowMap.put(title,
- (Integer.valueOf(result) + totalRowMap.get(title)));
- }
- if (bean.getTitleSort() != null && bean.getTitleSort() == 10) {
- monthUnqualifiedAmount += Integer.valueOf(result);
- }
- }
- Integer monthTotalAmount = totalRowMap.get("配包总数"); // 月配包总数
-
- Iterator iterator = totalRowMap.keySet().iterator();
- try {
- while (iterator.hasNext()) {
- String title = iterator.next();
- Integer result = totalRowMap.get(title);
- PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean();
- bean.setDate("合计");
- bean.setResult("" + result);
- bean.setTitle(title);
- Integer sort = sourceSortMap.get(title);
- if (sort == null) {
- sort = 10;
- }
- bean.setTitleSort(sort);
- returnList.add(bean);
- }
- } catch (Exception e) {
- }
+// Map totalRowMap = new HashMap();
+// Integer monthUnqualifiedAmount = 0; // 月不合格总数
+// for (PackingFractionDefectiveBean bean : returnList) {
+// String title = bean.getTitle();
+// String result = bean.getResult();
+// if (!title.equals("不合格率") && totalRowMap.get(title) == null) {
+// totalRowMap.put(title, Integer.valueOf(result));
+// } else if (!title.equals("不合格率")
+// && totalRowMap.get(title) != null) {
+// totalRowMap.put(title,
+// (Integer.valueOf(result) + totalRowMap.get(title)));
+// }
+// if (bean.getTitleSort() != null && bean.getTitleSort() == 10) {
+// monthUnqualifiedAmount += Integer.valueOf(result);
+// }
+// }
+// Integer monthTotalAmount = totalRowMap.get("配包总数"); // 月配包总数
+//
+// Iterator iterator = totalRowMap.keySet().iterator();
+// try {
+// while (iterator.hasNext()) {
+// String title = iterator.next();
+// Integer result = totalRowMap.get(title);
+// PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean();
+// bean.setDate("合计");
+// bean.setResult("" + result);
+// bean.setTitle(title);
+// Integer sort = sourceSortMap.get(title);
+// if (sort == null) {
+// sort = 10;
+// }
+// bean.setTitleSort(sort);
+//// returnList.add(bean);
+// }
+// } catch (Exception e) {
+// }
// 合计不合格率
- PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean();
- bean.setDate("合计");
+// PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean();
+// bean.setDate("合计");
- double fractionDefective = 0.00;
- if (monthTotalAmount != null && monthTotalAmount != 0
- && monthUnqualifiedAmount != 0) {
- fractionDefective = new BigDecimal(monthUnqualifiedAmount)
- .divide(new BigDecimal(monthTotalAmount), 4,
- BigDecimal.ROUND_HALF_UP).doubleValue();
- fractionDefective = new BigDecimal(fractionDefective).multiply(
- new BigDecimal(100)).doubleValue();
- }
- bean.setResult("" + fractionDefective + "%");
- bean.setTitle("不合格率");
- bean.setTitleSort(11);
- returnList.add(bean);
+// double fractionDefective = 0.00;
+// if (monthTotalAmount != null && monthTotalAmount != 0
+// && monthUnqualifiedAmount != 0) {
+// fractionDefective = new BigDecimal(monthUnqualifiedAmount)
+// .divide(new BigDecimal(monthTotalAmount), 4,
+// BigDecimal.ROUND_HALF_UP).doubleValue();
+// fractionDefective = new BigDecimal(fractionDefective).multiply(
+// new BigDecimal(100)).doubleValue();
+// }
+// bean.setUnqualifiedRate(fractionDefective);
+// bean.setResult("" + fractionDefective + "%");
+// bean.setTitle("不合格率");
+// bean.setTitleSort(11);
+// returnList.add(bean);
}
return returnList;
}
@@ -1623,7 +1633,8 @@
fractionDefective = new BigDecimal(fractionDefective).multiply(
new BigDecimal(100)).doubleValue();
}
- bean.setResult("" + fractionDefective + "%");
+ bean.setUnqualifiedRate(fractionDefective);
+ bean.setUnqualifiedAmount(unqualifiedAmount);
bean.setDate(date);
return bean;
}
@@ -1639,10 +1650,12 @@
totalAmount += amount;
PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean();
bean.setDate(date);
- bean.setResult("" + amount);
+ bean.setResult(amount);
bean.setTitle(name);
bean.setTitleSort(10);
- list.add(bean);
+ if(StringUtils.isNotBlank(name)){
+ list.add(bean);
+ }
}
} catch (Exception e) {
e.printStackTrace();
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/PackingFractionDefectiveBean.java
===================================================================
diff -u -r12331 -r15147
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/PackingFractionDefectiveBean.java (.../PackingFractionDefectiveBean.java) (revision 12331)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/PackingFractionDefectiveBean.java (.../PackingFractionDefectiveBean.java) (revision 15147)
@@ -16,8 +16,38 @@
private String title;
- private String result;
+ private Integer result;
+
+ private Double unqualifiedRate;
+
+ private Integer unqualifiedAmount;
+
+ private Integer totalAmount;
+
+ public Integer getUnqualifiedAmount() {
+ return unqualifiedAmount;
+ }
+ public void setUnqualifiedAmount(Integer unqualifiedAmount) {
+ this.unqualifiedAmount = unqualifiedAmount;
+ }
+
+ public Integer getTotalAmount() {
+ return totalAmount;
+ }
+
+ public void setTotalAmount(Integer totalAmount) {
+ this.totalAmount = totalAmount;
+ }
+
+ public Double getUnqualifiedRate() {
+ return unqualifiedRate;
+ }
+
+ public void setUnqualifiedRate(Double unqualifiedRate) {
+ this.unqualifiedRate = unqualifiedRate;
+ }
+
public String getDate() {
return date;
}
@@ -42,11 +72,11 @@
this.title = title;
}
- public String getResult() {
+ public Integer getResult() {
return result;
}
- public void setResult(String result) {
+ public void setResult(Integer result) {
this.result = result;
}