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