Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 4a899e2a 27c32c2e
Showing 10 changed files with 232 additions and 114 deletions
src/main/java/com/bsth/controller/report/SheetController.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/repository/sheet/SheetRepository.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.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/SheetServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
@@ -19,10 +19,10 @@ public class SheetController  extends BaseController&lt;Sheet, Integer&gt;{
 	@Autowired
 	SheetService sheetService;
 	@RequestMapping(value = "/saveListSheet",method = RequestMethod.POST)
-	public String saveListSheet(){
+	public String saveListSheet(@RequestParam String date){
 		String result="";
 		try {
-			result = sheetService.saveSheetList();
+			result = sheetService.saveSheetList(date);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -34,7 +34,7 @@ public class CalcOilThread extends Thread{
             dlbService.obtainDsq();
             logger.info("计算路单里程加注量结束！");
             logger.info("开始计算班次准点率....");
-            sheetService.saveSheetList();
+            sheetService.saveSheetList("");
             logger.info("计算班次准点率结束！");
             //清除安全驾驶数据 先临时蹭这个线程
             SafeDrivCenter.clear();
@@ -81,7 +81,8 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 			+ " and nbbm like %?5%",nativeQuery=true)
 	List<Object[]> sumDlb2(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
-	
+	@Transactional
+    @Modifying
 	@Query(value="UPDATE bsth_c_dlb SET " +
 				" czcd= ?2,"+
 				" jzcd = ?3, " +
@@ -2,6 +2,8 @@ package com.bsth.repository.sheet;
 import com.bsth.entity.sheet.Sheet;
 import com.bsth.repository.BaseRepository;
+
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 /**
@@ -9,4 +11,6 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface SheetRepository extends BaseRepository<Sheet, Integer>{
+	@Query(value = "select count(*) from Sheet s where s.date = ?1")
+	int countByDate(String date);
 }
@@ -559,8 +559,9 @@ public class FormsServiceImpl implements FormsService {
 				return sin;
 			}
 		});
-		
+		 DecimalFormat df = new DecimalFormat("0.00");
 		List<Ylb> listYlb= ylbRepository.obtainYl(startDate, gsdm, fgsdm, xlbm, "", "xlbm");
+		List<Dlb> listDlb= dlbRepository.obtainDl(startDate, gsdm, fgsdm, xlbm, "", "xlbm");
 		List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLine(xlbm, startDate);
 		for (int i = 0; i < list.size(); i++) {
 			List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
@@ -569,10 +570,12 @@ public class FormsServiceImpl implements FormsService {
 			String jsy=sin.getJsy();
 			String clzbh=sin.getClzbh();
 			String xl=sin.getxL();
+			String spy=sin.getSgh();
 			sin.setxL(BasicData.lineCode2NameMap.get(xl));
 			for (int j = 0; j < listReal.size(); j++) {
 				ScheduleRealInfo s=listReal.get(j);
-				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)&&s.getXlBm().equals(xl)){
+				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
+						&&s.getXlBm().equals(xl)&&s.getsGh().equals(spy)){
 					newList.add(s);
 				}
 			}
@@ -584,23 +587,39 @@ public class FormsServiceImpl implements FormsService {
 			double jcgl=culateMileageService.culateJccgl(newList);
 			double zyygl=Arith.add(yygl, ljgl);
 			double zksgl=Arith.add(ksgl, jcgl);
+			double zlc=Arith.add(zyygl,zksgl);
 			sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
 			sin.setEmptMileage(String.valueOf(zksgl));
 			sin.setJhjl(String.valueOf(jhgl));
 			double yhl=0.0;
 			double jzl=0.0;
 			double fyy=0.0;
+			double zlcs=0.0;
 			for (int j = 0; j < listYlb.size(); j++) {
 				Ylb y=listYlb.get(j);
 				if(y.getJsy().equals(jsy) && y.getNbbm().equals(clzbh)){
 					yhl=Arith.add(yhl, y.getYh()==null?0:y.getYh());
 					jzl=Arith.add(jzl, y.getJzl()==null?0:y.getJzl());
 					fyy=Arith.add(fyy, y.getSh()==null?0:y.getSh());
+					zlcs=Arith.add(zlcs, y.getZlc()==null?0:y.getZlc());
 				}
 			}
-			sin.setHyl(String.valueOf(yhl));
-			sin.setJzl(String.valueOf(jzl));
-			sin.setUnyyyl(String.valueOf(fyy));
+			
+			for(int j=0;j<listDlb.size();j++){
+				Dlb d=listDlb.get(j);
+				if(d.getJsy().equals(jsy)&&d.getNbbm().equals(clzbh)){
+					yhl=Arith.add(yhl, d.getHd()==null?0:d.getHd());
+					jzl=Arith.add(jzl, d.getCdl()==null?0:d.getCdl());
+					fyy=Arith.add(fyy, d.getSh()==null?0:d.getSh());
+					zlcs=Arith.add(zlcs, d.getZlc()==null?0:d.getZlc());
+				}
+			}
+			if(zlcs>0){
+			double lcbfb= zlc/zlcs;
+			sin.setHyl(df.format(yhl*lcbfb));
+			sin.setJzl(df.format(jzl*lcbfb));
+			sin.setUnyyyl(df.format(fyy*lcbfb));
+			}
 		}
 		return list;
 	}
@@ -658,6 +677,24 @@ public class FormsServiceImpl implements FormsService {
 					return y;
 				}
 			});
+	       
+	       String dlbSql=" select * from bsth_c_dlb where rq BETWEEN '"+startDate+"' and '"+endDate+"'";
+	       if(xlbm.equals("")){
+	    	   ylbSql +="and ssgsdm='"+gsdm+"' "
+						+ " and fgsdm='"+fgsdm+"'";
+			}else{
+				ylbSql += " and xlbm = '"+xlbm+"'";
+			}
+	       List<Dlb> dlbList= jdbcTemplate.query(dlbSql, new RowMapper<Dlb>() {
+				@Override
+				public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Dlb d = new Dlb();
+					d.setCdl(arg0.getDouble("cdl"));
+					d.setXlbm(arg0.getString("xlbm"));
+					d.setHd(arg0.getDouble("hd"));
+					return d;
+				}
+			});
 			List<ScheduleRealInfo> listReal;
 			if(xlbm.equals("")){
 				listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj(xlbm, startDate, endDate, gsdm, fgsdm);
@@ -700,6 +737,13 @@ public class FormsServiceImpl implements FormsService {
 						xhl=Arith.add(xhl, t.getYh());
 					}
 				}
+				for (int j = 0; j < dlbList.size(); j++) {
+					Dlb d=dlbList.get(j);
+					if(d.getXlbm().equals(line)){
+						jzl=Arith.add(jzl, d.getCdl());
+						xhl=Arith.add(xhl, d.getHd());
+					}
+				}
 				o.setJzl(String.valueOf(jzl));
 				o.setXhl(String.valueOf(xhl));
@@ -731,7 +775,8 @@ public class FormsServiceImpl implements FormsService {
 		});
-		List<Ylb> listYlb= ylbRepository.obtainYl(startDate, "", "", line, "", "xlbm");
+		List<Ylb> listYlb= ylbRepository.obtainYl(date, "", "", line, "", "xlbm");
+		List<Dlb> listDlb= dlbRepository.obtainDl(date, "", "", line, "", "xlbm");
 		List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
 		for (int i = 0; i < list.size(); i++) {
 			List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
@@ -771,6 +816,14 @@ public class FormsServiceImpl implements FormsService {
 					ns =Arith.add(ns, y.getNs()==null?0:y.getNs());
 				}
 			}
+			for (int j = 0; j < listDlb.size(); j++) {
+				Dlb d=listDlb.get(j);
+				if(d.getJsy().equals(jsy) && d.getNbbm().equals(clzbh)){
+					yhl=Arith.add(yhl, d.getHd()==null?0:d.getHd());
+					jzl=Arith.add(jzl, d.getCdl()==null?0:d.getCdl());
+					fyy=Arith.add(fyy, d.getSh()==null?0:d.getSh());
+				}
+			}
 			sin.setHyl(String.valueOf(yhl));
 			sin.setJzl(String.valueOf(jzl));
 			sin.setUnyyyl(String.valueOf(fyy));
@@ -704,15 +704,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 //			String nbbm =jsonObject.getString("nbbm");
 //			String rq=jsonObject.getString("rq");
 			repository.dlbUpdate(id, czcd, jzcd, hd, sh, shyy, yhlx);
-			/*for (int z = 0; z < cylList.size(); z++) {
-				Cyl cyl = cylList.get(z);
-				if (nbbm.equals(cyl.getNbbm())) {
-					cyl.setCyl(jzyl);
-					cyl.setUpdatetime(sdf.parse(rq));
-					break;
-				}
-				cylRepository.save(cyl);
-			}*/
+		
 		}
 		newMap.put("status", ResponseCode.SUCCESS);
 		}catch(Exception e){
@@ -731,12 +731,31 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             state = state + "+1";
             type = "ASC";
         }
-        String sqlPlan = "select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"
-                + " s.lp_Name as lpName,s.j_Name as jName,min(s.schedule_date_str) as dateStr ,min(s.fcsj) as fcsj"
+        /*String sqlPlan = "select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"
+                + " s.lp_Name as lpName,s.j_Name as jName,min(s.schedule_date_str) as dateStr ,"
+                + " min(s.fcsj) as fcsj, min(s.schedule_date) as date"
                 + " from bsth_c_s_sp_info_real s "
                 + " where s.xl_Bm = '" + line + "' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='" + date + "' "
                 + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name"
-                + " order by (" + state + "),dateStr,fcsj " + type;
+                + " order by (" + state + "),dateStr,fcsj " + type;*/
+        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+         		+ " id = ("
+         		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
+         		+ ")";
+         String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        String sqlPlan ="select * from  (select * from ("
+        		+ " select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh, "
+        		+ " s.lp_Name as lpName,s.j_Name as jName,max(s.schedule_date_str) as dateStr ,"
+        		+ " min(s.fcsj) as fcsj,1 as px  from bsth_c_s_sp_info_real s  where "
+        		+ " s.xl_Bm = '"+line+"' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='"+date+"'"
+        		+ " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name ) x where x.fcsj >'"+minfcsj+"'"
+        		+ " UNION "
+        		+ " select * from ( select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh, "
+        		+ " s.lp_Name as lpName,s.j_Name as jName, max(s.schedule_date_str) as dateStr,"
+        		+ " min(s.fcsj) as fcsj,2 as px from bsth_c_s_sp_info_real s  "
+        		+ " where s.xl_Bm = '"+line+"' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='"+date+"'"
+        		+ " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name "
+        		+ " ) y where y.fcsj <='"+minfcsj+"') z order by (" + state + "),dateStr,px " + type;
         List<ScheduleRealInfo> list = jdbcTemplate.query(sqlPlan,
                 new RowMapper<ScheduleRealInfo>() {
                     @Override
@@ -747,10 +766,48 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         t.setClZbh(rs.getString("clZbh"));
                         t.setLpName(rs.getString("lpName"));
                         t.setjName(rs.getString("jName"));
+                        t.setFcsj(rs.getString("fcsj"));
                         return t;
                     }
                 });
         if (lpname.equals("lpName")) {
+        	/* SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+             String sqlMinYysj="select start_opt from bsth_c_line_config where "
+             		+ " id = ("
+             		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
+             		+ ")";
+             String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+     		String[] minSjs = minfcsj.split(":");
+     		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
+     		for (int i = 0; i < list.size(); i++) {
+     			 ScheduleRealInfo s=list.get(i);
+                 String[] fcsj= s.getFcsj().split(":");
+                 Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
+
+                 Long fscjT=0L;
+                 if(fcsjL<minSj){
+                     Calendar   calendar   =   new   GregorianCalendar();
+                     calendar.setTime(s.getScheduleDate());
+                     calendar.add(calendar.DATE,1);
+                     s.setScheduleDate(calendar.getTime());
+                     try {
+                         fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
+                     } catch (ParseException e) {
+                         // TODO Auto-generated catch block
+                         e.printStackTrace();
+                     }
+
+                 }else{
+                     try {
+                         fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
+                     } catch (ParseException e) {
+                         // TODO Auto-generated catch block
+                         e.printStackTrace();
+                     };
+                 }
+                 s.setFcsjT(fscjT);
+			}
+     		Collections.sort(list, new ComparableReal());*/
             List<ScheduleRealInfo> listNew = new ArrayList<ScheduleRealInfo>();
             Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
 //            if (px.equals("desc")) {
@@ -2617,6 +2674,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }*/
     public final Map<String, Object> staticTj(List<ScheduleRealInfo> list){
+    
         List<ScheduleRealInfo>  lists=new ArrayList<ScheduleRealInfo>();
         for(int i=0;i<list.size();i++){
             ScheduleRealInfo s=list.get(i);
@@ -2630,57 +2688,59 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
         }
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("xlName", lists.get(0).getXlName());
-        double jhyygl=culateService.culateJhgl(list);//计划营运公里
-        double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
-        map.put("jhlc", jhyygl);
-        map.put("jcclc", jhjcclc);
-        map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
-
-        double ljgl= culateService.culateLjgl(lists);
-        double sjyygl= culateService.culateSjgl(lists);
-        double zyygl= Arith.add(sjyygl,ljgl);
-
-        double sjjccgl=culateService.culateJccgl(lists);
-        double sjksgl=culateService.culateKsgl(lists);
-        double zksgl=Arith.add(sjjccgl, sjksgl);
-        map.put("sjzgl", Arith.add(zyygl, zksgl));
-        map.put("sjgl",zyygl);
-        map.put("sjksgl", zksgl);
-
-        map.put("ssgl", culateService.culateLbgl(list));
-        map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
-        map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
-        map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
-        map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));
-        map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));
-        map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));
-        map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));
-        map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
-        map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
-        map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
-        map.put("ssgl_other", culateService.culateCJLC(list, "其他"));
-        map.put("ssbc", culateService.culateLbbc(list));
-        map.put("ljgl", ljgl);
-        map.put("jhbc", culateService.culateJhbc(list,""));
-        map.put("jhbc_m", culateService.culateJhbc(list, "zgf"));
-        map.put("jhbc_a", culateService.culateJhbc(list, "wgf"));
-        map.put("sjbc", culateService.culateSjbc(lists,""));
-        map.put("sjbc_m", culateService.culateSjbc(lists,"zgf"));
-        map.put("sjbc_a", culateService.culateSjbc(lists,"wgf"));
-        map.put("ljbc", culateService.culateLjbc(lists,""));
-        map.put("ljbc_m", culateService.culateLjbc(lists,"zgf"));
-        map.put("ljbc_a", culateService.culateLjbc(lists,"wgf"));
-        map.put("fzbc", culateService.culateFzbc(lists, ""));
-        map.put("fzbc_m", culateService.culateFzbc(lists, "zgf"));
-        map.put("fzbc_a",  culateService.culateFzbc(lists, "wgf"));
-        map.put("dtbc", 0);
-        map.put("dtbc_m", 0);
-        map.put("dtbc_a", 0);
-        map.put("djg", 0);
-        map.put("djg_m", 0);
-        map.put("djg_a", 0);
-        map.put("djg_time", 0);
+    	if(list.size()>0){
+	        map.put("xlName", list.get(0).getXlName());
+	        double jhyygl=culateService.culateJhgl(list);//计划营运公里
+	        double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
+	        map.put("jhlc", jhyygl);
+	        map.put("jcclc", jhjcclc);
+	        map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
+	
+	        double ljgl= culateService.culateLjgl(lists);
+	        double sjyygl= culateService.culateSjgl(lists);
+	        double zyygl= Arith.add(sjyygl,ljgl);
+	
+	        double sjjccgl=culateService.culateJccgl(lists);
+	        double sjksgl=culateService.culateKsgl(lists);
+	        double zksgl=Arith.add(sjjccgl, sjksgl);
+	        map.put("sjzgl", Arith.add(zyygl, zksgl));
+	        map.put("sjgl",zyygl);
+	        map.put("sjksgl", zksgl);
+	
+	        map.put("ssgl", culateService.culateLbgl(list));
+	        map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
+	        map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
+	        map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
+	        map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));
+	        map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));
+	        map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));
+	        map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));
+	        map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
+	        map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
+	        map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
+	        map.put("ssgl_other", culateService.culateCJLC(list, "其他"));
+	        map.put("ssbc", culateService.culateLbbc(list));
+	        map.put("ljgl", ljgl);
+	        map.put("jhbc", culateService.culateJhbc(list,""));
+	        map.put("jhbc_m", culateService.culateJhbc(list, "zgf"));
+	        map.put("jhbc_a", culateService.culateJhbc(list, "wgf"));
+	        map.put("sjbc", culateService.culateSjbc(lists,""));
+	        map.put("sjbc_m", culateService.culateSjbc(lists,"zgf"));
+	        map.put("sjbc_a", culateService.culateSjbc(lists,"wgf"));
+	        map.put("ljbc", culateService.culateLjbc(lists,""));
+	        map.put("ljbc_m", culateService.culateLjbc(lists,"zgf"));
+	        map.put("ljbc_a", culateService.culateLjbc(lists,"wgf"));
+	        map.put("fzbc", culateService.culateFzbc(lists, ""));
+	        map.put("fzbc_m", culateService.culateFzbc(lists, "zgf"));
+	        map.put("fzbc_a",  culateService.culateFzbc(lists, "wgf"));
+	        map.put("dtbc", 0);
+	        map.put("dtbc_m", 0);
+	        map.put("dtbc_a", 0);
+	        map.put("djg", 0);
+	        map.put("djg_m", 0);
+	        map.put("djg_a", 0);
+	        map.put("djg_time", 0);
+    	}
         return map;
     }
