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

潘钊
2 parents a423338d a042614b
Showing 17 changed files with 945 additions and 818 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/MyDroolsConfiguration.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleRule_input.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/LpInfoResult_output.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/LpInfoResultsFunction.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/LpInfoResults_output.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/MinRuleQyrqFunction.java
src/main/resources/rules/functions.drl
src/main/resources/rules/shiftloop_fb_2.drl
src/main/resources/rules/ttinfo.drl
src/main/resources/static/pages/oil/add.html
src/main/resources/static/pages/oil/list_ph.html
@@ -63,7 +63,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	}
-	@RequestMapping(value = "/saveYlbList",method = RequestMethod.GET)
+	@RequestMapping(value = "/saveYlbList",method = RequestMethod.POST)
 	public Map<String, Object> saveYlbList(@RequestParam Map<String, Object> map){
 		Map<String, Object> list=new HashMap<String, Object>();
 		try {
@@ -79,7 +79,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	 * @param map
 	 * @return
 	 */
-	@RequestMapping(value = "/sort",method = RequestMethod.GET)
+	@RequestMapping(value = "/sort",method = RequestMethod.POST)
 	public Map<String, Object> sort(@RequestParam Map<String, Object> map){
 		Map<String, Object> list=new HashMap<String, Object>();
 		try {
@@ -201,6 +201,12 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return yblService.oilListMonth(line, date);
 	}
+	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
+	public String checkJsy(@RequestParam Map<String, Object> map){
+		String list=yblService.checkJsy(map);
+		return list;
+	}
+	
 	@RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
 	public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
 		Map<String, Object> list=yblService.sumYlb(map);
@@ -96,18 +96,21 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and s.ssgsdm like %?2% "
 			+ " and s.fgsdm like %?3%"
 			+ " and s.xlbm like %?4% "
-			+ " and s.nbbm in ?5 ")
+			+ " and s.nbbm in ?5 order by nbbm,jcsx")
 	List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
 	@Transactional
     @Modifying
 	@Query(value="UPDATE bsth_c_ylb SET " +
-				" jzyl = ?2, " +
-				" sh = ?3," +
-				" shyy = ?4," +
-				" ns = ?5," +
-				" rylx = ?6" +
+				" czyl= ?2,"+
+				" jzyl = ?3, " +
+				" yh = ?4,"+
+				" sh = ?5," +
+				" shyy = ?6," +
+				" ns = ?7," +
+				" rylx = ?8," +
+				" yhlx = ?9"+
 				" WHERE id = ?1", nativeQuery=true)
-	public void ylbUpdate(Integer id,double jzyl,double sh,String shyy,double ns,String rylx);
+	public void ylbUpdate(Integer id,double czyl,double jzyl,double yh, double sh,String shyy,double ns,String rylx,int yhlx);
 }
@@ -9,6 +9,7 @@ import com.bsth.service.BaseService;
 public interface YlbService extends BaseService<Ylb, Integer>{
 	Map<String, Object> obtain(Map<String, Object> map) throws Exception;
 	Map<String, Object> saveYlbList(Map<String, Object> map) throws Exception;
+	Map<String, Object> saveYlb(Ylb t);
 	String obtainDsq() throws Exception;
 	Map<String, Object> sort(Map<String, Object> map)  throws Exception;
@@ -17,8 +18,10 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	Map<String, Object> checkYl(Map<String, Object> map)  throws Exception;
 	Map<String, Object> sumYlb(Map<String, Object> map);
-	
+	String checkJsy(Map<String, Object> map);
 	List<Ylb> oilListMonth(String line,String date);
 	List<Ylb> listYlb(Map<String, Object> map);
 	StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
+	
+	
 }
@@ -469,45 +469,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							repository.save(t);
 						}
-						
-						// 设置存油量
-						Cyl cyl = null;
-						boolean fage = false;
-						for (int z = 0; z < cylList.size(); z++) {
-							cyl = cylList.get(z);
-							if (t.getNbbm().equals(cyl.getNbbm())) {
-								cyl.setCyl(t.getJzyl());
-								cyl.setUpdatetime(t.getRq());
-								fage = true;
-								break;
-							}
-						}
-						if (fage) {
-							cylRepository.save(cyl);
-						} else {
-							if(cylMapAdd.get(t.getNbbm())!=null){
-								for (int l = 0; l < cylListAdd.size(); l++) {
-									cyl=cylListAdd.get(l);
-									if(cyl.getNbbm().equals(t.getNbbm())){
-										cyl.setNbbm(t.getNbbm());
-										cyl.setCyl(t.getJzyl());
-										cyl.setGsdm(t.getSsgsdm());
-										cyl.setFgsdm(t.getFgsdm());
-										cyl.setUpdatetime(t.getRq());
-									}
-								}
-							}else{
-								cyl = new Cyl();
-								cyl.setNbbm(t.getNbbm());
-								cyl.setCyl(t.getJzyl());
-								cyl.setGsdm(t.getSsgsdm());
-								cyl.setFgsdm(t.getFgsdm());
-								cyl.setUpdatetime(t.getRq());
-								cylListAdd.add(cyl);
-							}
-							
-							
-						}
 						map2.put("status", ResponseCode.SUCCESS);
 					}
 				}
@@ -526,6 +487,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	/**
 	 * 拆分
 	 */
+	/*
 	@Transactional  
 	@Override
 	public Map<String, Object> sort(Map<String, Object> map) throws Exception{
@@ -669,7 +631,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			throw e; 
 		}
 		return newMap;
-	}
+	}*/
 	/**
 	 * 核对，有加注没里程
@@ -727,32 +689,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setSsgsdm(y1.getGsdm());
 					t.setXlbm(xlbm);
 					repository.save(t);
-					
-					//设置存油量
-					Cyl cyl=null;
-					boolean status=false;
-					for(int z=0;z<cylList.size();z++){
-						cyl=cylList.get(z);
-						if(t.getNbbm().equals(cyl.getNbbm())){
-//							cyl.setCyl(cyl.getCyl()+t.getJzl());
-							cyl.setCyl(Arith.add(cyl.getCyl(),t.getJzl()));
-							cyl.setUpdatetime(t.getRq());
-							status=true;
-							break;
-						}
-					}
-					if(status){
-						cylRepository.save(cyl);
-					}else{
-						cyl=new Cyl();
-						cyl.setNbbm(t.getNbbm());
-						cyl.setCyl(t.getJzl());
-						cyl.setGsdm(t.getSsgsdm());
-						cyl.setUpdatetime(t.getRq());
-						cylRepository.save(cyl);
-					}
-					
-					
 				}
 			}
 			newMap.put("status", ResponseCode.SUCCESS);
@@ -965,20 +901,23 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		for (int i = 0; i < jsonArray.size(); i++) {
 //			Ylb t=new Ylb();
 			jsonObject=jsonArray.getJSONObject(i);
-			
-			Double jzyl =jsonObject.getDoubleValue("jzyl");
-			Double sh  =jsonObject.getDoubleValue("sh");
+			double czyl = jsonObject.getDoubleValue("czyl");
+			double jzl =jsonObject.getDoubleValue("jzl");
+			double jzyl =jsonObject.getDoubleValue("jzyl");
+			double sh  =jsonObject.getDoubleValue("sh");
 			String shyy =jsonObject.getString("shyy");
-			Double ns = jsonObject.getDoubleValue("ns");
+			double ns = jsonObject.getDoubleValue("ns");
 			String rylx =jsonObject.getString("rylx");
+			int yhlx =jsonObject.getIntValue("yhlx");
 			Integer id =jsonObject.getInteger("id");
+			double yh = Arith.sub(Arith.add(czyl, jzl), jzyl);
 			/*t.setJzyl(jzyl);
 			t.setSh(sh);
 			t.setShyy(shyy);
 			t.setNs(ns);
 			t.setRylx(rylx);
 			t.setId(jsonObject.getInteger("id"));*/
-			repository.ylbUpdate(id, jzyl, sh, shyy, ns, rylx);
+			repository.ylbUpdate(id, czyl, jzyl, yh, sh, shyy, ns, rylx,yhlx);
 		}
 //		List<Map<String, Object>> list=(List<Map<String, Object>>) map.get("ylbList");
@@ -991,5 +930,139 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		return newMap;
 	}
