Commit be2711bf9ca0b8774a13cf73e34c953253c0c799
1 parent
25d7a162
修正
Showing
1 changed file
with
1 additions
and
1 deletions
src/main/java/com/bsth/server_rs/electric/ElectricService.java
| @@ -36,7 +36,7 @@ public class ElectricService { | @@ -36,7 +36,7 @@ public class ElectricService { | ||
| 36 | //从数据库查询 | 36 | //从数据库查询 |
| 37 | //list = jdbcTemplate.query("select fgs_bm,fgs_name,gs_bm,gs_name,jdl,jdz,remarks,rq,creater_date,nbbm,jsy from bsth_c_jdl where gs_bm="+company+" and rq='"+rq+"'" | 37 | //list = jdbcTemplate.query("select fgs_bm,fgs_name,gs_bm,gs_name,jdl,jdz,remarks,rq,creater_date,nbbm,jsy from bsth_c_jdl where gs_bm="+company+" and rq='"+rq+"'" |
| 38 | // , BeanPropertyRowMapper.newInstance(Electric.class)); | 38 | // , BeanPropertyRowMapper.newInstance(Electric.class)); |
| 39 | - list = jdbcTemplate.query("select fgsdm as fgs_bm,c.business_name as fgs_name,ssgsdm as gs_bm,b.business_name as gs_name,cdl as jdl,'' as jdz,'' as remarks,rq,createtime as creater_date,nbbm,'' as jsy from (select fgsdm,ssgsdm,sum(cdl * 1000) / 1000 as cdl,rq,max(createtime) as createtime,nbbm from bsth_c_dlb where rq = '2018-08-20' GROUP BY fgsdm,ssgsdm,rq,nbbm) a left join bsth_c_business b on a.ssgsdm = b.business_code LEFT JOIN bsth_c_business c on concat(a.ssgsdm, '_', a.fgsdm) = concat(c.up_code, '_', c.business_code) where ssgsdm="+company+" and rq='"+rq+"'" | 39 | + list = jdbcTemplate.query("select fgsdm as fgs_bm,c.business_name as fgs_name,ssgsdm as gs_bm,b.business_name as gs_name,cdl as jdl,'' as jdz,'' as remarks,rq,createtime as creater_date,nbbm,'' as jsy from (select fgsdm,ssgsdm,sum(cdl * 1000) / 1000 as cdl,rq,max(createtime) as createtime,nbbm from bsth_c_dlb where rq = '" + rq + "' GROUP BY fgsdm,ssgsdm,rq,nbbm) a left join bsth_c_business b on a.ssgsdm = b.business_code LEFT JOIN bsth_c_business c on concat(a.ssgsdm, '_', a.fgsdm) = concat(c.up_code, '_', c.business_code) where ssgsdm="+company |
| 40 | , BeanPropertyRowMapper.newInstance(Electric.class)); | 40 | , BeanPropertyRowMapper.newInstance(Electric.class)); |
| 41 | }catch (Exception e){ | 41 | }catch (Exception e){ |
| 42 | logger.error("", e); | 42 | logger.error("", e); |