潘钊 / bsth_control · Commits

Commit 18d6c1db18e1772f727b0adb20d84cefe48d0fd3

Authored by mcy123
1 parent ab39532a

mcy

Inline Side-by-side
Showing 2 changed files with 13 additions and 8 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @18d6c1d
... ... @@ -354,15 +354,22 @@ public class FormsServiceImpl implements FormsService {
354 354 op.setXlName(arg0.getString("xl_name"));
355 355 op.setJzl(arg0.getString("JZL"));
356 356 op.setXhl(arg0.getString("YH"));
357   - Map<String, Object> maps = new HashMap<>();
358   - maps = scheduleRealInfoService.findKMBC1(arg0.getString("j_name"), arg0.getString("cl_zbh"), startDate,
359   - endDate);
360   - op.setXsgl(maps.get("yygl").toString() == null ? "" : maps.get("yygl").toString());
361   - op.setEmptMileage(maps.get("ksgl").toString() == null ? "" : maps.get("ksgl").toString());
362   - op.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());
  357 + op.setClzbh(arg0.getString("cl_zbh"));
  358 + op.setJname(arg0.getString("j_name"));
  359 +
363 360 return op;
364 361 }
365 362 });
  363 +
  364 + for(int i=0;i<list.size();i++){
  365 + Operationservice o=list.get(i);
  366 + Map<String, Object> maps = new HashMap<>();
  367 + maps = scheduleRealInfoService.findKMBC1(o.getJname(), o.getClzbh(), startDate,
  368 + endDate);
  369 + o.setXsgl(maps.get("yygl").toString() == null ? "" : maps.get("yygl").toString());
  370 + o.setEmptMileage(maps.get("ksgl").toString() == null ? "" : maps.get("ksgl").toString());
  371 + o.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());
  372 + }
366 373 return list;
367 374 }
368 375  
... ...
src/main/resources/static/pages/forms/statement/operationservice.html
  View file @18d6c1d
... ... @@ -112,7 +112,6 @@
112 112 text : result[code]
113 113 });
114 114 }
115   - console.log(data);
116 115 initPinYinSelect2('#line', data, '');
117 116  
118 117 })
... ... @@ -199,7 +198,6 @@
199 198 obj.updateDate = moment(obj.startDate).format(
200 199 "YYYY-MM-DD HH:mm:ss");
201 200 });
202   - console.log(result);
203 201 var operationservice = template('operationservice', {
204 202 list : result
205 203 });
... ...