+	/**
+	 * 拆分
+	 */
+	@Transactional  
+	@Override
+	public Map<String, Object> sort(Map<String, Object> map) throws Exception{
+		// TODO Auto-generated method stub
+		Map<String, Object> newMap = new HashMap<String, Object>();
+		SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+		
+		try {
+			List<Cyl> cylList = cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
+			String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
+			JSONArray jsonArray=JSONArray.parseArray(json);
+			JSONObject jsonObject;
+			for (int x = 0; x < jsonArray.size(); x++) {
+				jsonObject=jsonArray.getJSONObject(x);
+				Double yl =jsonObject.getDoubleValue("jzyl");
+				Double sh  =jsonObject.getDoubleValue("sh");
+				String shyy =jsonObject.getString("shyy");
+				Double ns = jsonObject.getDoubleValue("ns");
+				String rylx =jsonObject.getString("rylx");
+				Integer id =jsonObject.getInteger("id");
+				Ylb ylb = repository.findOne(id);
+				String nbbm_eq = ylb.getNbbm();
+				Date rq_eq = ylb.getRq();
+				// 得到一天总的加油和里程（根据车，时间）
+				List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm());
+				// 保存总的加油量
+				Double jzl = 0.0;
+				// 保存总的里程
+				Double zlc = 0.0;
+				//保存总的损耗
+				Double zsh = 0.0;
+				for (int j = 0; j < sumList.size(); j++) {
+					jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
+					zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
+					zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
+				}
+				jzl = Arith.sub(jzl, zsh);
+				//新的 损耗不等于 旧的损耗 总损耗从新算
+				if(Arith.sub(ylb.getSh(),sh )!=0){
+					zsh =Arith.add(Arith.sub(zsh, ylb.getSh()), sh);
+					jzl =Arith.sub(jzl, zsh);
+				}else{
+					jzl =Arith.sub(jzl, zsh);
+				}
+				map.put("nbbm_eq", nbbm_eq);
+				map.put("rq_eq", rq_eq);
+				
+				List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),ylb.getXlbm(),
+						ylb.getNbbm(),"jcsx");
+				DecimalFormat df = new DecimalFormat("#.00");
+				Double zyl = 0.0;
+				Double nextJzyl = 0.0;
+				// 车的，进，出油量及耗油
+				Map<String, Object> cylMapAdd=new HashMap<String,Object>();
+				List<Cyl> cylListAdd=new ArrayList<Cyl>();
+				for (int i = 0; i < iterator2.size(); i++) {
+					Ylb t = iterator2.get(i);
+					if (t.getJcsx() == 1) {
+						if(t.getId()==id){
+							t.setSh(sh);
+							t.setShyy(shyy);
+						}
+						Double jcyl = t.getCzyl();
+						zyl = Arith.sub(Arith.add(jcyl, jzl), yl);
+						Double yh = 0.0;
+						if (zlc > 0 && t.getZlc() > 0) {
+							yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+						}
+						nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
+						long l=Math.round(nextJzyl);
+						double ylxs=l*100/100;
+//						nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+						yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+						t.setJzyl(ylxs);
+						t.setYh(yh);
+						nextJzyl=ylxs;
+					} else {
+						if(t.getId()==id){
+							t.setSh(sh);
+							t.setShyy(shyy);
+						}
+							t.setCzyl(nextJzyl);
+							Double yh =0.0;
+							if (t.getZlc() != 0) {
+								yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+							}
+							nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
+							long l=Math.round(nextJzyl);
+							double ylxs=l*100/100;
+//							nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+							yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+							t.setJzyl(ylxs);
+							t.setYh(yh);
+							nextJzyl=ylxs;
+					}
+					repository.save(t);
+				}
+				for (int i = 0; i < cylListAdd.size(); i++) {
+					cylRepository.save(cylListAdd.get(i));
+				}
+				newMap.put("status", ResponseCode.SUCCESS);
+			}
+		} catch (Exception e) {
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e; 
+		}
+		return newMap;
+	}
+	@Override
+	public String checkJsy(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String rq=map.get("date").toString();
+		String nbbm=map.get("nbbm").toString();
+		String jsy =map.get("jsy").toString();
+		List<Ylb> list= repository.queryListYlb(rq, nbbm, jsy);
+		String type="";
+		if(list.size()>0){
+			type="cunzai";
+		}
+		return type;
+	}
+
+	@Override
+	public Map<String, Object> saveYlb(Ylb t) {
+		
+		String gsbm="";
+		String fgsbm="";
+		return null;
+	}
 }
@@ -1621,9 +1621,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         else if (date.length() == 7)
             list = scheduleRealInfoRepository.scheduleByDateAndLine3(line, date);
+
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         DecimalFormat format = new DecimalFormat("0.00");
-        double jhlc = 0, tempJhlc = 0, childMileage = 0;
+        double jhlc = 0, tempJhlc = 0, childMileage = 0,jhlcOrig=0;
         float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
         //班次
         int ssbc = 0, ssbc_lz = 0, ssbc_dm = 0, ssbc_gz = 0, ssbc_jf = 0, ssbc_zs = 0, ssbc_qr = 0, ssbc_qc = 0, ssbc_kx = 0, ssbc_qh = 0, ssbc_yw = 0, ssbc_other = 0;
@@ -1648,21 +1649,35 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         int dtbcZ = 0, dtbc_mZ = 0, dtbc_aZ = 0;
         int djgZ = 0, djg_mZ = 0, djg_aZ = 0, djg_timeZ = 0;
         Map<String, Object> map = null;
+        
+        double xgssgl=0,xgljgl=0,lj=0,cj=0;
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo scheduleRealInfo = list.get(i);
+           
             if (scheduleRealInfo != null) {
                 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
                 //计算实际里程，少驶里程，计划里程=实际里程+少驶里程
+                if(!scheduleRealInfo.isSflj()){
+                    jhlc += tempJhlc;
+                    jhlcZ += tempJhlc;
+                }
                 if (childTaskPlans.isEmpty()) {
                     tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+                    jhlcOrig = scheduleRealInfo.getJhlcOrig() == null ? 0 : scheduleRealInfo.getJhlcOrig();
+                    
+                    if(jhlcOrig-tempJhlc>0){
+                    	xgssgl +=jhlcOrig-tempJhlc;
+                    	cj += jhlcOrig-tempJhlc;
+                    }else{
+                    	xgljgl +=tempJhlc-jhlcOrig;
+                    	lj +=tempJhlc-jhlcOrig;
+                    }
                     //临加公里
                     if (scheduleRealInfo.isSflj()) {
                         ljgl += tempJhlc;
                         ljglZ += tempJhlc;
-                    } else {
-                        jhlc += tempJhlc;
-                        jhlcZ += tempJhlc;
-                    }
+                    } 
+                    
                     if (scheduleRealInfo.getStatus() == -1) {
                         ssgl += tempJhlc;
                         ssglZ += tempJhlc;
@@ -1797,8 +1812,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                                 ssbc_otherZ++;
                             }
                         } else {
-                            sjgl += childMileage;
-                            sjglZ += childMileage;
+                        	if (scheduleRealInfo.isSflj()) {
+                                ljgl += tempJhlc;
+                                ljglZ += tempJhlc;
+                            } else{
+                            	sjgl += childMileage;
+                                sjglZ += childMileage;
+                            }
                         }
                     }
                 }
@@ -1855,7 +1875,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         map.put("xlName", scheduleRealInfo.getXlName());
                         map.put("jhlc", format.format(jhlc));
                         map.put("sjgl", format.format(sjgl));
-                        map.put("ssgl", format.format(ssgl));
+                        map.put("ssgl", format.format(ssgl+cj));
                         map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
                         map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
                         map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
@@ -1879,7 +1899,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         map.put("ssbc_qh", ssbc_qh);
                         map.put("ssbc_yw", ssbc_yw);
                         map.put("ssbc_other", ssbc_other);
-                        map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
+                        map.put("ljgl", format.format(ljgl+lj));
                         map.put("jhbc", jhbc);
                         map.put("jhbc_m", jhbc_m);
                         map.put("jhbc_a", jhbc_a);
@@ -1937,13 +1957,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         djg_m = 0;
                         djg_a = 0;
                         djg_time = 0;
+                        lj=0;
+                        cj=0;
                     }
                 } else {
                     map = new HashMap<String, Object>();
                     map.put("xlName", scheduleRealInfo.getXlName());
                     map.put("jhlc", format.format(jhlc));
                     map.put("sjgl", format.format(sjgl));
-                    map.put("ssgl", format.format(ssgl));
+                    map.put("ssgl", format.format(ssgl+cj));
                     map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
                     map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
                     map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
@@ -1967,7 +1989,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     map.put("ssbc_qh", ssbc_qh);
                     map.put("ssbc_yw", ssbc_yw);
                     map.put("ssbc_other", ssbc_other);
-                    map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
+                    map.put("ljgl", format.format(ljgl+lj));
                     map.put("jhbc", jhbc);
                     map.put("jhbc_m", jhbc_m);
                     map.put("jhbc_a", jhbc_a);
@@ -2025,6 +2047,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     djg_m = 0;
                     djg_a = 0;
                     djg_time = 0;
+                    lj=0;
+                    cj=0;
                 }
             }
         }
@@ -2032,7 +2056,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("xlName", "合计");
         map.put("jhlc", format.format(jhlcZ));
         map.put("sjgl", format.format(sjglZ));
-        map.put("ssgl", format.format(ssglZ));
+        map.put("ssgl", format.format(ssglZ+xgssgl));
         map.put("ssgl_lz", ssgl_lzZ == 0 ? 0 : format.format(ssgl_lzZ));
         map.put("ssgl_dm", ssgl_dmZ == 0 ? 0 : format.format(ssgl_dmZ));
         map.put("ssgl_gz", ssgl_gzZ == 0 ? 0 : format.format(ssgl_gzZ));
@@ -2056,7 +2080,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ssbc_qh", ssbc_qhZ);
         map.put("ssbc_yw", ssbc_ywZ);
         map.put("ssbc_other", ssbc_otherZ);
