Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r41319 -r41622 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 41319) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 41622) @@ -4439,15 +4439,16 @@ } } StringBuffer sql = new StringBuffer(1000); - sql.append(" select ip.id,ip.serialNumber,po.tousseDefinitionId,ip.readed,ip.depart,ip.departCoding,ip.version,ip.applicationTime,po.tousseName,po.amount,po.prepareRecycleAmount,po.isCleanedEntirely,po.isApplyEntireTousse,po.tousseType ") + sql.append(" select ip.id,ip.serialNumber,po.tousseDefinitionId,ip.readed,ip.depart,ip.departCoding,ip.version,ip.applicationTime,po.tousseName,po.amount,po.prepareRecycleAmount,po.isCleanedEntirely,po.isApplyEntireTousse,po.tousseType,ur.colorCode,ur.name as urgentLevelName,ur.grade,po.urgentAmount ") .append(" from ") .append(TousseItem.class.getSimpleName()) .append(" po inner join ") .append(InvoicePlan.class.getSimpleName()) - .append(" ip on ip.id=po.recyclingApplication_ID ") - .append(" left join ") + .append(" ip on ip.id=po.recyclingApplication_ID left join ") .append(TousseDefinition.class.getSimpleName()) - .append(" td on td.id=po.tousseDefinitionId ") + .append(" td on td.id=po.tousseDefinitionId left join ") + .append(UrgentLevel.class.getSimpleName()) + .append(" ur on ur.id=po.urgentLevel_id ") .append(" where ip.recyclingStatus in('") .append(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE) .append("','") @@ -4506,10 +4507,18 @@ String isApplyEntireTousse = rs.getString("isApplyEntireTousse"); String tousseType = rs.getString("tousseType"); String serialNumber = rs.getString("serialNumber"); + String colorCode = rs.getString("colorCode"); + String urgentLevel = rs.getString("urgentLevelName"); + int urgentAmount = rs.getInt("urgentAmount"); + int grade = rs.getInt("grade"); ExpressRecyclingVo vo = new ExpressRecyclingVo(); if (readed == 0) { ipIds.add(ipId); } + vo.setGrade(grade); + vo.setColorCode(colorCode); + vo.setUrgentLevel(urgentLevel); + vo.setUrgentAmount(urgentAmount); vo.setApplicationId(ipId); vo.setDepart(depart); vo.setInvoicePlanVersion(version);