Commit f66da310970f5a236c485520827f5e578570f2f6
1 parent
7f6d008f
营运线路名称统计表
Showing
1 changed file
with
2 additions
and
1 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
| ... | ... | @@ -910,8 +910,9 @@ public class FormsServiceImpl implements FormsService { |
| 910 | 910 | + map.get("endDate").toString() + "' and xl_bm='" + map.get |
| 911 | 911 | ("line").toString() |
| 912 | 912 | + "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out')" |
| 913 | - + "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON t.company=b.gs_bm) b on " | |
| 913 | + + "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on " | |
| 914 | 914 | + " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm "; |
| 915 | + | |
| 915 | 916 | List<Allline> list = jdbcTemplate.query(sql, new RowMapper<Allline>() { |
| 916 | 917 | |
| 917 | 918 | @Override | ... | ... |