-        map.put("ljgl", ljglZ == 0 ? 0 : format.format(ljglZ));
+        map.put("ljgl", format.format(ljglZ+xgljgl));
         map.put("jhbc", jhbcZ);
         map.put("jhbc_m", jhbc_mZ);
         map.put("jhbc_a", jhbc_aZ);
@@ -2149,7 +2173,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         DecimalFormat format = new DecimalFormat("0.00");
-        double jhlc = 0, tempJhlc = 0, childMileage = 0;
+        double jhlc = 0, tempJhlc = 0, childMileage = 0,jhlcOrig=0;
         float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
         //班次
         int ssbc = 0, ssbc_lz = 0, ssbc_dm = 0, ssbc_gz = 0, ssbc_jf = 0, ssbc_zs = 0, ssbc_qr = 0, ssbc_qc = 0, ssbc_kx = 0, ssbc_qh = 0, ssbc_yw = 0, ssbc_other = 0;
@@ -2174,21 +2198,35 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         int dtbcZ = 0, dtbc_mZ = 0, dtbc_aZ = 0;
         int djgZ = 0, djg_mZ = 0, djg_aZ = 0, djg_timeZ = 0;
         Map<String, Object> map = null;
+        
+        double xgssgl=0,xgljgl=0,lj=0,cj=0;
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo scheduleRealInfo = list.get(i);
+           
             if (scheduleRealInfo != null) {
                 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
                 //计算实际里程，少驶里程，计划里程=实际里程+少驶里程
+                if(!scheduleRealInfo.isSflj()){
+                    jhlc += tempJhlc;
+                    jhlcZ += tempJhlc;
+                }
                 if (childTaskPlans.isEmpty()) {
                     tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+                    jhlcOrig = scheduleRealInfo.getJhlcOrig() == null ? 0 : scheduleRealInfo.getJhlcOrig();
+                    
+                    if(jhlcOrig-tempJhlc>0){
+                    	xgssgl +=jhlcOrig-tempJhlc;
+                    	cj += jhlcOrig-tempJhlc;
+                    }else{
+                    	xgljgl +=tempJhlc-jhlcOrig;
+                    	lj +=tempJhlc-jhlcOrig;
+                    }
                     //临加公里
                     if (scheduleRealInfo.isSflj()) {
                         ljgl += tempJhlc;
                         ljglZ += tempJhlc;
-                    } else {
-                        jhlc += tempJhlc;
-                        jhlcZ += tempJhlc;
-                    }
+                    } 
+                    
                     if (scheduleRealInfo.getStatus() == -1) {
                         ssgl += tempJhlc;
                         ssglZ += tempJhlc;
@@ -2323,8 +2361,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                                 ssbc_otherZ++;
                             }
                         } else {
-                            sjgl += childMileage;
-                            sjglZ += childMileage;
+                        	if (scheduleRealInfo.isSflj()) {
+                                ljgl += tempJhlc;
+                                ljglZ += tempJhlc;
+                            } else{
+                            	sjgl += childMileage;
+                                sjglZ += childMileage;
+                            }
                         }
                     }
                 }
@@ -2381,7 +2424,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         map.put("xlName", scheduleRealInfo.getXlName());
                         map.put("jhlc", format.format(jhlc));
                         map.put("sjgl", format.format(sjgl));
-                        map.put("ssgl", format.format(ssgl));
+                        map.put("ssgl", format.format(ssgl+cj));
                         map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
                         map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
                         map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
@@ -2405,7 +2448,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         map.put("ssbc_qh", ssbc_qh);
                         map.put("ssbc_yw", ssbc_yw);
                         map.put("ssbc_other", ssbc_other);
-                        map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
+                        map.put("ljgl", (ljgl+lj) == 0 ? 0 : format.format(ljgl+lj));
                         map.put("jhbc", jhbc);
                         map.put("jhbc_m", jhbc_m);
                         map.put("jhbc_a", jhbc_a);
@@ -2463,12 +2506,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         djg_m = 0;
                         djg_a = 0;
                         djg_time = 0;
+                        lj=0;
+                        cj=0;
                     }
                 } else {
                     map = new HashMap<String, Object>();
                     map.put("xlName", scheduleRealInfo.getXlName());
                     map.put("jhlc", format.format(jhlc));
-                    map.put("sjgl", format.format(sjgl));
+                    map.put("sjgl", format.format(sjgl+cj));
                     map.put("ssgl", format.format(ssgl));
                     map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
                     map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
@@ -2493,7 +2538,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     map.put("ssbc_qh", ssbc_qh);
                     map.put("ssbc_yw", ssbc_yw);
                     map.put("ssbc_other", ssbc_other);
-                    map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
+                    map.put("ljgl", format.format(ljgl+lj));
                     map.put("jhbc", jhbc);
                     map.put("jhbc_m", jhbc_m);
                     map.put("jhbc_a", jhbc_a);
@@ -2551,6 +2596,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     djg_m = 0;
                     djg_a = 0;
                     djg_time = 0;
+                    lj=0;
+                    cj=0;
                 }
             }
         }
@@ -2558,7 +2605,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("xlName", "合计");
         map.put("jhlc", format.format(jhlcZ));
         map.put("sjgl", format.format(sjglZ));
-        map.put("ssgl", format.format(ssglZ));
+        map.put("ssgl", format.format(ssglZ+xgssgl));
         map.put("ssgl_lz", ssgl_lzZ == 0 ? 0 : format.format(ssgl_lzZ));
         map.put("ssgl_dm", ssgl_dmZ == 0 ? 0 : format.format(ssgl_dmZ));
         map.put("ssgl_gz", ssgl_gzZ == 0 ? 0 : format.format(ssgl_gzZ));
@@ -2582,7 +2629,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ssbc_qh", ssbc_qhZ);
         map.put("ssbc_yw", ssbc_ywZ);
         map.put("ssbc_other", ssbc_otherZ);
-        map.put("ljgl", ljglZ == 0 ? 0 : format.format(ljglZ));
+        map.put("ljgl", format.format(ljglZ+xgljgl));
         map.put("jhbc", jhbcZ);
         map.put("jhbc_m", jhbc_mZ);
         map.put("jhbc_a", jhbc_aZ);
@@ -3554,7 +3601,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
         int jhbc = 0, cjbc = 0, ljbc = 0;
-        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
+        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0,ljjcclc=0;
         float addMileage = 0l, remMileage = 0l, addgl = 0, remgl = 0;
         Map<String, Object> map = new HashMap<String, Object>();
         for (ScheduleRealInfo scheduleRealInfo : list) {
@@ -3566,7 +3613,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 double jh = 0, sj = 0;
                 tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
                 if (scheduleRealInfo.isSflj()) {
-                    ljbc++;
+                	if(!(scheduleRealInfo.getBcType().equals("in")
+                            || scheduleRealInfo.getBcType().equals("out"))){
+                		ljbc++;
+                	}
                 } else {
                     if (!(scheduleRealInfo.getBcType().equals("in")
                             || scheduleRealInfo.getBcType().equals("out"))) {
@@ -3584,14 +3634,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 if (childTaskPlans.isEmpty()) {
                     if (scheduleRealInfo.getBcType().equals("in") ||
                             scheduleRealInfo.getBcType().equals("out")) {
-                        jcclc += tempJhlc;
-                    }
-
-                    //主任务 放空班次属于营运
-//					else if(scheduleRealInfo.getBcType().equals("venting")){
-//						ksgl += tempJhlc;
-//					}
-                    else {
+                    	if(scheduleRealInfo.getStatus() != -1){
+                    		if(scheduleRealInfo.isSflj()){
+                    			ljjcclc += tempJhlc;
+                    		}else{
+                    			jcclc += tempJhlc;
+                    		}
+                    	}
+                    }else {
                         if (scheduleRealInfo.getStatus() != -1) {
                             if (scheduleRealInfo.isSflj()) {
                                 addMileage += tempJhlc;
@@ -3640,13 +3690,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ksgl", format.format(ksgl));
         map.put("yyglsj", format.format(yygl));
         map.put("jhbc", jhbc);
-        map.put("jcclc", jcclc);
+        map.put("jcclc", format.format(jcclc+ljjcclc));
         map.put("ljgl", format.format(addMileage));
         map.put("ssbc", cjbc);
         map.put("ysgl", format.format(yygl));
         map.put("sjbc", jhbc - cjbc + ljbc);
-        map.put("zgl", format.format(yygl + ksgl + jcclc));
+        map.put("zgl", format.format(yygl + ksgl + jcclc+ljjcclc));
         map.put("ljbc", ljbc);
         return map;
@@ -177,6 +177,15 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
             session.insert(ttInfo_input);
         }
+
+        // 载入数据2
+        Iterator<ScheduleRule1Flat> scheduleRule1FlatIterator = strategy.getScheduleRule(schedulePlan.getXl().getId()).iterator();
+        while (scheduleRule1FlatIterator.hasNext()) {
+            ScheduleRule1Flat scheduleRule1Flat_temp = scheduleRule1FlatIterator.next();
+            ScheduleRule_input scheduleRule_input = new ScheduleRule_input(scheduleRule1Flat_temp);
+            session.insert(scheduleRule_input);
+        }
+
         // 执行rule
         session.fireAllRules();
@@ -58,9 +58,9 @@ public class MyDroolsConfiguration {
         kfs.write("src/main/resources/HelloWorld.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
                         "/rules/HelloWorld.drl"), "UTF-8"));
-        kfs.write("src/main/resources/shiftloop_fb.drl", kieServices.getResources()
+        kfs.write("src/main/resources/shiftloop_fb_2.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/shiftloop_fb.drl"), "UTF-8"));
+                        "/rules/shiftloop_fb_2.drl"), "UTF-8"));
         kfs.write("src/main/resources/ttinfo.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
                         "/rules/ttinfo.drl"), "UTF-8"));
