|  | @@ -599,13 +599,12 @@ public class TemplateGenerator2 {
 | 
											
												
													
														|  |          List<DPump> dPumpList =pDao.selectByExample(psb);
 |  |          List<DPump> dPumpList =pDao.selectByExample(psb);
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          DPumpHfMapper hfDao =UtilTools.getBean(DPumpHfMapper.class);
 |  |          DPumpHfMapper hfDao =UtilTools.getBean(DPumpHfMapper.class);
 | 
											
												
													
														|  | -        DPumpHfSQLBuilder hfsb =new DPumpHfSQLBuilder();
 |  | 
 | 
											
												
													
														|  | -        DPumpHfSQLBuilder.Criteria hfsc = hfsb.createCriteria();
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  |          List<DPumpVo> pumps= new ArrayList<>();
 |  |          List<DPumpVo> pumps= new ArrayList<>();
 | 
											
												
													
														|  |          dPumpList.forEach(dPump -> {
 |  |          dPumpList.forEach(dPump -> {
 | 
											
												
													
														|  |              DPumpVo vo =new DPumpVo();
 |  |              DPumpVo vo =new DPumpVo();
 | 
											
												
													
														|  |              vo.setPump(dPump);
 |  |              vo.setPump(dPump);
 | 
											
												
													
														|  | 
 |  | +            DPumpHfSQLBuilder hfsb =new DPumpHfSQLBuilder();
 | 
											
												
													
														|  | 
 |  | +            DPumpHfSQLBuilder.Criteria hfsc = hfsb.createCriteria();
 | 
											
												
													
														|  |              hfsc.andPumpidEqualTo(dPump.getId());
 |  |              hfsc.andPumpidEqualTo(dPump.getId());
 | 
											
												
													
														|  |              hfsb.setOrderByClause("hight");
 |  |              hfsb.setOrderByClause("hight");
 | 
											
												
													
														|  |              List<DPumpHf> hfs =hfDao.selectByExample(hfsb);
 |  |              List<DPumpHf> hfs =hfDao.selectByExample(hfsb);
 |