潘钊 / bsth_control · Commits

Commit 79aa918948f89e77396b9890987cc1354463fe14

Authored by 娄高锋
1 parent 895a2946
build: skipped

十三张报表分公司多选的补充

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @79aa918
... ... @@ -3177,7 +3177,7 @@ public class ReportServiceImpl implements ReportService{
3177 3177 sql += " and r.xl_bm = ?";
3178 3178 objList3.add(line);
3179 3179 }
3180   - sql += " group by r.xl_bm,r.cl_zbh";
  3180 + sql += " group by r.gs_bm,r.fgs_bm,r.xl_bm,r.cl_zbh";
3181 3181 listGroupBy=jdbcTemplate.query(sql, objList3.toArray(), new RowMapper<Map<String, Object>>() {
3182 3182 @Override
3183 3183 public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
... ... @@ -3214,7 +3214,7 @@ public class ReportServiceImpl implements ReportService{
3214 3214 sql += " and r.xl_bm = ?";
3215 3215 objList4.add(line);
3216 3216 }
3217   - sql += " group by r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh";
  3217 + sql += " group by r.gs_bm,r.fgs_bm,r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh";
3218 3218 listGroupBy=jdbcTemplate.query(sql, objList4.toArray(), new RowMapper<Map<String, Object>>() {
3219 3219 @Override
3220 3220 public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
... ...