@@ -12,6 +12,9 @@ import java.util.List;
  * 排班规则_输入。
  */
 public class ScheduleRule_input {
+    /** 线路Id */
+    private String xlId;
+
     /** 规则Id */
     private String ruleId;
     /** 规则启用日期 */
@@ -36,6 +39,7 @@ public class ScheduleRule_input {
     public ScheduleRule_input() {}
     public ScheduleRule_input(ScheduleRule1Flat scheduleRule1Flat) {
+        this.xlId = String.valueOf(scheduleRule1Flat.getXl().getId());
         this.ruleId = String.valueOf(scheduleRule1Flat.getId());
         this.qyrq = new DateTime(scheduleRule1Flat.getQyrq());
         List<String> lpIds = Splitter.on(",").splitToList(scheduleRule1Flat.getLpIds());
@@ -135,4 +139,12 @@ public class ScheduleRule_input {
     public void setWeekdays(List<Boolean> weekdays) {
         this.weekdays = weekdays;
     }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
 }
-package com.bsth.service.schedule.rules.ttinfo;
-
-import org.joda.time.DateTime;
-
-/**
- * 每日路爬信息。
- */
-public class LpInfoResult_output {
-    /** 具体日期 */
-    private DateTime dateTime;
-    /** 路牌Id */
-    private String lpId;
-    /** 线路Id */
-    private String xlId;
-    /** 时刻表Id */
-    private String ttInfoId;
-
-    public DateTime getDateTime() {
-        return dateTime;
-    }
-
-    public void setDateTime(DateTime dateTime) {
-        this.dateTime = dateTime;
-    }
-
-    public String getLpId() {
-        return lpId;
-    }
-
-    public void setLpId(String lpId) {
-        this.lpId = lpId;
-    }
-
-    public String getXlId() {
-        return xlId;
-    }
-
-    public void setXlId(String xlId) {
-        this.xlId = xlId;
-    }
-
-    public String getTtInfoId() {
-        return ttInfoId;
-    }
-
-    public void setTtInfoId(String ttInfoId) {
-        this.ttInfoId = ttInfoId;
-    }
-}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import org.joda.time.DateTime;
+
+/**
+ * 每日路爬信息。
+ */
+public class LpInfoResult_output {
+    /** 具体日期 */
+    private DateTime dateTime;
+    /** 路牌Id */
+    private String lpId;
+    /** 线路Id */
+    private String xlId;
+    /** 时刻表Id */
+    private String ttInfoId;
+
+    public DateTime getDateTime() {
+        return dateTime;
+    }
+
+    public void setDateTime(DateTime dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    public String getLpId() {
+        return lpId;
+    }
+
+    public void setLpId(String lpId) {
+        this.lpId = lpId;
+    }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
+
+    public String getTtInfoId() {
+        return ttInfoId;
+    }
+
+    public void setTtInfoId(String ttInfoId) {
+        this.ttInfoId = ttInfoId;
+    }
+}
-package com.bsth.service.schedule.rules.ttinfo;
-
-import com.bsth.entity.schedule.TTInfoDetail;
-import org.kie.api.runtime.rule.AccumulateFunction;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 路牌信息统计函数。
- */
-public class LpInfoResultsFunction implements AccumulateFunction {
-    @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
-
-    }
-
-    @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-
-    }
-
-    protected static class LpInfoResultsData implements Externalizable {
-        public List<LpInfoResult_output> lpInfoResult_outputs = new ArrayList<>();
-        public Map<Long, LpInfoResult_output> lpInfoResult_outputMap = new HashMap<>();
-        public TTInfoDetail ttInfoDetail;
-
-        public LpInfoResultsData() {}
-
-        @Override
-        public void writeExternal(ObjectOutput out) throws IOException {
-            out.writeObject(lpInfoResult_outputs);
-            out.writeObject(ttInfoDetail);
-        }
-
-        @Override
-        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            lpInfoResult_outputs = (List<LpInfoResult_output>) in.readObject();
-            ttInfoDetail = (TTInfoDetail) in.readObject();
-        }
-    }
-
-    @Override
-    public Serializable createContext() {
-        return new LpInfoResultsData();
-    }
-
-    @Override
-    public void init(Serializable context) throws Exception {
-        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
-        lpInfoResultsData.lpInfoResult_outputs = new ArrayList<>();
-        lpInfoResultsData.lpInfoResult_outputMap = new HashMap<>();
-    }
-
-    @Override
-    public void accumulate(Serializable context, Object value) {
-        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
-        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
-
-        if (ttInfoDetail.getLp() != null) {
-            if (lpInfoResultsData.lpInfoResult_outputMap.get(ttInfoDetail.getLp().getId()) == null) {
-                LpInfoResult_output lpInfoResult_output = new LpInfoResult_output();
-                lpInfoResult_output.setLpId(String.valueOf(ttInfoDetail.getLp().getId()));
-                lpInfoResult_output.setXlId(String.valueOf(ttInfoDetail.getXl().getId()));
-                lpInfoResult_output.setTtInfoId(String.valueOf(ttInfoDetail.getTtinfo().getId()));
-
-                lpInfoResultsData.lpInfoResult_outputMap.put(
-                        ttInfoDetail.getLp().getId(),
-                        lpInfoResult_output);
-            }
-        }
-
-        lpInfoResultsData.lpInfoResult_outputs.clear();
-        lpInfoResultsData.lpInfoResult_outputs.addAll(
-                lpInfoResultsData.lpInfoResult_outputMap.values());
-    }
-
-    @Override
-    public boolean supportsReverse() {
-        return true;
-    }
-
-    @Override
-    public void reverse(Serializable context, Object value) throws Exception {
-        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
-        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
-
-        lpInfoResultsData.lpInfoResult_outputMap.remove(ttInfoDetail.getLp().getId());
-
-        lpInfoResultsData.lpInfoResult_outputs.clear();
-        lpInfoResultsData.lpInfoResult_outputs.addAll(
-                lpInfoResultsData.lpInfoResult_outputMap.values());
-
-    }
-
-    @Override
-    public Object getResult(Serializable context) throws Exception {
-        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
-        return lpInfoResultsData.lpInfoResult_outputs;
-    }
-
-    @Override
-    public Class<?> getResultType() {
-        return List.class;
-    }
-}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import com.bsth.entity.schedule.TTInfoDetail;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 路牌信息统计函数。
+ */
+public class LpInfoResultsFunction implements AccumulateFunction {
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+
+    }
+
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+
+    }
+
+    protected static class LpInfoResultsData implements Externalizable {
+        public List<LpInfoResult_output> lpInfoResult_outputs = new ArrayList<>();
+        public Map<Long, LpInfoResult_output> lpInfoResult_outputMap = new HashMap<>();
+        public TTInfoDetail ttInfoDetail;
+
+        public LpInfoResultsData() {}
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeObject(lpInfoResult_outputs);
+            out.writeObject(ttInfoDetail);
+        }
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            lpInfoResult_outputs = (List<LpInfoResult_output>) in.readObject();
+            ttInfoDetail = (TTInfoDetail) in.readObject();
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new LpInfoResultsData();
+    }
+
+    @Override
+    public void init(Serializable context) throws Exception {
+        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
+        lpInfoResultsData.lpInfoResult_outputs = new ArrayList<>();
+        lpInfoResultsData.lpInfoResult_outputMap = new HashMap<>();
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object value) {
+        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        if (ttInfoDetail.getLp() != null) {
+            if (lpInfoResultsData.lpInfoResult_outputMap.get(ttInfoDetail.getLp().getId()) == null) {
+                LpInfoResult_output lpInfoResult_output = new LpInfoResult_output();
+                lpInfoResult_output.setLpId(String.valueOf(ttInfoDetail.getLp().getId()));
+                lpInfoResult_output.setXlId(String.valueOf(ttInfoDetail.getXl().getId()));
+                lpInfoResult_output.setTtInfoId(String.valueOf(ttInfoDetail.getTtinfo().getId()));
+
+                lpInfoResultsData.lpInfoResult_outputMap.put(
+                        ttInfoDetail.getLp().getId(),
+                        lpInfoResult_output);
+            }
+        }
+
+        lpInfoResultsData.lpInfoResult_outputs.clear();
+        lpInfoResultsData.lpInfoResult_outputs.addAll(
+                lpInfoResultsData.lpInfoResult_outputMap.values());
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return true;
+    }
+
+    @Override
+    public void reverse(Serializable context, Object value) throws Exception {
+        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        lpInfoResultsData.lpInfoResult_outputMap.remove(ttInfoDetail.getLp().getId());
+
+        lpInfoResultsData.lpInfoResult_outputs.clear();
+        lpInfoResultsData.lpInfoResult_outputs.addAll(
+                lpInfoResultsData.lpInfoResult_outputMap.values());
+
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
+        return lpInfoResultsData.lpInfoResult_outputs;
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return List.class;
+    }
+}
-package com.bsth.service.schedule.rules.ttinfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by xu on 17/3/21.
- */
-public class LpInfoResults_output {
-
-    private List<LpInfoResult_output> lpInfoResult_outputs = new ArrayList<>();
-
-    public List<LpInfoResult_output> getLpInfoResult_outputs() {
-        return lpInfoResult_outputs;
-    }
-
-    public void setLpInfoResult_outputs(List<LpInfoResult_output> lpInfoResult_outputs) {
-        this.lpInfoResult_outputs = lpInfoResult_outputs;
-    }
-
-    public void add(LpInfoResult_output lpInfoResult_output) {
-
-    }
-}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by xu on 17/3/21.
+ */
+public class LpInfoResults_output {
+
+    private List<LpInfoResult_output> lpInfoResult_outputs = new ArrayList<>();
+
+    public List<LpInfoResult_output> getLpInfoResult_outputs() {
+        return lpInfoResult_outputs;
+    }
+
+    public void setLpInfoResult_outputs(List<LpInfoResult_output> lpInfoResult_outputs) {
+        this.lpInfoResult_outputs = lpInfoResult_outputs;
+    }
+
+    public void add(LpInfoResult_output lpInfoResult_output) {
+
+    }
+}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+import org.joda.time.DateTime;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+
+/**
+ * 最小的规则启用日期。
+ */
+public class MinRuleQyrqFunction implements AccumulateFunction {
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+    }
+
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+
+    }
+
+    protected static class MinRuleQyrqData implements Externalizable {
+        public DateTime min;
+
+        public MinRuleQyrqData() {}
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            min = (DateTime) in.readObject();
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeObject(min);
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new MinRuleQyrqData();
+    }
+
+    @Override
+    public void init(Serializable context) throws Exception {
+        // TODO：
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object value) {
+        MinRuleQyrqData minRuleQyrqData = (MinRuleQyrqData) context;
+        ScheduleRule_input scheduleRule_input = (ScheduleRule_input) value;
+
+        if (minRuleQyrqData.min == null) {
+            minRuleQyrqData.min = scheduleRule_input.getQyrq();
+        } else if (scheduleRule_input.getQyrq().isBefore(minRuleQyrqData.min)) {
+            minRuleQyrqData.min = scheduleRule_input.getQyrq();
+        }
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return false;
+    }
+
+    @Override
+    public void reverse(Serializable serializable, Object o) throws Exception {
+
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return DateTime.class;
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        MinRuleQyrqData minRuleQyrqData = (MinRuleQyrqData) context;
+        return minRuleQyrqData.min;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3,4 +3,5 @@ package com.bsth.service.schedule;
 import accumulate com.bsth.service.schedule.rules.ttinfo2.ErrorBcCountFunction ecount;
 import accumulate com.bsth.service.schedule.rules.shiftloop.GidsCountFunction gidscount;
 import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbTimeFunction gidfbtime;
-import accumulate com.bsth.service.schedule.rules.ttinfo.LpInfoResultsFunction lpinforesult;
 \ No newline at end of file
+import accumulate com.bsth.service.schedule.rules.ttinfo.LpInfoResultsFunction lpinforesult;
+import accumulate com.bsth.service.schedule.rules.ttinfo.MinRuleQyrqFunction minruleqyrq
 \ No newline at end of file
-package com.bsth.service.schedule.shiftloop;
-
-import org.joda.time.*;
-import java.util.*;
-
-import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
-
-import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
-import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
-
-import org.slf4j.Logger;
-
-global Logger log;
-global ScheduleResults_output scheduleResult;
-
-/*
-    存在（翻班格式）
-*/
-
-//------------------------- 第一阶段、计算规则准备数据（天数） ----------------------------//
-
-declare Calcu_days_result_pre
-    ruleId: String // 规则Id
-
-    calcu_index_lp : Integer // 计算之后路牌的起始索引
-    calcu_index_ry : Integer // 计算之后人员的起始索引
-
-    // 1、第一部分循环需要用到的数据（当开始日期大于启用日期的时候才有）
-    calcu_start_date_1: DateTime // 第一部分开始计算日期
-    calcu_end_date_1: DateTime // 第一部分结束计算日期
-
-    // 2、第二部分循环需要用到的数据
-    sdays : Integer // 总共需要排班的天数
-    calcu_start_date_2 : DateTime // 开始计算日期
-    calcu_end_date_2 : DateTime // 结束计算日期
-
-end
-
-/*
-    计算启用日期，开始计算日期，结束计算日期，相差天数
-    1、规则启用日期小于开始计算日期
-    2、规则启用日期大于等于开始日期，小于等于结束日期
-*/
-// 1、启用日期 < 开始日期
-rule "calcu_days_1_"
-    salience 1000
-    when
-        ScheduleCalcuParam_input(
-            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
-            $fromDate : fromDate,
-            $toDate : toDate
-        )
-        ScheduleRule_input(
-            $ruleId : ruleId, $qyrq : qyrq,
-            $lpindex : startGbdIndex, $ryindex: startEIndex)
-        eval($qyrq.isBefore($fromDate))
-    then
-        // 构造Calcu_days_result_pre，用于路牌
-        Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
-        cdrp.setRuleId($ruleId);
-        cdrp.setCalcu_index_lp($lpindex);
-        cdrp.setCalcu_index_ry($ryindex);
-        cdrp.setCalcu_start_date_1($qyrq);
-        cdrp.setCalcu_end_date_1($fromDate);
-        Period p2 = new Period($fromDate, $toDate, PeriodType.days());
-        cdrp.setSdays(p2.getDays() + 1);
-        cdrp.setCalcu_start_date_2($fromDate);
-        cdrp.setCalcu_end_date_2($toDate);
-
-        insert(cdrp);
-
-        log.info("总共需要排班的天数 sdays={} ruleId={}", (p2.getDays() + 1), $ruleId);
-
-end
-
-// 启用日期 属于 [开始日期，结束日期]
-rule "calcu_days_2_"
-    salience 1000
-    when
-        ScheduleCalcuParam_input(
-            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
-            $fromDate : fromDate,
-            $toDate : toDate
-        )
-        ScheduleRule_input(
-            $ruleId : ruleId, $qyrq : qyrq,
-            $lpindex : startGbdIndex, $ryindex: startEIndex)
-        eval((!$qyrq.isBefore($fromDate)) && (!$qyrq.isAfter($toDate)))
-    then
-        // 构造Calcu_days_result_pre，用于路牌
-        Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
-        cdrp.setRuleId($ruleId);
-        cdrp.setCalcu_index_lp($lpindex);
-        cdrp.setCalcu_index_ry($ryindex);
-        cdrp.setCalcu_start_date_1($qyrq);
-        cdrp.setCalcu_end_date_1($qyrq);
-        Period p2 = new Period($qyrq, $toDate, PeriodType.days());
-        cdrp.setSdays(p2.getDays() + 1);
-        cdrp.setCalcu_start_date_2($qyrq);
-        cdrp.setCalcu_end_date_2($toDate);
-
-        insert(cdrp);
-
-        log.info("总共需要排班的天数 sdays={} ruleId={}", (p2.getDays() + 1), $ruleId);
-
-end
-
-//------------------------- 第二阶段、计算规则准备数据2（第一组循环） ----------------------------//
-rule "Calcu_loop1_1_" // 时刻表的关联的路牌不存在，调整翻版规则
-    salience 900
-    when
-        $cdrp: Calcu_days_result_pre(
-            calcu_start_date_1.isBefore(calcu_end_date_1),
-            $csd1: calcu_start_date_1,
-            $ced1: calcu_end_date_1,
-            $ruleId: ruleId,
-            $lpindex: calcu_index_lp,
-            $ryindex: calcu_index_ry
-        )
-        $sri: ScheduleRule_input(
-            ruleId == $ruleId,
-            $gids: guideboardIds,
-            $lprangesize : guideboardIds.size(),
-            $ryrangesize: employeeConfigIds.size()
-        )
-        $liro: LpInfoResult_output(
-            dateTime.isEqual($csd1),
-            $gids.get($lpindex) == lpId,
-            $lpId: lpId
-        )
-    then
-        $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
-        $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
-        $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
-
-        log.info("Calcu_loop1_1_ ruleId={}, calcu_index_lp/ry={}/{}",
-            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
-
-        update($cdrp);
-end
-
-rule "Calcu_loop1_2_" // 时刻表的关联路牌存在，就翻
-    salience 800
-    when
-        $cdrp: Calcu_days_result_pre(
-            calcu_start_date_1.isBefore(calcu_end_date_1),
-            $csd1: calcu_start_date_1,
-            $ced1: calcu_end_date_1,
-            $ruleId: ruleId
-        )
-        $sri: ScheduleRule_input(
-            ruleId == $ruleId,
-            $rangesize : guideboardIds.size()
-        )
-    then
-        $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
-
-        log.info("Calcu_loop1_2_ ruleId={}, calcu_index_lp/ry={}/{}",
-            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
-
-        update($cdrp);
-end
-
-
-//----------------------- 路牌范围循环计算 ------------------------//
-
-//declare Calcu_guideboard_index_result
-//    ruleId : String // 规则Id
-//    calcu_index : Integer // 计算之后的起始索引
-//end
-//
-//// 启用日期等于开始日期
-//rule "calcu_guideboard_index_qyrq_eq_startrq"
-//    when
-//        $calcu_days_result : Calcu_days_result(
-//            qyrq_days == 0,
-//            $ruleId: ruleId
-//        )
-//        $scheduleRule_input : ScheduleRule_input(
-//            ruleId == $ruleId,
-//            $oindex : startGbdIndex
-//        )
-//    then
-//        Calcu_guideboard_index_result cgir = new Calcu_guideboard_index_result();
-//        cgir.setRuleId($ruleId);
-//        cgir.setCalcu_index($oindex);
-//
-//        log.info("calcu_guideboard_index_qyrq_eq_startrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
-//
-//        insert(cgir);
-//end
-//
-//// 开始日期大于启用日期
-//rule "calcu_guideboard_index_startrq_gt_qyrq"
-//    when
-//        $calcu_days_result : Calcu_days_result(
-//            qyrq_days > 0,
-//            $ruleId: ruleId, $qyrq_days: qyrq_days,
-//            $calcu_start_date: calcu_start_date
-//        )
-//        $scheduleRule_input : ScheduleRule_input(
-//            ruleId == $ruleId,
-//            $qyrq: qyrq,
-//            $rangesize : guideboardIds.size(),
-//            $oindex : startGbdIndex,
-//            $weekdays: weekdays
-//        )
-//    then
-//        // 开始时间
-//        DateTime initDate = $qyrq;
-//        int index = $oindex;
-//        int resultIndex = index;
-//
-//        while (!initDate.isAfter($calcu_start_date)) {
-//            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
-//                resultIndex = index;
-//                index = (index + 1) % $rangesize;
-//            }
-//            initDate = initDate.plusDays(1);
-//        }
-//
-//        Calcu_guideboard_index_result cgir = new Calcu_guideboard_index_result();
-//        cgir.setRuleId($ruleId);
-//        cgir.setCalcu_index(resultIndex);
-//
-//        log.info("calcu_guideboard_index_startrq_gt_qyrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
-//
-//        insert(cgir);
-//end
-//
-////----------------------- 人员范围循环计算 ------------------------//
-//
-//declare Calcu_employee_index_result
-//    ruleId : String // 规则Id
-//    calcu_index : Integer // 计算之后的起始索引
-//end
-//
-//// 启用日期等于开始日期
-//rule "calcu_employee_index_qyrq_eq_startrq"
-//    when
-//        $calcu_days_result : Calcu_days_result(
-//            qyrq_days == 0,
-//            $ruleId: ruleId)
-//        $scheduleRule_input : ScheduleRule_input(
-//            ruleId == $ruleId,
-//            $oindex : startEIndex)
-//    then
-//        Calcu_employee_index_result cgir = new Calcu_employee_index_result();
-//        cgir.setRuleId($ruleId);
-//        cgir.setCalcu_index($oindex);
-//
-//        log.info("calcu_employee_index_qyrq_eq_startrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
-//
-//        insert(cgir);
-//end
-//
-//// 开始日期大于启用日期
-//rule "calcu_employee_index_startrq_gt_qyrq"
-//    when
-//        $calcu_days_result : Calcu_days_result(
-//            qyrq_days > 0,
-//            $ruleId: ruleId, $qyrq_days: qyrq_days,
-//            $calcu_start_date: calcu_start_date
-//        )
-//        $scheduleRule_input : ScheduleRule_input(
-//            ruleId == $ruleId,
-//            $qyrq: qyrq,
-//            $rangesize : employeeConfigIds.size(),
-//            $oindex : startEIndex,
-//            $weekdays: weekdays
-//        )
-//    then
-//        // 开始时间
-//        DateTime initDate = $qyrq;
-//        int index = $oindex;
-//        int resultIndex = index;
-//
-//        while (!initDate.isAfter($calcu_start_date)) {
-//            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
-//                resultIndex = index;
-//                index = (index + 1) % $rangesize;
-//            }
-//            initDate = initDate.plusDays(1);
-//        }
-//
-//        Calcu_employee_index_result cgir = new Calcu_employee_index_result();
-//        cgir.setRuleId($ruleId);
-//        cgir.setCalcu_index(resultIndex);
-//
-//        log.info("calcu_employee_index_startrq_gt_qyrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
-//
-//        insert(cgir);
-//
-//end
-//
-////------------------------- 第三阶段、循环计算 ------------------------//
-//
-////----------------------- 路牌范围循环计算 ------------------------//
-//declare loop_guideboard_result
-//    ruleId : String // 规则id
-//    go_list : List // 路牌循环的列表
-//end
-//
-//// 循环路牌计算
-//rule "Calcu_loop_guideboard_result"
-//    when
-//        Calcu_days_result(
-//            $ruleId: ruleId,
-//            $startDate : calcu_start_date,
-//            $calcu_end_date: calcu_end_date
-//        )
-//        $ruleData : ScheduleRule_input(
-//            ruleId == $ruleId,
-//            $rangesize : guideboardIds.size(),
-//            $weekdays: weekdays
-//        )
-//        $indexData : Calcu_guideboard_index_result(
-//            ruleId == $ruleId
-//        )
-//    then
-//        DateTime initDate = $startDate; // 开始时间
-//        DateTime endDate = $calcu_end_date; // 结束实际
-//        List<ScheduleResult_output> scheduleResult_outputs =
-//            new ArrayList<ScheduleResult_output>();
-//
-//        int i = $indexData.getCalcu_index();
-//        if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue() == false) {
-//            i = (i + 1) % $rangesize;
-//        }
-//
-//        while (!initDate.isAfter(endDate)) {
-//            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
-//                ScheduleResult_output ro = new ScheduleResult_output();
-//                ro.setRuleId($ruleId);
-//                ro.setSd(initDate);
-//                ro.setGuideboardId($ruleData.getGuideboardIds().get(i));
-//                ro.setCarConfigId($ruleData.getCarConfigId());
-//                scheduleResult_outputs.add(ro);
-//
-//                i = (i + 1) % $rangesize;
-//            }
-//
-//            initDate = initDate.plusDays(1);
-//        }
-//
-//        loop_guideboard_result clgr = new loop_guideboard_result();
-//        clgr.setRuleId($ruleId);
-//        clgr.setGo_list(scheduleResult_outputs);
-//
-//        log.info(String.valueOf(scheduleResult_outputs.size()));
-//
-//        insert(clgr);
-//
-//end
-//
-////----------------------- 人员范围循环计算 ------------------------//
-//declare loop_employee_result
-//    ruleId : String // 规则id
-//    eo_list : List // 人员循环的列表
-//end
-//
-//// 循环人员计算
-//rule "Calcu_loop_employee_result"
-//    when
-//        Calcu_days_result(
-//            $ruleId: ruleId,
-//            $startDate : calcu_start_date,
-//            $calcu_end_date: calcu_end_date
-//        )
-//        $ruleData : ScheduleRule_input(
-//            ruleId == $ruleId,
-//            $rangesize : employeeConfigIds.size(),
-//            $weekdays: weekdays
-//        )
-//        $indexData : Calcu_employee_index_result(
-//            ruleId == $ruleId
-//        )
-//    then
-//        DateTime initDate = $startDate; // 开始时间
-//        DateTime endDate = $calcu_end_date; // 结束实际
-//        List<ScheduleResult_output> scheduleResult_outputs =
-//            new ArrayList<ScheduleResult_output>();
-//
-//        int i = $indexData.getCalcu_index();
-//        if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue() == false) {
-//            i = (i + 1) % $rangesize;
-//        }
-//
-//        while (!initDate.isAfter(endDate)) {
-//            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
-//                ScheduleResult_output ro = new ScheduleResult_output();
-//                ro.setRuleId($ruleId);
-//                ro.setSd(initDate);
-//                ro.setEmployeeConfigId($ruleData.getEmployeeConfigIds().get(i));
-//                ro.setCarConfigId($ruleData.getCarConfigId());
-//                scheduleResult_outputs.add(ro);
-//
-//                i = (i + 1) % $rangesize;
-//            }
-//
-//            initDate = initDate.plusDays(1);
-//        }
-//
-//        loop_employee_result clgr = new loop_employee_result();
-//        clgr.setRuleId($ruleId);
-//        clgr.setEo_list(scheduleResult_outputs);
-//
-//        log.info(String.valueOf(scheduleResult_outputs.size()));
-//
-//        insert(clgr);
-//end
-//
-////------------------------- 第四阶段、范围组循环计算 ----------------------------//
-//
-//global ScheduleResults_output scheduleResult;
-//
-//rule "output"
-//    when
-//        loop_guideboard_result(
-//            go_list.size() > 0,
-//            $ruleId : ruleId, $go_list : go_list
-//        )
-//        loop_employee_result(
-//            ruleId == $ruleId,
-//            eo_list.size() == $go_list.size(),
-//            $eo_list : eo_list
-//        )
-//    then
-//        for (int i = 0; i < $go_list.size(); i++) {
-//            ScheduleResult_output go = (ScheduleResult_output) $go_list.get(i);
-//            ScheduleResult_output eo = (ScheduleResult_output) $eo_list.get(i);
-//            go.setEmployeeConfigId(eo.getEmployeeConfigId());
-//            scheduleResult.getResults().add(go);
-//        }
-//
-//end
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-
-
+package com.bsth.service.schedule.shiftloop;
+
+import org.joda.time.*;
+import java.util.*;
+
+import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
+
+import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
+
+import org.slf4j.Logger;
+
+global Logger log;
+global ScheduleResults_output scheduleResult;
+
+/*
+    存在（翻班格式）
+*/
+
+//------------------------- 第一阶段、计算规则准备数据（天数） ----------------------------//
+
+declare Calcu_days_result_pre
+    ruleId: String // 规则Id
+
+    calcu_index_lp : Integer // 计算之后路牌的起始索引
+    calcu_index_ry : Integer // 计算之后人员的起始索引
+
+    // 1、第一部分循环需要用到的数据（当开始日期大于启用日期的时候才有）
+    calcu_start_date_1: DateTime // 第一部分开始计算日期
+    calcu_end_date_1: DateTime // 第一部分结束计算日期
+
+    // 2、第二部分循环需要用到的数据
+    sdays : Integer // 总共需要排班的天数
+    calcu_start_date_2 : DateTime // 开始计算日期
+    calcu_end_date_2 : DateTime // 结束计算日期
+
+end
+
+/*
+    计算启用日期，开始计算日期，结束计算日期，相差天数
+    1、规则启用日期小于开始计算日期
+    2、规则启用日期大于等于开始日期，小于等于结束日期
+*/
+// 1、启用日期 < 开始日期
+rule "calcu_days_1_"
+    salience 1000
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate
+        )
+        ScheduleRule_input(
+            $ruleId : ruleId, $qyrq : qyrq,
+            $lpindex : startGbdIndex, $ryindex: startEIndex)
+        eval($qyrq.isBefore($fromDate))
+    then
+        // 构造Calcu_days_result_pre，用于路牌
+        Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
+        cdrp.setRuleId($ruleId);
+        cdrp.setCalcu_index_lp($lpindex);
+        cdrp.setCalcu_index_ry($ryindex);
+        cdrp.setCalcu_start_date_1($qyrq);
+        cdrp.setCalcu_end_date_1($fromDate);
+        Period p2 = new Period($fromDate, $toDate, PeriodType.days());
+        cdrp.setSdays(p2.getDays() + 1);
+        cdrp.setCalcu_start_date_2($fromDate);
+        cdrp.setCalcu_end_date_2($toDate);
+
+        insert(cdrp);
+
+        log.info("总共需要排班的天数 sdays={} ruleId={} from={} to={}", (p2.getDays() + 1), $ruleId, $fromDate, $toDate);
+
+end
+
+// 启用日期 属于 [开始日期，结束日期]
+rule "calcu_days_2_"
+    salience 1000
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate
+        )
+        ScheduleRule_input(
+            $ruleId : ruleId, $qyrq : qyrq,
+            $lpindex : startGbdIndex, $ryindex: startEIndex)
+        eval((!$qyrq.isBefore($fromDate)) && (!$qyrq.isAfter($toDate)))
+    then
+        // 构造Calcu_days_result_pre，用于路牌
+        Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
+        cdrp.setRuleId($ruleId);
+        cdrp.setCalcu_index_lp($lpindex);
+        cdrp.setCalcu_index_ry($ryindex);
+        cdrp.setCalcu_start_date_1($qyrq);
+        cdrp.setCalcu_end_date_1($qyrq);
+        Period p2 = new Period($qyrq, $toDate, PeriodType.days());
+        cdrp.setSdays(p2.getDays() + 1);
+        cdrp.setCalcu_start_date_2($qyrq);
+        cdrp.setCalcu_end_date_2($toDate);
+
+        insert(cdrp);
+
+        log.info("总共需要排班的天数 sdays={} ruleId={} from={} to={}", (p2.getDays() + 1), $ruleId, $qyrq, $toDate);
+
+end
+
+//------------------------- 第二阶段、计算规则准备数据2（第一组循环） ----------------------------//
+rule "Calcu_loop1_1_" // 路牌在时刻表中存在，就翻
+    salience 900
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isBefore(calcu_end_date_1),
+            $csd1: calcu_start_date_1,
+            $ced1: calcu_end_date_1,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $gids: guideboardIds,
+            $lprangesize : guideboardIds.size(),
+            $ryrangesize: employeeConfigIds.size()
+        )
+        $liro: LpInfoResult_output(
+            dateTime.isEqual($csd1),
+            $gids.get($lpindex) == lpId,
+            $lpId: lpId
+        )
+    then
+        $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
+        $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
+        $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
+
+        log.info("Calcu_loop1_1_ ruleId={}, calcu_index_lp/ry={}/{}",
+            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+
+        update($cdrp);
+end
+
+rule "Calcu_loop1_2_" // 路牌在时刻表中不存在，就不翻
+    salience 900
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isBefore(calcu_end_date_1),
+            $csd1: calcu_start_date_1,
+            $ced1: calcu_end_date_1,
+            $ruleId: ruleId
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $rangesize : guideboardIds.size()
+        )
+    then
+        $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
+
+        log.info("Calcu_loop1_2_ ruleId={}, calcu_index_lp/ry={}/{}",
+            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+
+        update($cdrp);
+end
+
+//------------------------- 第三阶段、计算规则准备数据2（第二组循环） ----------------------------//
+rule "Calcu_loop2_1_" // 路牌在时刻表中存在，就翻
+    salience 800
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isEqual(calcu_end_date_1),
+            calcu_start_date_2.isBefore(calcu_end_date_2) || calcu_start_date_2.isEqual(calcu_end_date_2),
+            $csd2: calcu_start_date_2,
+            $ced2: calcu_end_date_2,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $cid: carConfigId,
+            $gids: guideboardIds,
+            $eids: employeeConfigIds,
+            $lprangesize : guideboardIds.size(),
+            $ryrangesize: employeeConfigIds.size()
+        )
+        $liro: LpInfoResult_output(
+            dateTime.isEqual($csd2),
+            $gids.get($lpindex) == lpId,
+            $lpId: lpId
+        )
+    then
+        ScheduleResult_output ro = new ScheduleResult_output();
+        ro.setRuleId($ruleId);
+        ro.setSd($csd2);
+        ro.setGuideboardId(String.valueOf($gids.get($lpindex)));
+        ro.setEmployeeConfigId(String.valueOf($eids.get($ryindex)));
+        ro.setCarConfigId($cid);
+
+        scheduleResult.getResults().add(ro);
+
+        $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
+        $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
+        $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+
+        log.info("Calcu_loop2_1_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+
+        update($cdrp);
+end
+
+rule "Calcu_loop2_2_" // 路牌在时刻表中不存在，就不翻
+    salience 800
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isEqual(calcu_end_date_1),
+            calcu_start_date_2.isBefore(calcu_end_date_2) || calcu_start_date_2.isEqual(calcu_end_date_2),
+            $csd2: calcu_start_date_2,
+            $ced2: calcu_end_date_2,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $cid: carConfigId,
+            $gids: guideboardIds,
+            $eids: employeeConfigIds
+
+        )
+    then
+        ScheduleResult_output ro = new ScheduleResult_output();
+        ro.setRuleId($ruleId);
+        ro.setSd($csd2);
+        ro.setGuideboardId(String.valueOf($gids.get($lpindex)));
+        ro.setEmployeeConfigId(String.valueOf($eids.get($ryindex)));
+        ro.setCarConfigId($cid);
+
+        scheduleResult.getResults().add(ro);
+
+        $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+
+        log.info("Calcu_loop2_2_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+
+        update($cdrp);
+end
+
+
+
+
+
+
@@ -10,6 +10,8 @@ import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
 import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
 import com.bsth.service.schedule.rules.ttinfo.LpInfoResults_output;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.entity.schedule.TTInfo;
@@ -38,7 +40,18 @@ function Map ttidParams(List ttinfolist) {
     TODO：规则说明，以后待说明
 */
-// TODO：
+//----------------- pre 预处理 param对象 -----------------------//
+
+rule "pre_calcu_TTInfoCalcuParam_input"
+    no-loop
+    salience 1000
+    when
+        $ttp: TTInfoCalcuParam_input($xlId : xlId)
+        $minqyrq: DateTime() from accumulate ($sri: ScheduleRule_input(xlId == $xlId), minruleqyrq($sri))
+    then
+        $ttp.setFromDate($minqyrq);
+        update($ttp);
+end
 //----------------- 第一阶段、计算规则准备数据（天数）----------------//
@@ -7,7 +7,7 @@
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">用油管理</span> <i class="fa fa-circle"></i></li>
-	<li><a href="list.html" data-pjax>进场场油量</a> <i class="fa fa-circle"></i></li>
+	<li><a href="list_ph.html" data-pjax>进场场油量</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">进场站油量信息编辑</span></li>
 </ul>
@@ -46,7 +46,7 @@
 				<div class="form-group">
 					<label class="col-md-3 control-label">开始营运日期</label>
 					<div class="col-md-4">
-							<input type="text" class="form-control" name="jhsj" >
+							<input type="time" class="form-control" name="jhsj" >
 							<span class="help-block"> 如：12:12</span>
 					</div>
 				</div>
@@ -326,33 +326,26 @@
 				submitHandler : function(f) {
 					var params = form.serializeJSON();
 					error.hide();
-					
+					var nbbm=$("#nbbm").val();
+					var date=$("#date").val();
+					var jsy=$("#jsy").val();
+					var map={};
+					map["nbbm"]=nbbm;
+					map["date"]=date;
+					map["jsy"]=jsy;
 					//检查一下用户是否存在
-					$post('/ylb/saveYlb', params, function(){
-						layer.msg('添加信息成功.');
-						loadPage('list.html');
-					});
-// 					$get('/user/all', {userName_eq: params.userName}, function(list){
-// 						if(!list || list.length == 0){
-							/*  console.log(params);
-							$.ajax({
-								url: '/ylb/saveYlb',
-								type: 'POST',
-								traditional: true,
-								data: params,
-								success: function(res){
-									layer.msg('添加信息成功.');
-									loadPage('list.html');
-								}
-							});  */
-							/* $post('/user', params, function(res){
-								layer.msg('添加用户成功.');
+						$get('/ylb/checkYl', map, function(fage){
+							console.log(fage);
+						if(fage!=""){
+							layer.msg('该驾驶员当天已存在.');
+						}else{
+							$post('/ylb/saveYlb', params, function(){
+								layer.msg('添加信息成功.');
 								loadPage('list.html');
-							}); */
-// 						}
-// 						else
-// 							layer.alert('用户【' + params.userName + '】已存在', {icon: 2, title: '提交被拒绝'});
-// 					});
+							});
+						}
+						
+					});
 				}
 			});
 		});
