Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into minhang

娄高锋
2 parents 59aad645 3c00b31d
Showing 19 changed files with 597 additions and 353 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/report/SheetController.java
src/main/java/com/bsth/entity/excep/ArrivalInfo.java
src/main/java/com/bsth/entity/mcy_forms/Changetochange.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/SheetService.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
src/main/java/com/bsth/service/traffic/YgcBasicDataService.java
src/main/java/com/bsth/service/traffic/impl/YgcBasicDataServiceImpl.java
src/main/resources/static/pages/forms/mould/correctForm.xls
src/main/resources/static/pages/forms/mould/inoutstation.xls
src/main/resources/static/pages/forms/statement/correctForm.html
src/main/resources/static/pages/oil/add.html
src/main/resources/static/pages/report/inoutstation.html
src/main/resources/static/pages/report/sheet/list.html
src/main/resources/static/pages/report/sheet/sheetList.html
@@ -319,8 +319,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/correctForm")
 	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
+											@RequestParam String endDate,
 											 @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
-		return scheduleRealInfoService.correctForm(line, date,  lpName, code, type);
+		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type);
 	}
 	/**
 	 * @Title queryListWaybill
@@ -110,6 +110,7 @@ public class ReportController {
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("i", i);
 			m.put("nbbm", a.getNbbm());
+			m.put("pzh", a.getPzh());
 			m.put("stopName", a.getStopName());
 			m.put("jzsj", a.getJzsj());
 			m.put("czsj", a.getCzsj());
@@ -36,9 +36,21 @@ public class SheetController  extends BaseController&lt;Sheet, Integer&gt;{
 		List<Sheet> list=sheetService.sheetList(id);
 		return list;
 	}
+	@RequestMapping(value = "/exportList",method = RequestMethod.GET)
+	public List<Sheet> exportList(@RequestParam Integer id){
+		List<Sheet> list=sheetService.exportList(id);
+		return list;
+	}
+	
 	@RequestMapping(value = "/countList",method = RequestMethod.GET)
 	public List<Map<String, Object>> countList(@RequestParam Map<String, Object> map){
 		List<Map<String, Object>> list=sheetService.countList(map);
 		return list;
 	}
+	
+	@RequestMapping(value = "/listSheet",method = RequestMethod.GET)
+	public List<Map<String, Object>> listSheet(@RequestParam Map<String, Object> map){
+		List<Map<String, Object>> list=sheetService.listSheet(map);
+		return list;
+	}
 }
@@ -20,6 +20,8 @@ public class ArrivalInfo {
 	private String nbbm;
+	
+	private String pzh;
 	/** 站点名称 */
 	private String stopName;
