Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java =================================================================== diff -u -r25755 -r25756 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java (.../CustomReportsOfXjjqzyy.java) (revision 25755) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java (.../CustomReportsOfXjjqzyy.java) (revision 25756) @@ -52,7 +52,7 @@ String joinSql = "";//连接器械包实例表 boolean assemblingStartTimeBool = StringUtils.isNotBlank(assemblingStartTime); boolean assemblingEndTimeBool = StringUtils.isNotBlank(assemblingEndTime); - if(assemblingStartTimeBool || assemblingEndTimeBool){//装配日期有值,连接器械包实例表,无值查询所有外来申请单 + if(assemblingStartTimeBool || assemblingEndTimeBool){//装配日期有值:连接器械包实例表;无值:查询所有外来申请单 joinSql = String.format(" inner join %s ti on ti.foreignTousseApp_id = f.id ", TousseInstance.class.getSimpleName()); } //拼接装配条件 @@ -93,7 +93,7 @@ } sqlBuilder.append(" order by i.id asc"); ResultSet rs = objectDao.executeSql(sqlBuilder.toString()); - ResultSet priceWeightIncludeImplantRs = null;//价格重量是否植入查询 + ResultSet priceWeightIncludeImplantRs = null;//用于查询:价格,重量,是否包含植入物 StringBuilder invoicePlanIds = new StringBuilder(); String TousseDefinitionClassName = TousseDefinition.class.getSimpleName(); try {