@@ -203,38 +203,46 @@
             {{obj.xlname}}
         </td>
         <td>
-            {{obj.nbbm}}
+			<lable data-id="{{obj.id}}" class="in_carpark_nbbm">{{obj.nbbm}}</lable>
+           
         </td>
         <td>
             {{obj.jsy}}
         </td>
         <td>
-            {{obj.jzl}}
+           
+			<lable data-id="{{obj.id}}" class="in_carpark_jzl"> {{obj.jzl}}</lable>
         </td>
         <td>
-            {{obj.czyl}}
+            
+			<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_czyl" 
+            type="text" value=" {{obj.czyl}}" style=" width:40px" 
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
         </td>
         <td>
 			<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_jzyl" 
-type="text" value=" {{obj.jzyl}}" style=" width:40px"  onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"  
-onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')">
+            type="text" value=" {{obj.jzyl}}" style=" width:40px"  
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
         </td>
         <td>
-            {{obj.yh}}
+			 {{obj.yh}}
         </td>
         <td>
-			<select data-id="{{obj.id}}" class="in_carpark_rylx">
+			<select data-id="{{obj.id}}" class="in_carpark_rylx" style=" width:80px" >
 				<option value='0' {{if obj.rylx==0}}  selected = 'selected' {{/if}}>0号柴油</option> 
 				<option value='1' {{if obj.rylx==1}}  selected = 'selected' {{/if}}>负10号柴油</option> 
 			</select>
         </td>
         <td>
 			<input data-id="{{obj.id}}" href="javascript:;" 
