Commit 45621ce91c3cced71f8f68fd6fd51b383b3e18d9
1 parent
c0c8ca98
班次车辆人员表汇总
Showing
2 changed files
with
46 additions
and
4 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
| ... | ... | @@ -350,6 +350,34 @@ public class FormsServiceImpl implements FormsService { |
| 350 | 350 | |
| 351 | 351 | } |
| 352 | 352 | |
| 353 | + Shiftuehiclemanth shif = new Shiftuehiclemanth(); | |
| 354 | + shif.setjName("汇总合计"); | |
| 355 | + BigDecimal yylc = new BigDecimal("0.0"); | |
| 356 | + BigDecimal kslc = new BigDecimal("0.0"); | |
| 357 | + BigDecimal cjlc = new BigDecimal("0.0"); | |
| 358 | + BigDecimal zjlc = new BigDecimal("0.0"); | |
| 359 | + BigDecimal zlc = new BigDecimal("0.0"); | |
| 360 | + int cjbc = 0, zjbc = 0, sjbc = 0; | |
| 361 | + for(Shiftuehiclemanth s : list){ | |
| 362 | + yylc = yylc.add(new BigDecimal(s.getJhlc())); | |
| 363 | + kslc = kslc.add(new BigDecimal(s.getEmptMileage())); | |
| 364 | + cjlc = cjlc.add(new BigDecimal(s.getRemMileage())); | |
| 365 | + zjlc = zjlc.add(new BigDecimal(s.getAddMileage())); | |
| 366 | + zlc = zlc.add(new BigDecimal(s.getTotalm())); | |
| 367 | + cjbc += Integer.valueOf(s.getCjbc()); | |
| 368 | + zjbc += Integer.valueOf(s.getLjbc()); | |
| 369 | + sjbc += Integer.valueOf(s.getSjbc()); | |
| 370 | + } | |
| 371 | + shif.setJhlc(yylc.toString()); | |
| 372 | + shif.setEmptMileage(kslc.toString()); | |
| 373 | + shif.setRemMileage(cjlc.toString()); | |
| 374 | + shif.setAddMileage(zjlc.toString()); | |
| 375 | + shif.setTotalm(zlc.toString()); | |
| 376 | + shif.setCjbc("" + cjbc); | |
| 377 | + shif.setLjbc("" + zjbc); | |
| 378 | + shif.setSjbc("" + sjbc); | |
| 379 | + if(list.size() > 0) | |
| 380 | + list.add(shif); | |
| 353 | 381 | |
| 354 | 382 | return list; |
| 355 | 383 | } | ... | ... |
src/main/resources/static/pages/mforms/shifdays/shifday.html
| ... | ... | @@ -104,6 +104,16 @@ $(function(){ |
| 104 | 104 | format : 'YYYY-MM-DD', |
| 105 | 105 | locale : 'zh-cn' |
| 106 | 106 | }); |
| 107 | + var d = new Date(); | |
| 108 | + var year = d.getFullYear(); | |
| 109 | + var month = d.getMonth() + 1; | |
| 110 | + var day = d.getDate(); | |
| 111 | + if(month < 10) | |
| 112 | + month = "0" + month; | |
| 113 | + if(day < 10) | |
| 114 | + day = "0" + day; | |
| 115 | + $("#date").val(year + "-" + month + "-" + day); | |
| 116 | + | |
| 107 | 117 | var fage=false; |
| 108 | 118 | var obj = []; |
| 109 | 119 | var xlList; |
| ... | ... | @@ -227,10 +237,14 @@ $(function(){ |
| 227 | 237 | <script type="text/html" id="shifday"> |
| 228 | 238 | {{each list as obj i}} |
| 229 | 239 | <tr> |
| 230 | - <td>{{obj.jName}}</td> | |
| 231 | - <td>{{obj.sName}}</td> | |
| 232 | - <td>{{obj.lpName}}</td> | |
| 233 | - <td>{{obj.carPlate}}</td> | |
| 240 | + {{if obj.jName == '汇总合计'}} | |
| 241 | + <td colspan='4'>{{obj.jName}}</td> | |
| 242 | + {{else}} | |
| 243 | + <td>{{obj.jName}}</td> | |
| 244 | + <td>{{obj.sName}}</td> | |
| 245 | + <td>{{obj.lpName}}</td> | |
| 246 | + <td>{{obj.carPlate}}</td> | |
| 247 | + {{/if}} | |
| 234 | 248 | <td>{{obj.jhlc}}</td> |
| 235 | 249 | <td>{{obj.sjjhlc}}</td> |
| 236 | 250 | <td>{{obj.yygl}}</td> | ... | ... |