@@ -8,7 +8,7 @@ import com.bsth.service.BaseService;
 public interface SheetService extends BaseService<Sheet, Integer>{
 	public List<Map<String, Object>> bcPunctual(Map<String, Object> map);
-	public String  saveSheetList() throws Exception;
+	public String  saveSheetList(String date) throws Exception;
 	public List<Map<String, Object>> countList(Map<String, Object> map);
 	public List<Sheet> sheetList(Integer id);
@@ -82,48 +82,53 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		return fage;
 	}
 	@Override
-	public String saveSheetList() throws Exception{
+	public String saveSheetList(String rq) throws Exception{
 		Map<String, Object> map=new HashMap<String,Object>();
 		String result = "failure";
+		
 		try {
 			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-			Date dNow = new Date();   //当前时间
-			Calendar calendar = Calendar.getInstance(); //得到日历
-			calendar.setTime(dNow);//把当前时间赋给日历
-			calendar.add(Calendar.DAY_OF_MONTH, -3);  //设置为前三天
-			    
-			String rq=sdf.format(calendar.getTime());
-//			String rq="2017-05-16";
-			
-			List<Line> lineList = (List<Line>) lineRepository.findAll();
-			List<ScheduleRealInfo> lists= scheduleRealInfoRepository.findByDate(rq);
-			List<Sheet> listAdds=new ArrayList<Sheet>();
-			for (int i = 0; i < lineList.size(); i++) {
-				List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
-				String line=lineList.get(i).getLineCode();
-				for (int j = 0; j < lists.size(); j++) {
-					ScheduleRealInfo s=lists.get(j);
-					if(!isInOut(s)){
-						if(s.getXlBm().equals(line)){
-							list.add(s);
+			   if(rq.equals("")){
+				   Date dNow = new Date();   //当前时间
+				   Calendar calendar = Calendar.getInstance(); //得到日历
+				   calendar.setTime(dNow);//把当前时间赋给日历
+				   calendar.add(Calendar.DAY_OF_MONTH, -3);  //设置为前三天
+				   rq=sdf.format(calendar.getTime());
+			   } 
+			   int count=sheetRepository.countByDate(rq);
+			   if(count<=0){
+				List<Line> lineList = (List<Line>) lineRepository.findAll();
+				
+				List<ScheduleRealInfo> lists= scheduleRealInfoRepository.findByDate(rq);
+				List<Sheet> listAdds=new ArrayList<Sheet>();
+				for (int i = 0; i < lineList.size(); i++) {
+					List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
+					String line=lineList.get(i).getLineCode();
+					for (int j = 0; j < lists.size(); j++) {
+						ScheduleRealInfo s=lists.get(j);
+						if(!isInOut(s)){
+							if(s.getXlBm().equals(line)){
+								list.add(s);
+							}
 						}
 					}
-					
-				}
-				if(list.size()>0){
-					List<Sheet> listAdd=punctualByLine(line,list);
-					if(listAdd.size()>0){ 
-						listAdds.addAll(listAdd);
+					if(list.size()>0){
+						List<Sheet> listAdd=punctualByLine(line,list);
+						if(listAdd.size()>0){ 
+							listAdds.addAll(listAdd);
+						}
 					}
+					
 				}
-			}
-			
-			if(listAdds.size()>0){
-				new BatchSaveUtils<Sheet>().saveList(listAdds, Sheet.class); 
-			}
-			result = "success";
+				if(listAdds.size()>0){
+					new BatchSaveUtils<Sheet>().saveList(listAdds, Sheet.class); 
+				}
+				result = "success";
+		}else{
+			result ="count";
+		}
 		}catch (Exception e) {
 			// TODO Auto-generated catch block
 			throw e;
@@ -801,6 +801,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String nbbm = map.get("nbbm").toString();
 		String type = map.get("type").toString();
+		String companyName = "";
+		String subCompanyName = "";
+		String lineName = "";
+		
 		if(startDate.length() == 0){
 			startDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 		}
@@ -934,8 +938,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempList.add(m7);
 		}
-		String companyName = "";
-		String subCompanyName = "";
 		//按时间段分组
 		for(ScheduleRealInfo schedule : list){
@@ -947,6 +949,10 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					&&schedule.getFgsName().trim().length()!=0){
 				subCompanyName = schedule.getFgsName();
 			}
+			if(lineName.length()==0&&schedule.getXlName()!=null
+					&&schedule.getXlName().trim().length()!=0){
+				lineName = schedule.getXlName();
+			}
 			if(schedule.getFcsjActualTime()!=null && schedule.getZdsjActualTime()!=null){
 				Long fcsjA = schedule.getFcsjActualTime();
@@ -1005,6 +1011,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		for(String key : keyMap.keySet()){
 			Map<String, Object> m = null;
 			for(Map<String, Object> map2 : tempList){
+				map2.put("line", lineName.trim());
+				map2.put("company", companyName.trim());
+				map2.put("subCompany", subCompanyName.trim());
 				if(map2.get("time").toString().equals(key)){
 					m = map2;
 				}
@@ -1020,18 +1029,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					dnbc++;
 					dnys += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
 				}
-				
-				if(schedule.getXlName() != null && schedule.getXlName().trim().length() != 0){
-					m.put("line", schedule.getXlName());
-				}
 			}
 			m.put("upbc", upbc);
 			m.put("dnbc", dnbc);
 			m.put("upys", upbc > 0 ? nf.format((float)upys / upbc) : "/");
 			m.put("dnys", dnbc > 0 ? nf.format((float)dnys / dnbc) : "/");
 			m.put("pjys", (upbc + dnbc) > 0 ? nf.format((float) (upys + dnys) / (upbc + dnbc)) : "/");
-			m.put("company", companyName.trim());
-			m.put("subCompany", subCompanyName.trim());
 		}
 		if(flag){