营运线路出车率统计表

娄高锋
1 parent 26abe0ca
Showing 7 changed files with 220 additions and 183 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/service/forms/FormsService.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/resources/static/pages/forms/mould/turnoutrate.xls
src/main/resources/static/pages/mforms/turnoutrates/turnoutrate.html
@@ -330,69 +330,22 @@ public class ExportController {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
-		List<Turnoutrate> turnoutrate = formsService.turnoutrate(map);
 		Map<String, Object> map1 = new HashMap<String, Object>();
-		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		String xlts="";
-		String zsgs="";
-		String jh="";
-		Float j=0f;
-		Float sj=0f;
-		Float qz=0f;
-		Float ccl=0f;
-		Float bcjh=0f;
-		String bcsj="";
-		Float bczxl=0f;
-		String gs="";
-		String zhgs="";
-		for (Turnoutrate l : turnoutrate) {
-			Map<String, Object> m = new HashMap<String, Object>();
-			
-			xlts +=l.getGsgs()==""?0:String.valueOf(l.getGsgs());
-			zsgs +=l.getFgsgs()==""?0:String.valueOf(l.getFgsgs());
-			jh +=l.getXl()==""?0:String.valueOf(l.getXl());
-			sj +=l.getCchjh()==""?0f:Float.valueOf(l.getCchjh());
-			ccl +=l.getCchsj()==""?0f:Float.valueOf(l.getCchsj());
-			bcjh +=l.getCchqz()==""?0f:Float.valueOf(l.getCchqz());
-			bcsj +=l.getChl()==""?0:String.valueOf(l.getChl());
-			bczxl +=l.getBcjh()==""?0f:Float.valueOf(l.getBcjh());
-			gs +=l.getBcsj()==""?0:String.valueOf(l.getBcsj());
-			zhgs +=l.getBbzxl()==""?0:String.valueOf(l.getBbzxl());
-			
-			
-			m.put("rq", l.getRq());
-			m.put("gs", l.getGs());
-			m.put("zhgs", l.getZhgs());
-			m.put("xl", l.getXl());
-			m.put("cchjh", l.getCchjh());
-			m.put("cchsj", l.getCchsj());
-			m.put("cchqz", l.getCchqz());
-			m.put("chl", l.getChl());
-			m.put("bcjh", l.getBcjh());
-			m.put("bcsj", l.getBcsj());
-			m.put("bbzxl", l.getBbzxl());
-			m.put("sm", l.getSm());
-			resList.add(m);
-			
-			
-			
-			m=new HashMap<String,Object>();
-			m.put("total_xlts", xlts);
-			m.put("total_zhgs", zsgs);
-			m.put("total_jh", jh);
-			m.put("total_sj", sj);
-			m.put("total_qz", ccl);
-			m.put("total_ccl", bcjh);
-			m.put("total_bcjh",bcsj);
-			m.put("total_bcsj", bczxl);
-			m.put("total_bczxl", bczxl);
-			m.put("total_gs", zhgs);
-			
-
-			map1 = m;
-		}
-
+		List<Map<String, Object>> resList = formsService.turnoutrate(map);
+		Map<String, Object> m = resList.get(resList.size() - 1);
+		map1.put("line", m.get("line"));
+		map1.put("jhcc", m.get("jhcc"));
+		map1.put("sjcc", m.get("sjcc"));
+		map1.put("jhbc", m.get("jhbc"));
+		map1.put("sjbc", m.get("sjbc"));
+		map1.put("ccl", m.get("ccl"));
+		map1.put("zxl", m.get("zxl"));
+		map1.put("qz", m.get("qz"));
+		map1.put("sm", m.get("sm"));
+		
+		resList.remove(m);
+		
 		try {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
@@ -94,7 +94,7 @@ public class MCY_FormsController {
 	// 营运线路出车率统计表
 	@RequestMapping(value = "/turnoutrate", method = RequestMethod.POST)
-	public List<Turnoutrate> turnoutrate(@RequestParam Map<String, Object> map) {
+	public List<Map<String, Object>> turnoutrate(@RequestParam Map<String, Object> map) {
 		return formsService.turnoutrate(map);
 	}
@@ -38,4 +38,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	List<Line> findLine(String line);
 	public Line findByLineCode(String string);
+	
+	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
+	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
 }
@@ -35,7 +35,7 @@ public interface FormsService {
 	public List<Operationservice> operationservice(Map<String, Object> map);
-	public List<Turnoutrate> turnoutrate(Map<String, Object> map);
+	public List<Map<String, Object>> turnoutrate(Map<String, Object> map);
 	public List<Executionrate> executionrate(Map<String, Object> map);
@@ -9,14 +9,17 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import com.bsth.entity.Line;
 import com.bsth.entity.mcy_forms.Linepasswengerflow;
 import com.bsth.entity.mcy_forms.Operationservice;
 import com.bsth.entity.mcy_forms.Shifday;
@@ -27,6 +30,8 @@ import com.bsth.entity.mcy_forms.Vehicleloading;
 import com.bsth.entity.mcy_forms.Waybillday;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.LineRepository;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.data.BasicData;
@@ -60,6 +65,10 @@ public class FormsServiceImpl implements FormsService {
 	@Autowired
 	YlbRepository ylbRepository; 
+	
+	@Autowired
+	LineRepository lineRepository;
+	
 	// 行车路单日报表
 	@Override
@@ -486,7 +495,7 @@ public class FormsServiceImpl implements FormsService {
 //				+ " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
 		String sql="select r.s_gh,r.s_name, "
-				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
 				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
 		if(xlbm.equals("")){
 			sql +="and r.gs_bm='"+gsdm+"' "
@@ -495,7 +504,7 @@ public class FormsServiceImpl implements FormsService {
 			sql += " and r.xl_bm = '"+xlbm+"'";
 		}
 	       sql += " group  by  r.s_gh,r.s_name,"
-	       		+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm order by r.xl_bm";
+	       		+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
 		List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 			//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -503,7 +512,7 @@ public class FormsServiceImpl implements FormsService {
 			public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Singledata sin = new Singledata();
 				sin.setrQ(startDate);
-				sin.setxL(arg0.getString("xl_bm"));
+				sin.setxL(arg0.getString("xl_name"));
 				sin.setClzbh(arg0.getString("cl_zbh"));
 				sin.setJsy(arg0.getString("j_gh"));
 				sin.setjName(arg0.getString("j_name"));
@@ -520,7 +529,6 @@ public class FormsServiceImpl implements FormsService {
 		for (int i = 0; i < list.size(); i++) {
 			List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
 			Singledata sin=list.get(i);
-			sin.setxL(BasicData.lineCode2NameMap.get(sin.getxL()));
 			String jsy=sin.getJsy();
 			String clzbh=sin.getClzbh();
 			for (int j = 0; j < listReal.size(); j++) {
@@ -734,11 +742,13 @@ public class FormsServiceImpl implements FormsService {
 	// 营运线路出车率统计表
 	@Override
-	public List<Turnoutrate> turnoutrate(Map<String, Object> map) {
+	public List<Map<String, Object>> turnoutrate(Map<String, Object> map) {
-		List<Turnoutrate> resList = new ArrayList<Turnoutrate>();
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
+		NumberFormat numberFormat = NumberFormat.getInstance();
+		numberFormat.setMaximumFractionDigits(2);
 		Date d = null;
 		Date d1 = null;
 		try {
@@ -750,68 +760,134 @@ public class FormsServiceImpl implements FormsService {
 		}
 		String rq2 = sdf1.format(d);
 		String rq3 = sdf1.format(d1);
+		String company = map.get("gsdmTurn").toString();
+		String subCompany = map.get("fgsdmTurn").toString();
+		String line = map.get("line").toString();
+		String startDate = map.get("startDate").toString();
+		String endDate = map.get("endDate").toString();
 		rq = rq2 + "-" + rq3;
-		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,b.warrant_car,a.bc_type from "
-				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+ map.get("startDate").toString() + "'  "
-				+ " and '" + map.get("endDate").toString() + "'  and xl_bm='"+ map.get("line").toString() + "' "
-				+ " AND gs_bm is not null "
-				+ " AND bc_type NOT IN ('in', 'out')"
-				+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
-				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"
-//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
-				+ " ) a left JOIN ("
-				+ " SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car   "
-				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real "
-				+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
-				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
-				+ "' AND gs_bm is not null "
-				+ " AND bc_type NOT IN ('in', 'out')"
-//				+ " 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 "
-				+ " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
-		List<Turnoutrate> list = jdbcTemplate.query(sql, new RowMapper<Turnoutrate>() {
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, startDate, endDate, company, subCompany);
+		List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line);
+		
+		String sql = "select * from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
+				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+startDate+"' and '"+endDate+"' ";
+		if(line.trim().length() != 0){
+			sql += "and xl_bm = '"+line+"' ";
+		}
+		List<SchedulePlanInfo> planList = jdbcTemplate.query(sql, new RowMapper<SchedulePlanInfo>() {
 			@Override
-			public Turnoutrate mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Turnoutrate tu = new Turnoutrate();
-				NumberFormat numberFormat = NumberFormat.getInstance();
-				numberFormat.setMaximumFractionDigits(2);
-				int scl = arg0.getString("scl")!=null&&arg0.getString("scl").trim().length()!=0?Integer.parseInt(arg0.getString("scl")):0;
-				int jcl = arg0.getString("jcl")!=null&&arg0.getString("jcl").trim().length()!=0?Integer.parseInt(arg0.getString("jcl")):0;
-				int sbc = arg0.getString("sbc")!=null&&arg0.getString("sbc").trim().length()!=0?Integer.parseInt(arg0.getString("sbc")):0;
-				int jbc = arg0.getString("jbc")!=null&&arg0.getString("jbc").trim().length()!=0?Integer.parseInt(arg0.getString("jbc")):0;
-				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
-				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
-				tu.setRq(rq);
-				if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
-					return tu;
-				tu.setGs(arg0.getString("gs_name").toString());
-				tu.setZhgs(arg0.getString("fgs_name").toString());
-//				tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");
-				tu.setXl(arg0.getString("jxl")!=null&&arg0.getString("jxl").trim().length()!=0?arg0.getString("jxl"):"0");
-				tu.setXlmc(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
-				tu.setCchjh("" + jcl);
-				tu.setCchsj("" + scl);
-				tu.setCchqz(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
-				tu.setChl(result1 + "%");// 出车率
-				tu.setBcjh("" + jbc);
-				tu.setBcsj("" + sbc);
-				tu.setBbzxl(result2 + "%");// 班次执行率
-				tu.setSm(arg0.getString("gs_name").toString());
-				tu.setGsgs(arg0.getString("gslsbm").toString());
-				tu.setFgsgs(arg0.getString("fgsbm").toString());
-				return tu;
+			public SchedulePlanInfo mapRow(ResultSet arg0, int arg1) throws SQLException {
+				SchedulePlanInfo schedule = new SchedulePlanInfo();
+				schedule.setGsName(arg0.getString("gs_name"));
+				schedule.setFgsName(arg0.getString("fgs_name"));
+				schedule.setClZbh(arg0.getString("cl_zbh"));
+				schedule.setFcsj(arg0.getString("fcsj"));
+				schedule.setBcType(arg0.getString("bc_type"));
+				schedule.setXlBm(arg0.getString("xl_bm"));
+				schedule.setXlName(arg0.getString("xl_name"));
+				schedule.setScheduleDate(arg0.getDate("schedule_date"));
+				return schedule;
 			}
 		});
-		for(Turnoutrate t : list){
-			if(t.getGs() != null && t.getGs().trim().length() != 0)
-				resList.add(t);
+		
+		for(Line line1 : lineList){
+			if(line.trim().length() == 0 || line1.getLineCode().equals(line)){
+				Map<String, Object> m = new HashMap<String, Object>();
+				m.put("rq", rq);
+				m.put("line", line1.getName());
+				m.put("xlBm", line1.getLineCode());
+				m.put("qz", line1.getWarrantCar()!=null?line1.getWarrantCar():0);
+				m.put("sm", "");
+				resList.add(m);
+			}
+		}
+		for(Map<String, Object> m : resList){
+			String xlBm = m.get("xlBm").toString();
+			List<ScheduleRealInfo> reals = new ArrayList<ScheduleRealInfo>();
+			List<SchedulePlanInfo> plans = new ArrayList<SchedulePlanInfo>();
+			for(ScheduleRealInfo schedule : list){
+				if(schedule.getXlBm().equals(xlBm)){
+					reals.add(schedule);
+				}
+			}
+			for(SchedulePlanInfo schedule : planList){
+				if(schedule.getXlBm().equals(xlBm)){
+					plans.add(schedule);
+				}
+			}
+			Set<String> jhcc = new HashSet<String>();
+			Set<String> sjcc = new HashSet<String>();
+			for(SchedulePlanInfo schedule : plans){
+				if(!m.containsKey("gsName") && schedule.getGsName()!=null && schedule.getGsName().trim().length()!=0){
+					m.put("gsName", schedule.getGsName());
+				}
+				if(!m.containsKey("fgsName") && schedule.getFgsName()!=null && schedule.getFgsName().trim().length()!=0){
+					m.put("fgsName", schedule.getFgsName());
+				}
+				jhcc.add(schedule.getClZbh() + sdf.format(schedule.getScheduleDate()));
+			}
+			for(ScheduleRealInfo schedule : reals){
+				if(!m.containsKey("gsName") && schedule.getGsName()!=null && schedule.getGsName().trim().length()!=0){
+					m.put("gsName", schedule.getGsName());
+				}
+				if(!m.containsKey("fgsName") && schedule.getFgsName()!=null && schedule.getFgsName().trim().length()!=0){
+					m.put("fgsName", schedule.getFgsName());
+				}
+				sjcc.add(schedule.getClZbh() + sdf.format(schedule.getScheduleDate()));
+			}
+			m.put("jhcc", jhcc.size());
+			m.put("sjcc", sjcc.size());
+			if(jhcc.size() != 0  && sjcc.size() != 0){
+				m.put("ccl", numberFormat.format(((float)sjcc.size() / jhcc.size())*100)+"%");
+			}else{
+				m.put("ccl", "--");
+			}
+			int jhbc = culateMileageService.culateJhbc(reals, "");
+			int sjbc = culateMileageService.culateSjbc(reals, "");
+			m.put("jhbc", jhbc);
+			m.put("sjbc", sjbc);
+			if(jhbc != 0 && sjbc != 0){
+				m.put("zxl", numberFormat.format(((float)sjbc / jhbc)*100)+"%");
+			}else{
+				m.put("zxl", "--");
+			}
+		}
+		Map<String, Object> tempMap = new HashMap<String, Object>();
+		int jhcc = 0;
+		int sjcc = 0;
+		int jhbc = 0;
+		int sjbc = 0;
+		int qz = 0;
+		for(Map<String, Object> m : resList){
+			jhcc += Integer.valueOf(m.get("jhcc").toString());
+			sjcc += Integer.valueOf(m.get("sjcc").toString());
+			jhbc += Integer.valueOf(m.get("jhbc").toString());
+			sjbc += Integer.valueOf(m.get("sjbc").toString());
+			qz += Integer.valueOf(m.get("qz").toString());
+		}
+		tempMap.put("rq", "分类汇总");
+		tempMap.put("line", "共" + resList.size() + "条线路");
+		tempMap.put("jhcc", jhcc);
+		tempMap.put("sjcc", sjcc);
+		tempMap.put("jhbc", jhbc);
+		tempMap.put("sjbc", sjbc);
+		tempMap.put("qz", qz);
+		if(jhcc != 0 && sjcc != 0){
+			tempMap.put("ccl", numberFormat.format(((float)sjcc / jhcc)*100)+"%");
+		}else{
+			tempMap.put("ccl", "--");
+		}
+		if(jhbc != 0 && sjbc != 0){
+			tempMap.put("zxl", numberFormat.format(((float)sjbc / jhbc)*100)+"%");
+		}else{
+			tempMap.put("zxl", "--");
 		}
+		resList.add(tempMap);
 		return resList;
 	}
@@ -92,20 +92,20 @@
 						<tbody id="tbody">
 						</tbody>
-						<tr>
-							<td colspan="1">分类汇总</td>
-							<td><span id="total_gs">&nbsp;</span></td>
-							<td><span id="total_zhgs">&nbsp;</span></td>
-							<td><span id="total_xlts">&nbsp;</span></td>
-							<td><span id="total_jh">&nbsp;</span></td>
-							<td><span id="total_sj">&nbsp;</span></td>
-							<td><span id="total_qz">&nbsp;</span></td>
-							<td><span id="total_ccl">&nbsp;</span></td>
-							<td><span id="total_bcjh">&nbsp;</span></td>
-							<td><span id="total_bcsj">&nbsp;</span></td>
-							<td><span id="total_bczxl">&nbsp;</span></td>
-							<td><span id="total_sm">&nbsp;</span></td>
-						</tr>
+<!-- 						<tr> -->
+<!-- 							<td colspan="1">分类汇总</td> -->
+<!-- 							<td><span id="total_gs">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_zhgs">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_xlts">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_jh">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_sj">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_qz">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_ccl">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_bcjh">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_bcsj">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_bczxl">&nbsp;</span></td> -->
+<!-- 							<td><span id="total_sm">&nbsp;</span></td> -->
+<!-- 						</tr> -->
 					</table>
 				</div>
 			</div>
@@ -197,53 +197,53 @@
 		$("#query").on("click",function(){
 		  line = $("#line").val();
-		  startDate1=$("#startDate").val();
-	   	  endDate1=$("#endDate").val();
+		  startDate=$("#startDate").val();
+		  endDate=$("#endDate").val();
 	   	  gsdmTurn=$("#gsdmTurn").val();
 	   	  fgsdmTurn=$("#fgsdmTurn").val();
-			 if(startDate1!=''&&endDate1!=''){
+			 if(startDate!=''&&endDate!=''){
 				$post('/mcy_forms/turnoutrate',
-					{ gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
+					{ gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:startDate,endDate:endDate,type:'query'},function(result){
 // 						var result=[];
 					 // 把数据填充到模版中
 						var tbodyHtml = template('turnoutrate',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 						$('#tbody').html(tbodyHtml);
-					  line = $("#line").val();
-					  startDate = $("#startDate").val();
-					   endDate = $("#endDate").val();
-					    $("#sDate").text(startDate);
-				        $("#eDate").text(endDate);
+						line = $("#line").val();
+						startDate = $("#startDate").val();
+						endDate = $("#endDate").val();
+						$("#sDate").text(startDate);
+						$("#eDate").text(endDate);
-				        var total_xlts = 0,total_jh = 0;
-				        var total_sj = 0,total_qz = 0,total_ccl = 0,total_bcjh = 0;
-				        var total_bcjh = 0,total_bcsj = 0,total_bczxl = 0;
-				   		var total_gs=0; 
-				        var total_zhgs=0;
-				        $.each(result, function(i, obj) {
-					    	total_gs +=Number(obj.gsgs);
-					    	total_zhgs +=Number(obj.fgsgs);
-					    	total_xlts += Number(obj.xl);
-					    	total_jh = Number(obj.cchjh)+Number(total_jh);
-					    	total_sj = Number(obj.cchsj)+Number(total_sj);
-					    	total_qz = Number(obj.cchqz)+Number(total_qz);
+// 				        var total_xlts = 0,total_jh = 0;
+// 				        var total_sj = 0,total_qz = 0,total_ccl = 0,total_bcjh = 0;
+// 				        var total_bcjh = 0,total_bcsj = 0,total_bczxl = 0;
+// 				   		var total_gs=0; 
+// 				        var total_zhgs=0;
+// 				        $.each(result, function(i, obj) {
+// 					    	total_gs +=Number(obj.gsgs);
+// 					    	total_zhgs +=Number(obj.fgsgs);
+// 					    	total_xlts += Number(obj.xl);
+// 					    	total_jh = Number(obj.cchjh)+Number(total_jh);
+// 					    	total_sj = Number(obj.cchsj)+Number(total_sj);
+// 					    	total_qz = Number(obj.cchqz)+Number(total_qz);
-					    	total_ccl =(Number(total_sj)/Number(total_jh))*100;
-					    	total_bcjh = Number(obj.bcjh)+Number(total_bcjh);
-					    	total_bcsj = Number(obj.bcsj)+Number(total_bcsj);
-					    	total_bczxl = (Number(total_bcsj)/Number(total_bcjh))*100;
+// 					    	total_ccl =(Number(total_sj)/Number(total_jh))*100;
+// 					    	total_bcjh = Number(obj.bcjh)+Number(total_bcjh);
+// 					    	total_bcsj = Number(obj.bcsj)+Number(total_bcsj);
+// 					    	total_bczxl = (Number(total_bcsj)/Number(total_bcjh))*100;
-		                });
-		                $("#total_gs").text(total_gs);
-		                $("#total_zhgs").text(total_zhgs);
-		                $("#total_xlts").text(total_xlts);
-		                $("#total_jh").text(total_jh);
-		                $("#total_sj").text(total_sj);
-		                $("#total_qz").text(total_qz);
-		                $("#total_ccl").text(total_ccl.toFixed(2)+'%');
-		                $("#total_bcjh").text(total_bcjh);
-		                $("#total_bcsj").text(total_bcsj);
-		                $("#total_bczxl").text(total_bczxl.toFixed(2)+'%');
+// 		                });
+// 		                $("#total_gs").text(total_gs);
+// 		                $("#total_zhgs").text(total_zhgs);
+// 		                $("#total_xlts").text(total_xlts);
+// 		                $("#total_jh").text(total_jh);
+// 		                $("#total_sj").text(total_sj);
+// 		                $("#total_qz").text(total_qz);
+// 		                $("#total_ccl").text(total_ccl.toFixed(2)+'%');
+// 		                $("#total_bcjh").text(total_bcjh);
+// 		                $("#total_bcsj").text(total_bcsj);
+// 		                $("#total_bczxl").text(total_bczxl.toFixed(2)+'%');
 				        var temp = {};
 				        var today_account = 0;
@@ -278,18 +278,23 @@
 <script type="text/html" id="turnoutrate">
 	{{each list as obj i}}
 		<tr>
-			<td>{{obj.rq}}</td>
-			<td>{{obj.gs}}</td>
-			<td>{{obj.zhgs}}</td>
-			<td>{{obj.xl}}</td>
-			<td>{{obj.cchjh}}</td>
-			<td>{{obj.cchsj}}</td>
-			<td>{{obj.cchqz}}</td>
-			<td>{{obj.chl}}</td>
-			<td>{{obj.bcjh}}</td>
-			<td>{{obj.bcsj}}</td>
-			<td>{{obj.bbzxl}}</td>
-			<td>{{obj.gs}}</td>
+			{{if obj.rq == '分类汇总'}}
+				<td colspan='3'>{{obj.rq}}</td>
+			{{/if}}
+			{{if obj.rq != '分类汇总'}}
+				<td>{{obj.rq}}</td>
+				<td>{{obj.gsName}}</td>
+				<td>{{obj.fgsName}}</td>
+			{{/if}}
+			<td>{{obj.line}}</td>
+			<td>{{obj.jhcc}}</td>
+			<td>{{obj.sjcc}}</td>
+			<td>{{obj.qz}}</td>
+			<td>{{obj.ccl}}</td>
+			<td>{{obj.jhbc}}</td>
+			<td>{{obj.sjbc}}</td>
+			<td>{{obj.zxl}}</td>
+			<td>{{obj.sm}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}