@@ -243,6 +245,14 @@ public class ArrivalInfo {
 	public void setJzsj(String jzsj) {
 		this.jzsj = jzsj;
 	}
+
+	public String getPzh() {
+		return pzh;
+	}
+
+	public void setPzh(String pzh) {
+		this.pzh = pzh;
+	}
@@ -12,6 +12,8 @@ public class Changetochange {
 	@GeneratedValue
 	private Integer id;
+	private Long sId;
+	
 	private String rq;//日期
 	private String gs;//公司
@@ -171,7 +173,15 @@ public class Changetochange {
 	public void setXgr(String xgr) {
 		this.xgr = xgr;
 	}
-	
+	public Long getsId() {
+		return sId;
+	}
+
+	public void setsId(Long sId) {
+		this.sId = sId;
+	}
+	
+    
 }
@@ -105,7 +105,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> accountPx(String line,String date,String code,String xlName, String px);
-	List<SchEditInfoDto> correctForm(String line,String date,String lpName,String code, String type);
+	List<SchEditInfoDto> correctForm(String line,String date,String endDate,String lpName,String code, String type);
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
@@ -1965,7 +1965,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }*/
     @Override
-    public List<SchEditInfoDto> correctForm(String line,String date,
+    public List<SchEditInfoDto> correctForm(String line,String date,String endDate,
     		String lpName,String code, String type) {
 //        var types = {'DFTZ': '待发调整', 'FCXXWT':'发车信息微调', 'JHLB': '计划烂班', 'CXLB': '撤销烂班', 
@@ -1991,17 +1991,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          String sql = "select t1.*, "
          		+ "t2.fcsj,t2.lp_name,t2.cl_zbh,t2.j_gh,t2.j_name,"
          		+ "t2.xl_dir,t2.real_exec_date from (select * from "
-         		+ "logger_sch_modify where rq=? and line_code=? )"
+         		+ "logger_sch_modify where rq BETWEEN ? and  ? and line_code=? )"
          		+ " t1 INNER JOIN bsth_c_s_sp_info_real t2 on "
          		+ "t1.sch_id=t2.id where 1=1 " + cont;
          List<SchEditInfoDto> list = jdbcTemplate.query(sql, 
-        		 new BeanPropertyRowMapper(SchEditInfoDto.class),date, line);
+        		 new BeanPropertyRowMapper(SchEditInfoDto.class),date,endDate, line);
          List<SchEditInfoDto> lists=new ArrayList<SchEditInfoDto>();
          for (int i = 0; i < list.size(); i++) {
         	 SchEditInfoDto t=list.get(i);
         	 if(map.get(t.getType())!=null){
-        		 t.setType2(t.getTimeStr()+":"+map.get(t.getType()).toString());
+        		 t.setType2(t.getUser()+"于"+t.getTimeStr()+"进行"+map.get(t.getType()).toString()+";");
         	 }else{
         		 t.setType2("");
         	 }
@@ -2013,6 +2013,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					fage=false;
 				}
 			}
+        	 
         	 if(fage){
         		 lists.add(t);
         	 }
@@ -2030,6 +2031,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
              for (SchEditInfoDto d : lists) {
             	 Map<String, Object> tempMap = new HashMap<String, Object>();
             	 tempMap.put("lpName", d.getLpName());
+            	 tempMap.put("rq", d.getRq());
             	 tempMap.put("clZbh", d.getClZbh());
             	 tempMap.put("jName", d.getjName()+"/"+d.getjGh());
             	 tempMap.put("fcsj", d.getFcsj());
@@ -10,6 +10,7 @@ public interface SheetService extends BaseService&lt;Sheet, Integer&gt;{
 	public List<Map<String, Object>> bcPunctual(Map<String, Object> map);
 	public String  saveSheetList(String date) throws Exception;
 	public List<Map<String, Object>> countList(Map<String, Object> map);
-	
+	public List<Map<String, Object>> listSheet(Map<String, Object> map);
 	public List<Sheet> sheetList(Integer id);
+	public List<Sheet> exportList(Integer id);
 }
@@ -156,7 +156,9 @@ public class ReportServiceImpl implements ReportService{
 		while(rs.next()){
 			arr = new ArrivalInfo();
 			arr.setDeviceId(rs.getString("device_id"));
-			arr.setNbbm(BasicData.deviceId2NbbmMap.get(arr.getDeviceId()));
+			String nbbm=BasicData.deviceId2NbbmMap.get(arr.getDeviceId());
+			arr.setNbbm(nbbm);
+			arr.setPzh(BasicData.nbbmCompanyPlateMap.get(nbbm));
 			if(null == arr.getNbbm()){
 				logger.warn("未注册的设备号，" + arr.getDeviceId());
 				continue;
 package com.bsth.service.report.impl;
+import java.lang.reflect.InvocationTargetException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -42,6 +43,7 @@ import com.bsth.service.report.SheetService;
 import com.bsth.util.BatchSaveUtils;
 import com.bsth.util.ComparableChild;
 import com.bsth.util.ComparableReal;
+import com.bsth.util.ReportRelatedUtils;
 import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
 @Service
@@ -658,7 +660,8 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 			fgs=map.get("fgs").toString();
 		}
 		String date=map.get("date").toString();
-		String sql="select * from bsth_c_sheet where date='"+date+"'";
+		String endDate=map.get("endDate").toString();
+		String sql="select * from bsth_c_sheet where date BETWEEN '"+date+"' and '"+endDate+"'";
 		if(line.trim().equals("")){
 			sql +=" and gs like '%"+gs+"%' and fgs like '%"+fgs+"%'";
 		}else{
@@ -721,6 +724,7 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		String gs=BasicData.businessCodeNameMap.get(list.get(0).getGs());
 		String fgs=BasicData.businessFgsCodeNameMap.get(list.get(0).getFgs()+"_"+list.get(0).getGs());
 		String line=BasicData.lineCode2NameMap.get(list.get(0).getLine());
+		String date=list.get(0).getDate();
 		Integer id=list.get(0).getId();
 		int bcs=list.size();
 		int zdbcs=0;
@@ -740,6 +744,7 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		map.put("zdbcs", zdbcs);
 		map.put("zdlv", df.format(zdlv)+"%");
 		map.put("id", id);
+		map.put("date", date);
 		return map;
 	}
 	@Override
@@ -781,6 +786,128 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		return list;
 	}
+	@Override
+	public List<Sheet> exportList(Integer id) {
+		// TODO Auto-generated method stub
+		 ReportRelatedUtils rru = new ReportRelatedUtils();
+		Sheet sheet=sheetRepository.findOne(id);
+		String sql="select * from bsth_c_sheet where date='"+sheet.getDate()+"' and line = '"+sheet.getLine()+"'"
+				+ " order by xl_dir,jhsj";
+		
+		List<Sheet> list=jdbcTemplate.query(sql, 
+				 new RowMapper<Sheet>(){
+			 @Override 
+			 public Sheet mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 Sheet s=new Sheet();
+				 s.setId(rs.getInt("id"));
+				 s.setGs(rs.getString("gs"));
+				 s.setFgs(rs.getString("fgs"));
+				 s.setLine(rs.getString("line"));
+				 s.setDate(rs.getString("date"));
+				 s.setJhsj(rs.getString("jhsj"));
+				 s.setJhsjt(rs.getLong("jhsjt"));
+				 s.setSjsj(rs.getString("sjsj"));
+				 s.setSjsjt(rs.getLong("sjsjt"));
+				 s.setZdname(rs.getString("zdname"));
+				 return s;
+			 }
+		});
+		
+		List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
+		for (int i = 0; i < list.size(); i++) {
+			Sheet t=list.get(i);
+			t.setLine(BasicData.lineCode2NameMap.get(t.getLine()));
+			Long sjc=t.getJhsjt()-t.getSjsjt();
+			if(sjc>= 3*60*1000*-1 && sjc <=1*60*1000){
+				t.setSfzd("准点");
+			}else{
+				t.setSfzd("不准点");
+			}
+			
+			try {
+				Map<String, Object> map = rru.getMapValue(t);
+				listMap.add(map);
+			} catch (ClassNotFoundException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (IllegalAccessException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (InvocationTargetException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (NoSuchMethodException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (NoSuchFieldException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			
+		}
+		
+		return list;
+	}
+	@Override
+	public List<Map<String, Object>> listSheet(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<Map<String, Object>> listmap=new ArrayList<Map<String,Object>>();
+		Integer id=Integer.parseInt(map.get("id").toString());
+		Sheet sheet=sheetRepository.findOne(id);
+		String date=map.get("date").toString();
+		String endDate=map.get("endDate").toString();
+		
+		String sqlByDate="select date from bsth_c_sheet where date BETWEEN '"+date+"' and '"+endDate+"'"
+				+ "and line = '"+sheet.getLine()+"' group by date order by date";
+		
+		List<String> dateList=jdbcTemplate.query(sqlByDate, 
+				 new RowMapper<String>(){
+			 @Override 
+			 public String mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 String date=rs.getString("date");
+				 
+				 return date;
+			 }
+		});
+		
+		String sql="select * from bsth_c_sheet where date BETWEEN '"+date+"' and '"+endDate+"'"
+				+ " and line ='"+sheet.getLine()+"' order by date";
+		
+		List<Sheet> list=jdbcTemplate.query(sql, 
+				 new RowMapper<Sheet>(){
+			 @Override 
+			 public Sheet mapRow(ResultSet rs, int rowNum) throws SQLException { 
+				 Sheet s=new Sheet();
+				 s.setGs(rs.getString("gs"));
+				 s.setFgs(rs.getString("fgs"));
+				 s.setLine(rs.getString("line"));
+				 s.setDate(rs.getString("date"));
+				 s.setJhsj(rs.getString("jhsj"));
+				 s.setJhsjt(rs.getLong("jhsjt"));
+				 s.setSjsj(rs.getString("sjsj"));
+				 s.setSjsjt(rs.getLong("sjsjt"));
+				 s.setId(rs.getInt("id"));
+				 return s;
+			 }
+		});
+		for (int i = 0; i < dateList.size(); i++) {
+			String s=dateList.get(i);
+			List<Sheet> newList=new ArrayList<Sheet>();
+			for (int j = 0; j < list.size(); j++) {
+				Sheet t=list.get(j);
+				if(t.getDate().equals(s)){
+					newList.add(t);
+				}
+			}
+			
+			if(newList.size()>0){
+				  Map<String, Object> newmap=culateByLine(newList);
+				  listmap.add(newmap);
+			}
+		}
+		return listmap;
+	}
+	
 }
  class ComparableAcual implements Comparator<ScheduleRealInfo>{
-package com.bsth.service.traffic;
-
-/**
- * 运管处基础数据操作接口类
- * Created by zlz on 2017/6/16.
- */
-public interface YgcBasicDataService {
-    /**
-     * 更新运管处基础数据
-     */
-    void updateYgcBasicData();
-}
-
+package com.bsth.service.traffic;
+
+/**
+ * 运管处基础数据操作接口类
+ * Created by zlz on 2017/6/16.
+ */
+public interface YgcBasicDataService {
+    /**
+     * 更新运管处基础数据
+     */
+    void updateYgcBasicData();
+}
+
-package com.bsth.service.traffic.impl;
-
-import com.bsth.service.impl.TrafficManageServiceImpl;
-import com.bsth.service.traffic.YgcBasicDataService;
-import com.bsth.util.db.DBUtils_oldSystem;
-import org.apache.axiom.om.*;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-import javax.activation.DataHandler;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.*;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
-
-/**
- * 运管处基础数据操作类
- * Created by zq on 2017/6/15.
- */
-@Service
-public class YgcBasicDataServiceImpl implements YgcBasicDataService{
-    Logger logger = LoggerFactory.getLogger(TrafficManageServiceImpl.class);
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    private static String IP = "218.242.195.76:9091";
-    private static String targetEndpoint = "http://" + IP +"/ygc.TransManager.Basicdown?wsdl";
-    private static String namespace = "http://service.shygc.com";
-    private static String userName = "admin";
-    private static String passWord = "000000";
-    private static EndpointReference targetEPR;
-    {
-        try {
-            targetEPR = new EndpointReference(targetEndpoint);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 更新运管处基础数据
-     */
-    public void updateYgcBasicData(){
-        String saveFile = "ygcBasicData.zip";
-        String flag = "failure";
-        try {
-            // 调用接口下载基础数据
-            if(download(userName, DigestUtils.md5Hex(passWord), saveFile)){
-                // 读取基础数据zip
-                StringBuffer sb = readZipFile(saveFile);
-                // 解析xml
-                List<HashMap<String,String>> result = parseXml(sb);
-                // 插入数据库
-                if(result != null && result.size() > 0){
-                    insertRecord(result);
-                }
-            }
-            flag = "success";
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        finally {
-            // 删除文件
-            File fill = new File(saveFile);
-            logger.info("updateYgcBasicData:"+fill.getAbsolutePath());
-            logger.info("updateYgcBasicData:"+flag);
-            if(fill.exists()){
-                fill.delete();
-            }
-        }
-    }
-    /**
-     *  下载基础数据，并生成rar文件
-     * @param userName
-     * @param password
-     * @param saveFile
-     * @return
-     */
-    private boolean download(String userName, String password,  String saveFile)
-    {
-        try
-        {
-            OMElement data = buildDownloadEnvelope(userName, password);
-            ServiceClient sender = new ServiceClient();
-            Options options = sender.getOptions();
-            options.setProperty("SO_TIMEOUT", Integer.valueOf(1800000));
-            options.setTo(targetEPR);
-            sender.setOptions(options);
-            System.out.println("The data in method download: " + data);
-            data.build();
-            OMElement ome = sender.sendReceive(data);
-
-            OMText binaryNode = (OMText)ome.getFirstOMChild();
-            binaryNode.setOptimize(true);
-            DataHandler actualDH = (DataHandler)binaryNode.getDataHandler();
-            FileOutputStream imageOutStream = new FileOutputStream(saveFile);
-            InputStream is = actualDH.getInputStream();
-            int read ;
-            byte[] buffer = new byte[1024];
-            while ((read = is.read(buffer)) != -1) {
-                imageOutStream.write(buffer, 0, read);
-            }
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }return false;
-    }
-
-    /**
-     * 构建webservice接口参数
-     * @param userName
-     * @param password
-     * @return
-     */
-    private OMElement buildDownloadEnvelope(String userName, String password)
-    {
-        OMFactory fac = OMAbstractFactory.getOMFactory();
-        OMNamespace omNs = fac.createOMNamespace(namespace,
-                "ser");
-        OMElement data = fac.createOMElement("downloadAllDataFile", omNs);
-        OMElement _userName = fac.createOMElement("userName", omNs);
-        _userName.setText(userName);
-        OMElement _passWord = fac.createOMElement("passWord", omNs);
-        _passWord.setText(String.valueOf(password));
-
-        data.addChild(_userName);
-        data.addChild(_passWord);
-
-        OMElement soap = fac.createOMElement("downloadAllDataFile", omNs);
-        soap.addChild(data);
-        return soap;
-    }
-
-    /**
-     * 读取zip文件的内容
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    public StringBuffer readZipFile(String file) throws Exception {
-        ZipFile zf = new ZipFile(file);
-        InputStream in = new BufferedInputStream(new FileInputStream(file));
-        ZipInputStream zin = new ZipInputStream(in);
-        ZipEntry ze;
-        StringBuffer sb = new StringBuffer();
-        while ((ze = zin.getNextEntry()) != null) {
-            System.out.print(ze);
-            if (ze.isDirectory()) {
-            } else {
-                System.err.println("file - " + ze.getName() + " : "
-                        + ze.getSize() + " bytes");
-                long size = ze.getSize();
-                if (size > 0) {
-                    BufferedReader br = new BufferedReader(
-                            new InputStreamReader(zf.getInputStream(ze),"GBK"));
-                    String line;
-                    boolean addFlag = false;
-                    while ((line = br.readLine()) != null) {
-                        if(line.indexOf("BusLineList") != -1){
-                            addFlag = true;
-                        }
-                        if(addFlag){
-                            sb.append(line);
-                        }
-
-                        if(line.indexOf("/BusLineList") != -1){
-                            break;
-                        }
-                    }
-                    br.close();
-                }
-            }
-        }
-        zin.closeEntry();
-        return  sb;
-    }
-
-    /**
-     * 解析xml
-     * @param sb
-     */
-    private List<HashMap<String,String>> parseXml(StringBuffer sb){
-        List<HashMap<String,String>> list = new ArrayList<>();
-        HashMap<String,String> map;
-        try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            Document doc = builder.parse(new ByteArrayInputStream(sb.toString().getBytes()));
-            NodeList nl = doc.getElementsByTagName("BusLine");
-            String lineName; //线路名称
-            String lineId; // 线路ID
-            String abbreviation ; // 公司名称
-            String ddfs ; // 调度方式
-            String lineStandardCode; // 上海市线路编码
-            String parentUnitName ; // 总公司
-            for (int i = 0; i < nl.getLength(); i++) {
-                parentUnitName = doc.getElementsByTagName("ParentUnitName").item(i).getFirstChild() == null ?"":
-                        doc.getElementsByTagName("ParentUnitName").item(i).getFirstChild().getNodeValue();
-                if(parentUnitName.indexOf("浦东") != -1){// 只查找浦东的数据
-                    lineName = doc.getElementsByTagName("LineName").item(i).getFirstChild() == null ?"":
-                            doc.getElementsByTagName("LineName").item(i).getFirstChild().getNodeValue();
-                    lineId = doc.getElementsByTagName("LineId").item(i).getFirstChild() == null ?"":
-                            doc.getElementsByTagName("LineId").item(i).getFirstChild().getNodeValue();
-                    abbreviation = doc.getElementsByTagName("Abbreviation").item(i).getFirstChild() == null ?"":
-                            doc.getElementsByTagName("Abbreviation").item(i).getFirstChild().getNodeValue();
-                    ddfs = doc.getElementsByTagName("DDFS").item(i).getFirstChild() == null ?"":
-                            doc.getElementsByTagName("DDFS").item(i).getFirstChild().getNodeValue();
-                    lineStandardCode = doc.getElementsByTagName("LineStandardCode").item(i).getFirstChild() == null ?"":
-                            doc.getElementsByTagName("LineStandardCode").item(i).getFirstChild().getNodeValue();
-                    map = new HashMap<>();
-                    map.put("lineName",lineName);
-                    map.put("lineId",lineId);
-                    map.put("abbreviation",abbreviation);
-                    map.put("ddfs",ddfs);
-                    map.put("lineStandardCode",lineStandardCode);
-                    list.add(map);
-                }
-            }
-        }catch (Exception e){
-            e.printStackTrace();;
-        }
-        return list;
-    }
-
-    /**
-     * 批量插入用法
-     * @param list
-     */
-    public boolean insertRecord(List<HashMap<String,String>> list)
-    {
-        boolean flag = false;
-        final List<HashMap<String,String>> tempList=list;
-        String sql="INSERT INTO JJWGPS_T_SHSXLFILE(XLID,SHSXLBM,XLMC,GSMC,DDFS,CREATETIME,XLMC_ALL) VALUES (?,?,?,?,?,SYSDATE,?)";
-        jdbcTemplate = new JdbcTemplate(DBUtils_oldSystem.getDataSource());
-        jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter()
-        {
-            public void setValues(PreparedStatement ps, int i)throws SQLException
-            {
-                String lineId =tempList.get(i).get("lineId");
-                String lineStandardCode =tempList.get(i).get("lineStandardCode");
-                String lineName =tempList.get(i).get("lineName");
-                String abbreviation =tempList.get(i).get("abbreviation");
-                String ddfs =tempList.get(i).get("ddfs");
-                String lineNameAll = lineName;
-                if(ddfs.equals("2")){
-                    lineNameAll = lineName+"区间（走向部分在全程线路之外）";
-                }else if(ddfs.equals("7")){
-                    lineNameAll = lineName+"区间（走向在全程线路之内）";
-                }
-                ps.setString(1, lineId);
-                ps.setString(2, lineStandardCode);
-                ps.setString(3, lineName);
-                ps.setString(4, abbreviation);
-                ps.setString(5, ddfs);
-                ps.setString(6, lineNameAll);
-            }
-            public int getBatchSize()
-            {
-                return tempList.size();
-            }
-        });
-        flag = true;
-        return flag;
-    }
-}
+package com.bsth.service.traffic.impl;
+
+import com.bsth.service.impl.TrafficManageServiceImpl;
+import com.bsth.service.traffic.YgcBasicDataService;
+import com.bsth.util.db.DBUtils_oldSystem;
+import org.apache.axiom.om.*;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.client.ServiceClient;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+import javax.activation.DataHandler;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+
+/**
+ * 运管处基础数据操作类
+ * Created by zq on 2017/6/15.
+ */
+@Service
+public class YgcBasicDataServiceImpl implements YgcBasicDataService{
+    Logger logger = LoggerFactory.getLogger(TrafficManageServiceImpl.class);
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    private static String IP = "218.242.195.76:9091";
+    private static String targetEndpoint = "http://" + IP +"/ygc.TransManager.Basicdown?wsdl";
+    private static String namespace = "http://service.shygc.com";
+    private static String userName = "admin";
+    private static String passWord = "000000";
+    private static EndpointReference targetEPR;
+    {
+        try {
+            targetEPR = new EndpointReference(targetEndpoint);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 更新运管处基础数据
+     */
+    public void updateYgcBasicData(){
+        String saveFile = "ygcBasicData.zip";
+        String flag = "failure";
+        try {
+            // 调用接口下载基础数据
+            if(download(userName, DigestUtils.md5Hex(passWord), saveFile)){
+                // 读取基础数据zip
+                StringBuffer sb = readZipFile(saveFile);
+                // 解析xml
+                List<HashMap<String,String>> result = parseXml(sb);
+                // 插入数据库
+                if(result != null && result.size() > 0){
+                    insertRecord(result);
+                }
+            }
+            flag = "success";
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        finally {
+            // 删除文件
+            File fill = new File(saveFile);
+            logger.info("updateYgcBasicData:"+fill.getAbsolutePath());
+            logger.info("updateYgcBasicData:"+flag);
+            if(fill.exists()){
+                fill.delete();
+            }
+        }
+    }
+    /**
+     *  下载基础数据，并生成rar文件
+     * @param userName
+     * @param password
+     * @param saveFile
+     * @return
+     */
+    private boolean download(String userName, String password,  String saveFile)
+    {
+        try
+        {
+            OMElement data = buildDownloadEnvelope(userName, password);
+            ServiceClient sender = new ServiceClient();
+            Options options = sender.getOptions();
+            options.setProperty("SO_TIMEOUT", Integer.valueOf(1800000));
+            options.setTo(targetEPR);
+            sender.setOptions(options);
+            System.out.println("The data in method download: " + data);
+            data.build();
+            OMElement ome = sender.sendReceive(data);
+
+            OMText binaryNode = (OMText)ome.getFirstOMChild();
+            binaryNode.setOptimize(true);
+            DataHandler actualDH = (DataHandler)binaryNode.getDataHandler();
+            FileOutputStream imageOutStream = new FileOutputStream(saveFile);
+            InputStream is = actualDH.getInputStream();
+            int read ;
+            byte[] buffer = new byte[1024];
+            while ((read = is.read(buffer)) != -1) {
+                imageOutStream.write(buffer, 0, read);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }return false;
+    }
+
+    /**
+     * 构建webservice接口参数
+     * @param userName
+     * @param password
+     * @return
+     */
+    private OMElement buildDownloadEnvelope(String userName, String password)
+    {
+        OMFactory fac = OMAbstractFactory.getOMFactory();
+        OMNamespace omNs = fac.createOMNamespace(namespace,
+                "ser");
+        OMElement data = fac.createOMElement("downloadAllDataFile", omNs);
+        OMElement _userName = fac.createOMElement("userName", omNs);
+        _userName.setText(userName);
+        OMElement _passWord = fac.createOMElement("passWord", omNs);
+        _passWord.setText(String.valueOf(password));
+
+        data.addChild(_userName);
+        data.addChild(_passWord);
+
+        OMElement soap = fac.createOMElement("downloadAllDataFile", omNs);
+        soap.addChild(data);
+        return soap;
+    }
+
+    /**
+     * 读取zip文件的内容
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    public StringBuffer readZipFile(String file) throws Exception {
+        ZipFile zf = new ZipFile(file);
+        InputStream in = new BufferedInputStream(new FileInputStream(file));
+        ZipInputStream zin = new ZipInputStream(in);
+        ZipEntry ze;
+        StringBuffer sb = new StringBuffer();
+        while ((ze = zin.getNextEntry()) != null) {
+            System.out.print(ze);
+            if (ze.isDirectory()) {
+            } else {
+                System.err.println("file - " + ze.getName() + " : "
+                        + ze.getSize() + " bytes");
+                long size = ze.getSize();
+                if (size > 0) {
+                    BufferedReader br = new BufferedReader(
+                            new InputStreamReader(zf.getInputStream(ze),"GBK"));
+                    String line;
+                    boolean addFlag = false;
+                    while ((line = br.readLine()) != null) {
+                        if(line.indexOf("BusLineList") != -1){
+                            addFlag = true;
+                        }
+                        if(addFlag){
+                            sb.append(line);
+                        }
+
+                        if(line.indexOf("/BusLineList") != -1){
+                            break;
+                        }
+                    }
+                    br.close();
+                }
+            }
+        }
+        zin.closeEntry();
+        return  sb;
+    }
+
+    /**
+     * 解析xml
+     * @param sb
+     */
+    private List<HashMap<String,String>> parseXml(StringBuffer sb){
+        List<HashMap<String,String>> list = new ArrayList<>();
+        HashMap<String,String> map;
+        try {
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            Document doc = builder.parse(new ByteArrayInputStream(sb.toString().getBytes()));
+            NodeList nl = doc.getElementsByTagName("BusLine");
+            String lineName; //线路名称
+            String lineId; // 线路ID
+            String abbreviation ; // 公司名称
+            String ddfs ; // 调度方式
+            String lineStandardCode; // 上海市线路编码
+            String parentUnitName ; // 总公司
+            for (int i = 0; i < nl.getLength(); i++) {
+                parentUnitName = doc.getElementsByTagName("ParentUnitName").item(i).getFirstChild() == null ?"":
+                        doc.getElementsByTagName("ParentUnitName").item(i).getFirstChild().getNodeValue();
+                if(parentUnitName.indexOf("浦东") != -1){// 只查找浦东的数据
+                    lineName = doc.getElementsByTagName("LineName").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("LineName").item(i).getFirstChild().getNodeValue();
+                    lineId = doc.getElementsByTagName("LineId").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("LineId").item(i).getFirstChild().getNodeValue();
+                    abbreviation = doc.getElementsByTagName("Abbreviation").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("Abbreviation").item(i).getFirstChild().getNodeValue();
+                    ddfs = doc.getElementsByTagName("DDFS").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("DDFS").item(i).getFirstChild().getNodeValue();
+                    lineStandardCode = doc.getElementsByTagName("LineStandardCode").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("LineStandardCode").item(i).getFirstChild().getNodeValue();
+                    map = new HashMap<>();
+                    map.put("lineName",lineName);
+                    map.put("lineId",lineId);
+                    map.put("abbreviation",abbreviation);
+                    map.put("ddfs",ddfs);
+                    map.put("lineStandardCode",lineStandardCode);
+                    list.add(map);
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();;
+        }
+        return list;
+    }
+
+    /**
+     * 批量插入用法
+     * @param list
+     */
+    public boolean insertRecord(List<HashMap<String,String>> list)
+    {
+        boolean flag = false;
+        final List<HashMap<String,String>> tempList=list;
+        String sql="INSERT INTO JJWGPS_T_SHSXLFILE(XLID,SHSXLBM,XLMC,GSMC,DDFS,CREATETIME,XLMC_ALL) VALUES (?,?,?,?,?,SYSDATE,?)";
+        jdbcTemplate = new JdbcTemplate(DBUtils_oldSystem.getDataSource());
+        jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter()
+        {
+            public void setValues(PreparedStatement ps, int i)throws SQLException
+            {
+                String lineId =tempList.get(i).get("lineId");
+                String lineStandardCode =tempList.get(i).get("lineStandardCode");
+                String lineName =tempList.get(i).get("lineName");
+                String abbreviation =tempList.get(i).get("abbreviation");
+                String ddfs =tempList.get(i).get("ddfs");
+                String lineNameAll = lineName;
+                if(ddfs.equals("2")){
+                    lineNameAll = lineName+"区间（走向部分在全程线路之外）";
+                }else if(ddfs.equals("7")){
+                    lineNameAll = lineName+"区间（走向在全程线路之内）";
+                }
+                ps.setString(1, lineId);
+                ps.setString(2, lineStandardCode);
+                ps.setString(3, lineName);
+                ps.setString(4, abbreviation);
+                ps.setString(5, ddfs);
+                ps.setString(6, lineNameAll);
+            }
+            public int getBatchSize()
+            {
+                return tempList.size();
+            }
+        });
+        flag = true;
+        return flag;
+    }
+}
@@ -32,13 +32,13 @@
                         <select class="form-control" name="line" id="line" style="width: 136px;"></select>
                     </div>
                     <div style="display: inline-block;margin-left: 15px;">
-                        <span class="item-label" style="width: 80px;">时间: </span>
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 120px;"/>
                     </div>
-<!--                     <div style="display: inline-block;margin-left: 15px;"> -->
-<!--                         <span class="item-label" style="width: 80px;">结束时间: </span> -->
-<!--                         <input class="form-control" type="text" id="endDate" style="width: 120px;"/> -->
-<!--                     </div> -->
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 120px;"/>
+                    </div>
                     <div style="display: inline-block;margin-left: 15px">
                         <span class="item-label" style="width: 140px;">路牌： </span>
                         <select class="form-control" name="lpName" id="lpName" style="width: 136px;"></select>
@@ -59,10 +59,11 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="6">营运车辆修正统计表</th>
+								<th colspan="7">营运车辆修正统计表</th>
 							</tr>
 							<tr>
 								<td>编号</td>
+								<td>日期</td>
 								<td>路牌</td>
 								<td>车号</td>
 								<td>司机</td>
@@ -96,6 +97,10 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -105,6 +110,7 @@
 		if(day < 10)
 			day = "0" + day;
 		$("#date").val(year + "-" + month + "-" + day);
+		$("#endDate").val(year + "-" + month + "-" + day);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -197,16 +203,18 @@
         });
 	    var line = $("#line").val();
-	    var date = $("#startDate").val();
+	    var date = $("#date").val();endDate
 	    var lpName = $("#lpName").val();
+	    var endDate = $("#endDate").val();
 	    var code = $("#code").val();
 		$("#query").on("click",function(){
 		    line = $("#line").val();
 		    date = $("#date").val();
 		    lpName = $("#lpName").val();
 		    code = $("#code").val();
+		    endDate = $("#endDate").val();
 		    var type = "query";
-		    $get("/realSchedule/correctForm",{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
+		    $get("/realSchedule/correctForm",{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
 		        var list_correctForm = template('list_correctForm',{list:result});
                 // 把渲染好的模版html文本追加到表格中
                 $('#forms .list_correctForm').html(list_correctForm);
@@ -224,7 +232,7 @@
 		$("#export").on("click",function(){
 			var type = "export";
-			$get('/realSchedule/correctForm',{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
+			$get('/realSchedule/correctForm',{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
 				window.open("/downloadFile/download?fileName=修正报表"+date);
 			});
 		});
@@ -234,7 +242,8 @@
 <script type="text/html" id="list_correctForm">
 	{{each list as obj i}}
 		<tr>
-			<td>{{i+1}}</td>
+			<td>{{i+1}}</td>
+			<td>{{obj.rq}}</td>
 			<td>{{obj.lpName}}</td>
 			<td>{{obj.clZbh}}</td>
 			<td>{{obj.jName}}/{{obj.jGh}}</td>
@@ -244,7 +253,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -173,7 +173,7 @@
 				<div class="row">
 					<div class="col-md-offset-3 col-md-4">
 						<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
-						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
+						<a type="button" class="btn default" href="list_ph.html" data-pjax><i class="fa fa-times"></i> 取消</a>
 					</div>
 				</div>
 			</div>
@@ -31,7 +31,7 @@
 						<div style="display: inline-block;margin-left: 15px;">
 							<input   class="item-label"  type="radio" name="typeLx"  checked="checked" value="1" />
 							班次执行情况   
-							<input  class="item-label"  type="radio" name="typeLX" value="2" />
+							<input  class="item-label"  type="radio" name="typeLx" value="2" />
 							车辆/站点 
 						</div>
 						<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
@@ -116,16 +116,17 @@
 							<thead>
 								<tr>
 									<td width="3%"></td>
-									<td width="9%">内部编码</td>
-									<td width="8%">到站名称</td>
-									<td width="8%">到站时刻</td>
-									<td width="8%">离站时刻</td>
-									<td width="8%">是否开关门</td>
-									<td width="8%">上下行</td>
+									<td width="8%">内部编码</td>
+									<td width="8%">牌照号</td>
+									<td width="7%">到站名称</td>
+									<td width="7%">到站时刻</td>
+									<td width="7%">离站时刻</td>
+									<td width="7%">是否开关门</td>
+									<td width="7%">上下行</td>
 									<td width="8%">开门速度(公里/小时)</td>
-									<td width="8%">补发</td>
-									<td width="8%">刷卡次数</td>
-									<td width="8%">刷卡金额</td>
+									<td width="7%">补发</td>
+									<td width="7%">刷卡次数</td>
+									<td width="7%">刷卡金额</td>
 									<td width="8%">免费刷卡次数</td>
 									<td width="8%">免费刷卡金额</td>
 								</tr>
@@ -497,6 +498,7 @@
 		<tr>
 			<td>{{i+1}}</td>
 			<td>{{obj.nbbm}}</td>
+			<td>{{obj.pzh}}</td>
 			<td>{{obj.stopName}}</td>
 			<td>{{obj.jzsj}}</td>
 			<td>{{obj.czsj}}</td>
@@ -18,7 +18,7 @@
 <div class="page-head">
 	<div class="page-title" style="margin-left: 20px">
-		<button>数据导出</button>
+		<button id="exportList">数据导出</button>
 	</div>
 </div>
@@ -27,7 +27,7 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-body">
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 600px">
-					<table class="table table-bordered table-hover table-checkable" id="forms_1">
+					<table class="table table-bordered table-hover table-checkable" id="forms_2">
 						<thead>
 							<tr>
 								<td></td>
@@ -40,7 +40,7 @@
 							</tr>
 						</thead>
-						<tbody >
+						<tbody>
 						</tbody>
 					</table>
@@ -55,32 +55,28 @@
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		
+		var no="";
 		 $("#sheetList").on('init', function (e, id) {
+			 no=id;
 			 $get('/sheet/sheetList',{id:id},function(result){
-					var sheetList_1 = template('sheetList_1',{list:result});
-					$('#forms_1 tbody').html(sheetList_1);
+					var sheetList_2 = template('sheetList_2',{list:result});
+					$('#forms_2 tbody').html(sheetList_2);
 				});
 		 })
-		/* $("#query").on('click',function(){
-			var line = $("#line").val();
-			var date = $("#date").val();
-			var fgs=$('#fgsdm').val();
-			var gs=$('#gsdm').val();
-			   $get('/sheet/countList',{line:line,date:date,gs:gs,fgs:fgs},function(result){
-				var sheetList = template('sheetList',{list:result});
-				$('#forms tbody').html(sheetList);
-				$('.btn-sheetList').on('click', openSheetList);
-			});  
-		}); */
+		 $("#exportList").on('click',function(){
+			
+			 $get('/sheet/exportList',params,function(result){
+					window.open("/downloadFile/download?fileName=班次车辆人员月报表"+moment($("#startDate").val()).format("YYYYMMDD"));
+				});
+		}); 
 	});
 </script>
-<script type="text/html" id="sheetList_1">
+<script type="text/html" id="sheetList_2">
 	{{each list as obj i}}
 		<tr {{if obj.sfzd!="Y"}}style="color: red" {{/if}}>
-		<td>{{i}}</td>
+		<td>{{i+1}}</td>
 		<td>{{obj.date}}</td>
 		<td>{{obj.line}}</td>
 		<td>{{obj.zdname}}</td>
@@ -35,14 +35,20 @@
 							<span class="item-label" style="width: 80px;">分公司: </span>
 							<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
 						</div>
-					<div style="display: inline-block;margin-left: 15px;">
+						<div style="margin-top: 10px">
+                    </div>
+					<div style="display: inline-block;margin-left: 33px;">
                     	 <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
                     </div>
 					<div style="display: inline-block;">
-                        <span class="item-label" style="width: 80px;">时间: </span>
+                        <span class="item-label" style="width: 80px;margin-left: 24px;">开始时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 180px;"/>
                     </div>
+                    <div style="display: inline-block;">
+                        <span class="item-label" style="width: 80px;margin-left: 24px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 180px;"/>
+                    </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
@@ -65,7 +71,28 @@
 							</tr>
 						</thead>
-						<tbody >
+						<tbody>
+							
+						</tbody>
+					</table>
+				</div>
+				
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms_1">
+						<thead>
+							<tr class="hidden">
+								<td>公司</td>
+								<td>分公司</td>
+								<td>日期</td>
+								<td>线路</td>
+								<td>班次数</td>
+								<td>准点班次数</td>
+								<td>准点率</td>
+								<td>查看</td>
+							</tr>
+						</thead>
+						
+						<tbody>
 						</tbody>
 					</table>
@@ -85,6 +112,10 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -93,8 +124,10 @@
 			day = "0"+day;
 		if(month > 9){
 			$("#date").val(year + "-" + month + "-" + day);
+			$("#endDate").val(year + "-" + month + "-" + day);
 		} else {
 			$("#date").val(year + "-0" + month + "-" + day);
+			$("#endDate").val(year + "-" + month + "-" + day);
 		}
 		var fage=false;
@@ -172,19 +205,34 @@
 		$("#query").on('click',function(){
 			var line = $("#line").val();
 			var date = $("#date").val();
+			var endDate = $("#endDate").val();
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
-			   $get('/sheet/countList',{line:line,date:date,gs:gs,fgs:fgs},function(result){
+			   $get('/sheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs},function(result){
 				var sheetList = template('sheetList',{list:result});
 				$('#forms tbody').html(sheetList);
-				$('.btn-sheetList').on('click', openSheetList);
+				$('.btn-sheetList').on('click', showSheetList);
 			});   
 // 			 $post('/sheet/saveListSheet',function(result){
 // 			}); 
 		});
-		
+		function showSheetList(){
+			var id = $(this).data('id');
+			var date = $("#date").val();
+			var endDate = $("#endDate").val();
+			$get('/sheet/listSheet',{id:id,date:date,endDate:endDate},function(result){
+				var sheetList = template('sheetList_1',{list:result});
+				
+				$('#forms_1 tbody').html(sheetList);
+				$('.btn-sheetList_1').on('click', openSheetList);
+				$("#forms_1 .hidden").removeClass("hidden");
+				$("html,body").animate({scrollTop:$("#forms_1").offset().top},1000);
+				
+			});
+		}
 		function openSheetList(){
 			var id = $(this).data('id');
+			console.log(id);
 			$.get('/pages/report/sheet/list.html', function (content) {
 				layer.open({
 					type: 1,
@@ -221,4 +269,27 @@
 			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
+</script>
+
+<script type="text/html" id="sheetList_1">
+	{{each list as obj i}}
+		<tr>
+		<td>{{obj.gs}}</td>
+		<td>{{obj.fgs}}</td>
+		<td>{{obj.date}}</td>
+		<td>{{obj.line}}</td>
+		<td>{{obj.bcs}}</td>
+		<td>{{obj.zdbcs}}</td>
+		<td>{{obj.zdlv}}</td>
+		<td>
+			<button type="button" class="btn btn-sm blue btn-sheetList_1" 
+			data-id="{{obj.id}}">详细</button>
+		</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
 </script>
 \ No newline at end of file