Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseReportHelper.java =================================================================== diff -u -r38251 -r38277 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseReportHelper.java (.../ForeignTousseReportHelper.java) (revision 38251) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseReportHelper.java (.../ForeignTousseReportHelper.java) (revision 38277) @@ -332,7 +332,7 @@ + "ti.tousseName tousseName," + "ti.supplierName supplierName," + "case when "+DatabaseUtil.getSqlLengthFunctionName(dbConnection)+"(cb.personInCharge)>0 then cb.personInCharge else wr.operator end personInCharge," - + "cw.WashAndDisinfectRecord_ID washAndDisinfectRecordId,fta.receiveMan,fta.returneeOfSupplier,ti.completeness,ip.serialNumber " + + "cw.WashAndDisinfectRecord_ID washAndDisinfectRecordId,fta.returnMan,fta.returneeOfSupplier,ti.completeness,ip.serialNumber " + " from "+ ForeignTousseApplication.class.getSimpleName() + " fta join "+ InvoicePlan.class.getSimpleName() +" ip on ip.id=fta.id join " @@ -355,7 +355,7 @@ result = objectDao.executeSql(sql); String foreignTousseAfterUseDeliveryAutoTakesTheValueOfTheSpecifiedField = CssdUtils.getSystemSetConfigByName("foreignTousseAfterUseDeliveryAutoTakesTheValueOfTheSpecifiedField"); boolean queryCompleteness = false; - boolean queryReceiveMan = false; + boolean queryReturnMan = false; boolean queryReturneeofsupplier = false; if(StringUtils.isNotBlank(foreignTousseAfterUseDeliveryAutoTakesTheValueOfTheSpecifiedField)){ JSONArray configArr = JSONArray.fromObject(foreignTousseAfterUseDeliveryAutoTakesTheValueOfTheSpecifiedField); @@ -367,8 +367,8 @@ } if("completeness".equalsIgnoreCase(value)){ queryCompleteness = true; - }else if("receiveMan".equalsIgnoreCase(value)){ - queryReceiveMan = true; + }else if("returnMan".equalsIgnoreCase(value)){ + queryReturnMan = true; }else if("returneeofsupplier".equalsIgnoreCase(value)){ queryReturneeofsupplier = true; } @@ -394,8 +394,8 @@ if(queryReturneeofsupplier){ vo.setReturneeOfSupplier(StringTools.defaultString(result.getString("returneeOfSupplier"))); } - if(queryReceiveMan){ - vo.setReceiveMan(StringTools.defaultString(result.getString("receiveMan"))); + if(queryReturnMan){ + vo.setReceiveMan(StringTools.defaultString(result.getString("returnMan"))); } if(queryCompleteness){ String completeness = result.getString("completeness");