Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WorkQualityCollection.java
===================================================================
diff -u -r17067 -r18194
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WorkQualityCollection.java (.../WorkQualityCollection.java) (revision 17067)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WorkQualityCollection.java (.../WorkQualityCollection.java) (revision 18194)
@@ -19,68 +19,218 @@
private String janAmount = "0";// 件数
+ private String janUnQualityAmount = "0";// 不合格件数
+
private Double janPercentage;// 百分比
private String febAmount = "0";
+
+ private String febUnQualityAmount = "0";
private Double febPercentage;
private String marAmount = "0";
+
+ private String marUnQualityAmount = "0";
private Double marPercentage;
private String aprAmount = "0";
+
+ private String aprUnQualityAmount = "0";
private Double aprPercentage;
private String mayAmount = "0";
+
+ private String mayUnQualityAmount = "0";
private Double mayPercentage;
private String junAmount = "0";
+ private String junUnQualityAmount = "0";
private Double junPercentage;
private String julAmount = "0";
+ private String julUnQualityAmount = "0";
private Double julPercentage;
private String augAmount = "0";
+ private String augUnQualityAmount = "0";
private Double augPercentage;
private String sepAmount = "0";
+ private String sepUnQualityAmount = "0";
private Double sepPercentage;
private String octAmount = "0";
+ private String octUnQualityAmount = "0";
private Double octPercentage;
private String novAmount = "0";
+ private String novUnQualityAmount = "0";
private Double novPercentage;
private String decAmount = "0";
+ private String decUnQualityAmount = "0";
private Double decPercentage;
private String firstHalfYearAmount = "0";
+ private String firstHalfYearUnQualityAmount = "0";
private Double firstHalfYearPercentage;
private String secondHalfYearAmount = "0";
+ private String secondHalfYearUnQualityAmount = "0";
private Double secondHalfYearPercentage;
private String thisYearAmount = "0";
+ private String thisYearUnQualityAmount = "0";
private Double thisYearPercentage;
private String lastYearAmount = "0";
+ private String lastYearUnQualityAmount = "0";
private Double lastYearPercentage;
+
+ public String getJanUnQualityAmount() {
+ return janUnQualityAmount;
+ }
+ public void setJanUnQualityAmount(String janUnQualityAmount) {
+ this.janUnQualityAmount = janUnQualityAmount;
+ }
+
+ public String getFebUnQualityAmount() {
+ return febUnQualityAmount;
+ }
+
+ public void setFebUnQualityAmount(String febUnQualityAmount) {
+ this.febUnQualityAmount = febUnQualityAmount;
+ }
+
+ public String getMarUnQualityAmount() {
+ return marUnQualityAmount;
+ }
+
+ public void setMarUnQualityAmount(String marUnQualityAmount) {
+ this.marUnQualityAmount = marUnQualityAmount;
+ }
+
+ public String getAprUnQualityAmount() {
+ return aprUnQualityAmount;
+ }
+
+ public void setAprUnQualityAmount(String aprUnQualityAmount) {
+ this.aprUnQualityAmount = aprUnQualityAmount;
+ }
+
+ public String getMayUnQualityAmount() {
+ return mayUnQualityAmount;
+ }
+
+ public void setMayUnQualityAmount(String mayUnQualityAmount) {
+ this.mayUnQualityAmount = mayUnQualityAmount;
+ }
+
+ public String getJunUnQualityAmount() {
+ return junUnQualityAmount;
+ }
+
+ public void setJunUnQualityAmount(String junUnQualityAmount) {
+ this.junUnQualityAmount = junUnQualityAmount;
+ }
+
+ public String getJulUnQualityAmount() {
+ return julUnQualityAmount;
+ }
+
+ public void setJulUnQualityAmount(String julUnQualityAmount) {
+ this.julUnQualityAmount = julUnQualityAmount;
+ }
+
+ public String getAugUnQualityAmount() {
+ return augUnQualityAmount;
+ }
+
+ public void setAugUnQualityAmount(String augUnQualityAmount) {
+ this.augUnQualityAmount = augUnQualityAmount;
+ }
+
+ public String getSepUnQualityAmount() {
+ return sepUnQualityAmount;
+ }
+
+ public void setSepUnQualityAmount(String sepUnQualityAmount) {
+ this.sepUnQualityAmount = sepUnQualityAmount;
+ }
+
+ public String getOctUnQualityAmount() {
+ return octUnQualityAmount;
+ }
+
+ public void setOctUnQualityAmount(String octUnQualityAmount) {
+ this.octUnQualityAmount = octUnQualityAmount;
+ }
+
+ public String getNovUnQualityAmount() {
+ return novUnQualityAmount;
+ }
+
+ public void setNovUnQualityAmount(String novUnQualityAmount) {
+ this.novUnQualityAmount = novUnQualityAmount;
+ }
+
+ public String getDecUnQualityAmount() {
+ return decUnQualityAmount;
+ }
+
+ public void setDecUnQualityAmount(String decUnQualityAmount) {
+ this.decUnQualityAmount = decUnQualityAmount;
+ }
+
+ public String getFirstHalfYearUnQualityAmount() {
+ return firstHalfYearUnQualityAmount;
+ }
+
+ public void setFirstHalfYearUnQualityAmount(String firstHalfYearUnQualityAmount) {
+ this.firstHalfYearUnQualityAmount = firstHalfYearUnQualityAmount;
+ }
+
+ public String getSecondHalfYearUnQualityAmount() {
+ return secondHalfYearUnQualityAmount;
+ }
+
+ public void setSecondHalfYearUnQualityAmount(
+ String secondHalfYearUnQualityAmount) {
+ this.secondHalfYearUnQualityAmount = secondHalfYearUnQualityAmount;
+ }
+
+ public String getThisYearUnQualityAmount() {
+ return thisYearUnQualityAmount;
+ }
+
+ public void setThisYearUnQualityAmount(String thisYearUnQualityAmount) {
+ this.thisYearUnQualityAmount = thisYearUnQualityAmount;
+ }
+
+ public String getLastYearUnQualityAmount() {
+ return lastYearUnQualityAmount;
+ }
+
+ public void setLastYearUnQualityAmount(String lastYearUnQualityAmount) {
+ this.lastYearUnQualityAmount = lastYearUnQualityAmount;
+ }
+
public Integer getRowNum() {
return rowNum;
}
Index: ssts-web/src/main/webapp/jasperRtp/workQualityCollection6.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/workQualityCollection6.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/workQualityCollection6.jrxml (revision 18194)
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="31" splitType="Stretch">
+ <textField>
+ <reportElement uuid="881aa718-e008-44fd-bee0-3bf7059db173" x="0" y="0" width="428" height="31"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle">
+ <font fontName="宋体" size="16" isBold="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.js
===================================================================
diff -u -r17084 -r18194
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.js (.../workQualityCollectionView.js) (revision 17084)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.js (.../workQualityCollectionView.js) (revision 18194)
@@ -48,8 +48,30 @@
if(sstsConfig.hasOwnProperty('isHidePartOfWorkQualityCollection') && sstsConfig.isHidePartOfWorkQualityCollection){
hidePartOfWorkQualityCollection = true;
}
- window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=workQualityCollection.jasper&reportName=workQualityCollection&querySupplyRoom="+departCoding+"&year="+year+"&type="+type+"&isHidePartOfWorkQualityCollection="+hidePartOfWorkQualityCollection,'thisIframe','_self');
- }
+ // 全年
+ var jasperReportName = "workQualityCollection.jasper";
+ if(type == 'split'){
+ // 上下半年对比
+ jasperReportName = "workQualityCollection2.jasper";
+ }else if(type == 'compareToLastYear'){
+ // 跟去年对比
+ jasperReportName = "workQualityCollection3.jasper";
+ }
+ if(hidePartOfWorkQualityCollection == true){
+ // 全年
+ var jasperReportName = "workQualityCollection4.jasper";
+ if(type == 'split'){
+ // 上下半年对比
+ jasperReportName = "workQualityCollection5.jasper";
+ }else if(type == 'compareToLastYear'){
+ // 跟去年对比
+ jasperReportName = "workQualityCollection6.jasper";
+ }
+ }
+ window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=" + jasperReportName
+ +"&reportName=workQualityCollection&querySupplyRoom="+departCoding
+ +"&year="+year+"&type="+type+"&isHidePartOfWorkQualityCollection="+hidePartOfWorkQualityCollection,'thisIframe','_self');
+ }
var sign = true;
var dwrCallParams = null;
Index: ssts-web/src/main/webapp/jasperRtp/workQualityCollection5.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/workQualityCollection5.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/workQualityCollection5.jrxml (revision 18194)
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="31" splitType="Stretch">
+ <textField>
+ <reportElement uuid="881aa718-e008-44fd-bee0-3bf7059db173" x="0" y="0" width="428" height="31"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle">
+ <font fontName="宋体" size="16" isBold="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r18190 -r18194
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 18190)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 18194)
@@ -245,15 +245,15 @@
String rootPath = StrutsParamUtils.getRequest().getSession()
.getServletContext().getRealPath("");
String realPath = rootPath + "\\jasperRtp\\" + jasperreportName;// 报表文件workload.jasper路径
- if (StringUtils.equals("workQualityCollection.jasper", jasperreportName)) {
- if (StringUtils.equals(parameters.get("type"),"split")) {
- realPath = rootPath
- + "\\jasperRtp\\workQualityCollection2.jasper";
- } else if (StringUtils.equals(parameters.get("type"),"compareToLastYear")) {
- realPath = rootPath
- + "\\jasperRtp\\workQualityCollection3.jasper";
- }
- }
+// if (StringUtils.equals("workQualityCollection.jasper", jasperreportName)) {
+// if (StringUtils.equals(parameters.get("type"),"split")) {
+// realPath = rootPath
+// + "\\jasperRtp\\workQualityCollection2.jasper";
+// } else if (StringUtils.equals(parameters.get("type"),"compareToLastYear")) {
+// realPath = rootPath
+// + "\\jasperRtp\\workQualityCollection3.jasper";
+// }
+// }
return realPath;
}
Index: ssts-web/src/main/webapp/jasperRtp/workQualityCollection4.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/workQualityCollection6.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r18190 -r18194
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 18190)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 18194)
@@ -2953,10 +2953,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -3014,10 +3015,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -3430,10 +3432,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -3499,10 +3502,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -3543,10 +3547,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -3604,10 +3609,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -3647,10 +3653,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -3735,10 +3742,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -3779,10 +3787,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -3840,10 +3849,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -3884,10 +3894,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -3956,10 +3967,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4001,10 +4013,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && sterilizationAmount > 0){
+ setWorkQualityBeanAmount(bean, key, sterilizationAmount);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + sterilizationAmount);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + sterilizationAmount);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4072,10 +4085,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4118,10 +4132,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && sterilizationAmount > 0){
+ setWorkQualityBeanAmount(bean, key, sterilizationAmount);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + sterilizationAmount);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + sterilizationAmount);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4189,10 +4204,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4355,10 +4371,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4416,10 +4433,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4458,10 +4476,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4518,10 +4537,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4560,10 +4580,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4621,10 +4642,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4678,10 +4700,11 @@
new BigDecimal(100)).doubleValue();
setWorkQualityBeanPercentage(bean, key, percentage);
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4737,10 +4760,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -4989,10 +5013,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && washAmount > 0){
+ setWorkQualityBeanAmount(bean, key, washAmount);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + washAmount);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + washAmount);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -5065,10 +5090,11 @@
setWorkQualityBeanPercentage(bean, key, percentage);
}
if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
+ setWorkQualityBeanAmount(bean, key, amount2);
if(amount == null){
- setWorkQualityBeanAmount(bean, key, "0/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, 0);
}else {
- setWorkQualityBeanAmount(bean, key, amount + "/" + amount2);
+ setWorkQualityBeanUnQualityAmount(bean, key, amount);
}
}
}
@@ -5625,6 +5651,45 @@
bean.setAmount(amount);
}
}
+ // 设置工作量持续收集报表的不合格数量
+ private void setWorkQualityBeanUnQualityAmount(WorkQualityCollection bean,
+ String key, Integer amount) {
+ if (StringUtils.equals("1", key)) {
+ bean.setJanUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("2", key)) {
+ bean.setFebUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("3", key)) {
+ bean.setMarUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("4", key)) {
+ bean.setAprUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("5", key)) {
+ bean.setMayUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("6", key)) {
+ bean.setJunUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("7", key)) {
+ bean.setJulUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("8", key)) {
+ bean.setAugUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("9", key)) {
+ bean.setSepUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("10", key)) {
+ bean.setOctUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("11", key)) {
+ bean.setNovUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("12", key)) {
+ bean.setDecUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("上半年", key)) {
+ bean.setFirstHalfYearUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("下半年", key)) {
+ bean.setSecondHalfYearUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("今年", key)) {
+ bean.setThisYearUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("去年", key)) {
+ bean.setLastYearUnQualityAmount(amount + "");
+ } else if (StringUtils.equals("month", key)) {
+ bean.setAmount(amount);
+ }
+ }
private void setWorkQualityBeanAmount(WorkQualityCollection bean,
String key, String amount) {
Index: ssts-web/src/main/webapp/jasperRtp/workQualityCollection4.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/workQualityCollection4.jrxml (revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/workQualityCollection4.jrxml (revision 18194)
@@ -0,0 +1,717 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <band height="31" splitType="Stretch">
+ <textField>
+ <reportElement uuid="881aa718-e008-44fd-bee0-3bf7059db173" x="0" y="0" width="1450" height="31"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle">
+ <font fontName="宋体" size="16" isBold="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+ </textField>
+ </band>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/jasperRtp/workQualityCollection5.jasper
===================================================================
diff -u
Binary files differ