Commit 62df3930803eb2b64e538efe6e001911ce953152
1 parent
92c2d390
运营服务阶段报表报错问题修复；统计日报导出表样式更新。
Showing
3 changed files
with
4 additions
and
4 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
| @@ -2414,15 +2414,15 @@ public class FormsServiceImpl implements FormsService { | @@ -2414,15 +2414,15 @@ public class FormsServiceImpl implements FormsService { | ||
| 2414 | dlbObjList.add(startDate); | 2414 | dlbObjList.add(startDate); |
| 2415 | dlbObjList.add(endDate); | 2415 | dlbObjList.add(endDate); |
| 2416 | if(!xlbm.equals("")){ | 2416 | if(!xlbm.equals("")){ |
| 2417 | - ylbSql += " and xlbm = ? "; | 2417 | + dlbSql += " and xlbm = ? "; |
| 2418 | dlbObjList.add(xlbm); | 2418 | dlbObjList.add(xlbm); |
| 2419 | } | 2419 | } |
| 2420 | if(!gsdm.equals("")){ | 2420 | if(!gsdm.equals("")){ |
| 2421 | - ylbSql += " and ssgsdm = ? "; | 2421 | + dlbSql += " and ssgsdm = ? "; |
| 2422 | dlbObjList.add(gsdm); | 2422 | dlbObjList.add(gsdm); |
| 2423 | } | 2423 | } |
| 2424 | if(!fgsdm.equals("")){ | 2424 | if(!fgsdm.equals("")){ |
| 2425 | - ylbSql += " and fgsdm = ? "; | 2425 | + dlbSql += " and fgsdm = ? "; |
| 2426 | dlbObjList.add(fgsdm); | 2426 | dlbObjList.add(fgsdm); |
| 2427 | } | 2427 | } |
| 2428 | List<Dlb> dlbList= jdbcTemplate.query(dlbSql, dlbObjList.toArray(), new RowMapper<Dlb>() { | 2428 | List<Dlb> dlbList= jdbcTemplate.query(dlbSql, dlbObjList.toArray(), new RowMapper<Dlb>() { |
src/main/resources/static/pages/forms/mould/statisticsDaily_.xls
No preview for this file type
src/main/resources/static/pages/oil/list_ph.html
| @@ -183,7 +183,7 @@ | @@ -183,7 +183,7 @@ | ||
| 183 | </td> | 183 | </td> |
| 184 | <td width="40px">序号</td> | 184 | <td width="40px">序号</td> |
| 185 | <td width="8%">日期</td> | 185 | <td width="8%">日期</td> |
| 186 | - <td width="5%">公司</td> | 186 | + <td width="5%">线队</td> |
| 187 | <td width="8%">线路</td> | 187 | <td width="8%">线路</td> |
| 188 | <td width="2%">路牌</td> | 188 | <td width="2%">路牌</td> |
| 189 | <td width="5%">自编号</td> | 189 | <td width="5%">自编号</td> |