-class="in_carpark_ns" type="text" value=" {{obj.ns}}" style=" width:40px"  onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"  
-onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')">
+            class="in_carpark_ns" type="text" value=" {{obj.ns}}" style=" width:40px" 
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
         </td>
         <td>
-			<select data-id="{{obj.id}}" class="in_carpark_shyy">
+			<select data-id="{{obj.id}}" class="in_carpark_shyy" style=" width:80px">
 				<option value='0' {{if obj.shyy==0}}  selected = 'selected' {{/if}}>请选择</option> 
 				<option value='1' {{if obj.shyy==1}}  selected = 'selected' {{/if}}>票务用油</option> 
 				<option value='2' {{if obj.shyy==2}}  selected = 'selected' {{/if}}>保养用油</option> 
@@ -247,15 +255,20 @@ onafterpaste=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;)&quot;&gt;
 			</select>
         </td>
         <td>
-		<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_shyl" type="text" 
-value=" {{obj.sh}}" style=" width:40px" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'')"  
-onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'')" >
-        </td>
+		<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_shyl"
+			value={{obj.sh}} style=" width:40px" type="text" 
+onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
+        
+</td>
         <td>
             {{obj.zlc}}
         </td>
         <td>
-            {{obj.yhlx}}
+			<select data-id="{{obj.id}}" class="in_carpark_yhlx">
+				<option value='0' {{if obj.yhlx==0}}  selected = 'selected' {{/if}}>手录</option> 
+				<option value='1' {{if obj.yhlx==1}}  selected = 'selected' {{/if}}>拆分</option> 
+			</select>
         </td>
         <td>
             {{obj.bglyh}}
