修改公里过滤没实发的方法，油量一车多单，一车一单赛选，统计日报烂班班次的修改

廖磊
1 parent 806da7ab
Showing 7 changed files with 127 additions and 42 deletions
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.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/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/statement/account.html
@@ -86,7 +86,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
 			+ " and xlbm like %?4%  and nbbm  like %?5% "
-			+ " group by nbbm,rq,ssgsdm,fgsdm,xlbm",nativeQuery=true)
+			+ " group by nbbm,rq,ssgsdm,fgsdm",nativeQuery=true)
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
@@ -291,7 +291,8 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				  + "from bsth_c_ylb where  to_days(rq)= to_days('"+rq+"' ) "
 				  		+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"'  group by nbbm "+
 				   " ) c on a.nbbm=c.nbbm  "
-				   + "where  a.nbbm like '%"+nbbm+"%' and a.gsdm='"+gsdm+"' and a.fgsdm ='"+fgsdm+"'";
+				   + "where  a.nbbm like '%"+nbbm+"%' and a.gsdm='"+gsdm+"' and a.fgsdm ='"+fgsdm+"'"
+				   		+ " order by a.nbbm";
 		List<Ylxxb> yList= jdbcTemplate.query(sql,
 				 new RowMapper<Ylxxb>(){
@@ -1000,6 +1000,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		return sumMap;
 	}
+	
+	
 	@Override
 	public List<Ylb> listYlb(Map<String, Object> map) {
 		// TODO Auto-generated method stub
@@ -1013,7 +1015,19 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		String sxtj=map.get("sxtj").toString();
 		if(nbbm.trim()!=""){
 			stringList.add(nbbm);
-			listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+			List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+			int cs=Integer.parseInt(objectLists.get(0)[1].toString());
+			if(sxtj.equals("1")){
+				if(cs==1){
+					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+				}
+			}
+			
+			if(sxtj.equals("2")){
+				if(cs>1){
+					listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+				}
+			}
 		}else{
 			//全部
 			if(sxtj.equals("0")){
@@ -819,8 +819,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
         for (int i = 0; i < scheduleRealInfos.size(); i++) {
             ScheduleRealInfo s=scheduleRealInfos.get(i);
-            if(s.getZdsjActual()!=null){
-                lists.add(s);
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+            	lists.add(s);
+            }else{
+	            if(s.getZdsjActual()!=null){
+	            	lists.add(s);
+	            }
             }
         }
         DecimalFormat format = new DecimalFormat("0.00");
@@ -1667,8 +1672,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s=list.get(i);
-            if(s.getZdsjActual()!=null){
-                lists.add(s);
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+            	lists.add(s);
+            }else{
+	            if(s.getZdsjActual()!=null){
+	            	lists.add(s);
+	            }
             }
         }
         double ksgl=culateService.culateKsgl(list);
@@ -1953,8 +1963,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo>  lists =new ArrayList<ScheduleRealInfo>();
         for (int i = 0; i < list_s.size(); i++) {
             ScheduleRealInfo s=list_s.get(i);
-            if(s.getZdsjActual()!=null){
-                lists.add(s);
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+            	lists.add(s);
+            }else{
+	            if(s.getZdsjActual()!=null){
+	            	lists.add(s);
+	            }
             }
         }
         Map<String, Object> map = new HashMap<String, Object>();
@@ -2556,8 +2571,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo>  lists=new ArrayList<ScheduleRealInfo>();
         for(int i=0;i<list.size();i++){
             ScheduleRealInfo s=list.get(i);
-            if(s.getZdsjActual()!=null){
-                lists.add(s);
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+            	lists.add(s);
+            }else{
+	            if(s.getZdsjActual()!=null){
+	            	lists.add(s);
+	            }
             }
         }
         Map<String, Object> map = new HashMap<String, Object>();
@@ -2631,8 +2651,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s=list.get(i);
-            if(s.getZdsjActual()!=null){
-                list_s.add(s);
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+            	 list_s.add(s);
+            }else{
+	            if(s.getZdsjActual()!=null){
+	                list_s.add(s);
+	            }
             }
         }
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
@@ -4235,8 +4260,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
         for (int i = 0; i < scheduleRealInfos.size(); i++) {
             ScheduleRealInfo s=scheduleRealInfos.get(i);
-            if(s.getZdsjActual()!=null){
-                lists.add(s);
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+            	lists.add(s);
+            }else{
+	            if(s.getZdsjActual()!=null){
+	            	lists.add(s);
+	            }
             }
         }
         DecimalFormat format = new DecimalFormat("0.00");
@@ -568,8 +568,16 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             //有子任务
             if (cts != null && cts.size() > 0) {
                 for(ChildTaskPlan c : cts){
-                    if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
-                        sum = Arith.add(sum, c.getMileage());
+                	if(item.equals("其他")){
+                		if(c.isDestroy() && 
+                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
+                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
+                            sum = Arith.add(sum, c.getMileage());
+                	}else{
+                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
+                            sum = Arith.add(sum, c.getMileage());
+                	}
+                    
                 }
             }
             else if(isInOut(sch))
@@ -1167,7 +1167,8 @@ public class ReportServiceImpl implements ReportService{
 		for (int i = 0; i < sList.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo = sList.get(i);
 			if (!(scheduleRealInfo.getBcType().equals("in") 
-					|| scheduleRealInfo.getBcType().equals("out"))) {
+					|| scheduleRealInfo.getBcType().equals("out")
+					||scheduleRealInfo.getBcType().equals("ldks"))) {
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 				if (childTaskPlans.isEmpty()) {
 					Map<String, Object> newMap = new HashMap<String, Object>();
@@ -1195,32 +1196,62 @@ public class ReportServiceImpl implements ReportService{
 				} else {
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-					while (it.hasNext()) {
-						ChildTaskPlan childTaskPlan = it.next();
-						if (childTaskPlan.isDestroy()) {
-							String destroyReason = "";
-							if ( childTaskPlan.getDestroyReason() == null) {
-								destroyReason = "其他";
-							}else if(childTaskPlan.getDestroyReason().equals("")){
-								destroyReason = "其他";
-							} else {
-								destroyReason = childTaskPlan.getDestroyReason();
+					if (scheduleRealInfo.getStatus() == -1) {
+						while (it.hasNext()) {
+							ChildTaskPlan childTaskPlan = it.next();
+							if (childTaskPlan.isDestroy()) {
+								String destroyReason = "";
+								if ( childTaskPlan.getDestroyReason() == null) {
+									destroyReason = "其他";
+								}else if(childTaskPlan.getDestroyReason().equals("")){
+									destroyReason = "其他";
+								} else {
+									destroyReason = childTaskPlan.getDestroyReason();
+								}
+								Map<String, Object> newMap = new HashMap<String, Object>();
+								newMap.put("nr", destroyReason);
+								newMap.put("lp", scheduleRealInfo.getLpName());
+								newMap.put("nbbm", scheduleRealInfo.getClZbh());
+								newMap.put("jgh", scheduleRealInfo.getjGh());
+								newMap.put("dz", childTaskPlan.getStartStationName());
+								newMap.put("sj", childTaskPlan.getStartDate());
+								newMap.put("gzf", " ");
+								newMap.put("lbbc", 1);
+								newMap.put("lblc", childTaskPlan.getMileage());
+								newMap.put("jyqp", childTaskPlan.getRemarks());
+								list.add(newMap);
+
 							}
-							Map<String, Object> newMap = new HashMap<String, Object>();
-							newMap.put("nr", destroyReason);
-							newMap.put("lp", scheduleRealInfo.getLpName());
-							newMap.put("nbbm", scheduleRealInfo.getClZbh());
-							newMap.put("jgh", scheduleRealInfo.getjGh());
-							newMap.put("dz", childTaskPlan.getStartStationName());
-							newMap.put("sj", childTaskPlan.getStartDate());
-							newMap.put("gzf", " ");
-							newMap.put("lbbc", 0);
-							newMap.put("lblc", childTaskPlan.getMileage());
-							newMap.put("jyqp", childTaskPlan.getRemarks());
-							list.add(newMap);
+						}
+					}else{
+						while (it.hasNext()) {
+							ChildTaskPlan childTaskPlan = it.next();
+							if (childTaskPlan.isDestroy()) {
+								String destroyReason = "";
+								if ( childTaskPlan.getDestroyReason() == null) {
+									destroyReason = "其他";
+								}else if(childTaskPlan.getDestroyReason().equals("")){
+									destroyReason = "其他";
+								} else {
+									destroyReason = childTaskPlan.getDestroyReason();
+								}
+								Map<String, Object> newMap = new HashMap<String, Object>();
+								newMap.put("nr", destroyReason);
+								newMap.put("lp", scheduleRealInfo.getLpName());
+								newMap.put("nbbm", scheduleRealInfo.getClZbh());
+								newMap.put("jgh", scheduleRealInfo.getjGh());
+								newMap.put("dz", childTaskPlan.getStartStationName());
+								newMap.put("sj", childTaskPlan.getStartDate());
+								newMap.put("gzf", " ");
+								newMap.put("lbbc", 0);
+								newMap.put("lblc", childTaskPlan.getMileage());
+								newMap.put("jyqp", childTaskPlan.getRemarks());
+								list.add(newMap);
+							}
 						}
 					}
+					
 				}
 			}
 		}
@@ -1272,7 +1303,8 @@ public class ReportServiceImpl implements ReportService{
 			for (int i = 0; i < sList.size(); i++) {
 				ScheduleRealInfo scheduleRealInfo=sList.get(i);
 				if (!(scheduleRealInfo.getBcType().equals("in") 
-						|| scheduleRealInfo.getBcType().equals("out"))) {
+						|| scheduleRealInfo.getBcType().equals("out")
+						|| scheduleRealInfo.getBcType().equals("ldks"))) {
 //				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 //				if(childTaskPlans.isEmpty()){
 					if(scheduleRealInfo.isSflj()){
@@ -149,7 +149,7 @@
 			code = $("#code").val();
 			var type = "query";
 			$(".hidden").removeClass("hidden");
-			$post('/realSchedule/account',{line:line,date:date,code:code,xlName:xlName,type:type},function(result){
+			$get('/realSchedule/account',{line:line,date:date,code:code,xlName:xlName,type:type},function(result){
 				$.each(result, function(i, obj) {
 					obj.requestType = reqCodeMap[obj.requestType];
                 });