嘉定统计日报导出修改

廖磊
1 parent e466ea40
Showing 5 changed files with 48 additions and 12 deletions
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/resources/static/pages/forms/statement/jd_daily.html
src/main/resources/static/pages/oil/add.html
src/main/resources/static/pages/oil/jyglList.html
@@ -66,7 +66,7 @@ public class JdtestServiceImpl implements JdtestService {
 		+ " GROUP_CONCAT(p.`name`)  as linename from (select nbbm,xlbm,linename from bsth_c_ylb "
 		+ " where rq='"+rq+"' and ssgsdm='"+gsdm+"' and fgsdm='"+fgsdm+"' group by nbbm,xlbm,linename) o "
 		+ " LEFT JOIN bsth_c_line p on o.xlbm=p.line_code group by o.nbbm ) v on u.nbbm=v.nbbm) c "
-		+ " on a.nbbm=c.nbbm where 1=1";
+		+ " on a.nbbm=c.nbbm where 1=1 ";
 		if(!nbbm.equals("")){
 			sql +=" and a.nbbm like '%"+nbbm+"%'";
 		}
@@ -76,6 +76,7 @@ public class JdtestServiceImpl implements JdtestService {
 		if(type){
 			sql +=" and c.xlbm is not null";
 		}
+		sql +=" order by xlname desc";
  
 		List<Ylxxb> yList= jdbcTemplate.query(sql,
 				 new RowMapper<Ylxxb>(){
@@ -144,6 +145,16 @@ public class JdtestServiceImpl implements JdtestService {
 		List<ScheduleRealInfo> sList;
 		List<ScheduleRealInfo> jList;
 		List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
+		double jzyl_z=0.0;
+		double czyl_z=0.0;
+		double jzl_z=0.0;
+		double yh_z=0.0;
+		int jhbc_z=0;
+		double jhlc_z=0.0;
+		int sjbc_z=0;
+		double sjzlc_z=0.0;
+		double kszlc_z=0.0;
+		double zlc_z=0.0;
 		for(int i=0;i<list.size();i++){
 			sList =new ArrayList<ScheduleRealInfo>();
 			jList =new ArrayList<ScheduleRealInfo>();
@@ -169,9 +180,13 @@ public class JdtestServiceImpl implements JdtestService {
 				}
 			}
 			m.put("jzyl",jzyl);
+			jzyl_z=Arith.add(jzyl, jzyl_z);
 			m.put("czyl", czyl);
+			czyl_z=Arith.add(czyl, czyl_z);
 			m.put("jzl", jzl);
+			jzl_z=Arith.add(jzl, jzl_z);
 			m.put("yh", yh);
+			yh_z=Arith.add(yh, yh_z);
 			m.put("rylx", rylx);
 			m.put("dh", "");
 			for (int j = 0; j < lists.size(); j++) {
@@ -195,19 +210,20 @@ public class JdtestServiceImpl implements JdtestService {
 			m.put("jName", jList.get(0).getjName());
  
 			int jhbc=culateMileageService.culateJhbc(jList, "");
+			jhbc_z=jhbc+jhbc_z;
 			double jhlc=culateMileageService.culateJhgl(jList);
-			
+			jhlc_z=Arith.add(jhlc, jhlc_z);
 			int sjbc=culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "");
 			double ljgl=culateMileageService.culateLjgl(sList);
 			double sjgl=culateMileageService.culateSjgl(sList);
 			double sjzlc=Arith.add(ljgl, sjgl);
-			
+			sjzlc_z=Arith.add(sjzlc, sjzlc_z);
 			double ksgl=culateMileageService.culateKsgl(sList);
 			double jccgl=culateMileageService.culateJccgl(sList);
 			double kszlc=Arith.add(ksgl, jccgl);
-			
+			kszlc_z=Arith.add(kszlc, kszlc_z);
 			double zlc=Arith.add(sjzlc, kszlc);
-			
+			zlc_z=Arith.add(zlc, zlc_z);
 			m.put("jhbc", jhbc);
 			m.put("jhlc", jhlc);
 			m.put("sjbc", sjbc);
@@ -216,6 +232,24 @@ public class JdtestServiceImpl implements JdtestService {
 			m.put("zlc", zlc);
  
 		}
+		Map<String, Object> mmp=new HashMap<>();
+		mmp.put("lp", "合计");
+		mmp.put("jGh", "");
+		mmp.put("clZbh", "");
+		mmp.put("jName", "");
+		mmp.put("jhbc", jhbc_z);
+		mmp.put("jhlc", jhlc_z);
+		mmp.put("sjbc", sjbc_z);
+		mmp.put("sjzlc", sjzlc_z);
+		mmp.put("kszlc",kszlc_z);
+		mmp.put("zlc", zlc_z);
+		mmp.put("jzyl",jzyl_z);
+		mmp.put("czyl",czyl_z);
+		mmp.put("jzl", jzl_z);
+		mmp.put("yh", yh_z);
+		mmp.put("rylx", "");
+		mmp.put("dh","");
+		list.add(mmp);
 		return list;
 	}
 }
@@ -421,7 +421,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		+ " GROUP_CONCAT(p.`name`)  as linename from (select nbbm,xlbm,linename from bsth_c_ylb "
 		+ " where rq='"+rq+"' and ssgsdm='"+gsdm+"' and fgsdm='"+fgsdm+"' group by nbbm,xlbm,linename) o "
 		+ " LEFT JOIN bsth_c_line p on o.xlbm=p.line_code group by o.nbbm ) v on u.nbbm=v.nbbm) c "
-		+ " on a.nbbm=c.nbbm where 1=1";
+		+ " on a.nbbm=c.nbbm where 1=1 ";
 		if(!nbbm.equals("")){
 			sql +=" and a.nbbm like '%"+nbbm+"%'";
 		}
@@ -431,7 +431,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		if(type){
 			sql +=" and c.xlbm is not null";
 		}
-		
+		sql +=" order by xlname desc";
 		List<Ylxxb> yList= jdbcTemplate.query(sql,
 				 new RowMapper<Ylxxb>(){
 			 @Override
@@ -255,7 +255,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -116,7 +116,9 @@
 					<div class="col-md-4">
 							<select name="rylx" class="form-control">
 								<option value='0'>0号柴油</option> 
-								<option value='1'>负10号柴油</option> 
+								<option value='1'>负10号柴油</option>
+								<option value='2'>B5-0号柴油</option>
+								<option value='3'>B5-负10号柴油</option> 
 							</select>
 					</div>
 				</div>
@@ -191,9 +191,9 @@ $(function(){
     		map['id']=id;
             map['jsy']=jsy;
             map['jzl']=jzl;
-            map['stationid']=stationid;
-            map['nylx']=nylx;
-            map['jyggh']=jyggh;
+//             map['stationid']=stationid;
+//             map['nylx']=nylx;
+//             map['jyggh']=jyggh;
             map['bz']=bz;
             ylArray.push(map);
     	})