@@ -307,48 +320,105 @@ onafterpaste=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;)&quot; &gt;
         //保存
         $("#saveButton").on('click',function(){
         	var ylArray = [];
-        	/* $('input.icheck:checked').each(function(){
-        		var map = {};
-        		var id=$(this).data('id');
-        		var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').html();
-        		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').html();
-                var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
-                map['id']=id;
-                map['jzyl']=jzyl;
-                map['sh']=sh;
-                map['shyy']=shyy;
-                ylArray.push(map);
-        	}) */
-        	
         	$('input.icheck').each(function(){
         		var map = {};
         		var id=$(this).data('id');
+        		var jzl =$('.in_carpark_jzl[data-id='+id+']', '#ll_oil_list').html();
+        		if(jzl=="" || jzl ==null){
+        			jzl=0;
+        		}
+        		var czyl=$('.in_carpark_czyl[data-id='+id+']', '#ll_oil_list').val();
+        		if(czyl=="" || czyl==null){
+        			czyl=0;
+        		}
         		var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
+        		if(jzyl=="" || jzyl==null){
+        			jzyl=0;
+        		}
+        		
         		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
+        		if(sh=="" || sh==null){
+        			sh=0;
+        		}
+        		
                 var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
                 var ns =  $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
+                if(ns=="" || ns==null){
+                	ns=0;
+        		}
+                
                 var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
+                var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#ll_oil_list').val();
+                
                 map['id']=id;
+                map['jzl']=jzl;
+                map['czyl']=czyl;
                 map['jzyl']=jzyl;
                 map['sh']=sh;
                 map['shyy']=shyy;
                 map['ns']=ns;
                 map['rylx']=rylx;
+                map['yhlx']=yhlx;
                 ylArray.push(map);
         	})
         	var params = {};
         	params['ylbList']=JSON.stringify(ylArray);
+        	console.log(JSON.stringify(ylArray));
         	 var i = layer.load(2);
-        	 $get('/ylb/saveYlbList', params, function () {
+        	  $post('/ylb/saveYlbList', params, function () {
              	layer.close(i);
              	var params1 =getParamsList();
                  jsDoQuery(params1, true);
-             }); 
+             });  
         })
         //拆分
         $("#sortButton").on('click', function () {
             if ($("#rq").val() != "") {
-                var id = $('input.icheck:checked').data('id');
+            	var ylArray = [];
+            	var nbbm="";
+            	var msg="";
+            	 $('input.icheck:checked').each(function(){
+            		 var map = {};
+             		var id=$(this).data('id');
+             		var clzbh =$('.in_carpark_nbbm[data-id='+id+']', '#ll_oil_list').html();
+             		if(nbbm.indexOf(clzbh)>-1){
+             			if(msg==""){
+             				msg += clzbh;
+             			}else{
+             				msg += ","+clzbh;
+             			}
+             		}else{
+             			nbbm +=clzbh;
+             			var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
+                 		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
+                        var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
+                        var ns =  $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
+                        var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
+                        map['id']=id;
+                        map['jzyl']=jzyl;
+                        map['sh']=sh;
+                        map['shyy']=shyy;
+                        map['ns']=ns;
+                        map['rylx']=rylx;
+                        ylArray.push(map);
+             		}
+             		
+            	}) ;
+            	 if(msg!=""){
+            		 layer.msg('内部编码为:【'+msg +'】的车辆请选择一条数据进行拆分.');
+            	 }else{
+            		 var params = {};
+             		params['ylbList']=JSON.stringify(ylArray);
+             		 var i = layer.load(2);
+                     $post('/ylb/sort', params, function () {
+                     	layer.close(i);
+                     	var params1 =getParamsList();
+                         jsDoQuery(params1, true);
+                     }); 
+             		
+            	 }
+            	
+               /*  var id = $('input.icheck:checked').data('id');
                 if (typeof(id) == 'undefined') {
                     layer.msg("请选择一行进行拆分");
@@ -370,7 +440,7 @@ onafterpaste=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;)&quot; &gt;
                         jsDoQuery(params1, true);
                     }); 
-                }
+                } */
             } else {
                 layer.msg('请选择日期.');
             }