重新统计update

娄高锋
1 parent 23b305af
Showing 4 changed files with 77 additions and 31 deletions
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/service/calc/CalcToolService.java
src/main/java/com/bsth/service/calc/impl/CalcToolServiceImpl.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
@@ -49,4 +49,13 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1 and s.xlBm=?2")
 	List<ScheduleRealInfo> findAllSchedule(String schDate, String lineCode);
  
+	/**
+	 * 根据日期获取班次信息
+	 * @param schDate
+	 * @return
+	 */
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1")
+	List<ScheduleRealInfo> findAllScheduleByDate(String schDate);
+	
 }
@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
  
 import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.Interval;
  
 /**
@@ -11,6 +12,6 @@ import com.bsth.entity.sys.Interval;
  */
 public interface CalcToolService {
  
-	List<CalcWaybill> findAll(String date, String line, List<Map<String, Object>> xlList, List<Interval> djgList);
+	List<CalcWaybill> findAll(String date, String line, List<ScheduleRealInfo> list, List<Map<String, Object>> xlList, List<Interval> djgList);
  
 }
@@ -5,12 +5,11 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
  
-import javax.swing.text.Keymap;
-
 import com.bsth.entity.calc.CalcInterval;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -53,26 +52,29 @@ public class CalcToolServiceImpl implements CalcToolService {
  
  
 	@Override
-    public List<CalcWaybill> findAll(String rq, String lineCode, List<Map<String, Object>> xlList, List<Interval> djgList) {
+    public List<CalcWaybill> findAll(String rq, String lineCode, List<ScheduleRealInfo> list, List<Map<String, Object>> xlList, List<Interval> djgList) {
     	List<CalcWaybill> listCal=new ArrayList<CalcWaybill>();
-        List<ScheduleRealInfo> list = clacRepository.findAllSchedule(rq,lineCode);
-        String sql ="select r.j_gh ,r.s_gh,r.cl_zbh,r.xl_bm, r.lp_name FROM"
-        		+ "  bsth_c_s_sp_info_real r  where  "
-        		+ " r.schedule_date_str='"+rq+"' and r.xl_bm = '"+lineCode+"'"
-        		+ " GROUP BY r.j_gh,r.s_gh,r.cl_zbh,r.xl_bm,r.lp_name ";
-
-		List<Map<String, String>> listMap = jdbcTemplate.query(sql, new RowMapper<Map<String, String>>() {
-			@Override
-			public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Map<String, String> c = new HashMap<String,String>();
-				c.put("jGh", arg0.getString("j_gh"));
-				c.put("sGh", arg0.getString("s_gh")==null?"":arg0.getString("s_gh"));
-				c.put("clZbh", arg0.getString("cl_zbh"));
-				c.put("xlBm", arg0.getString("xl_bm"));
-				c.put("lpName", arg0.getString("lp_name"));
-				return c;
+		
+        List<Map<String, String>> listMap = new ArrayList<Map<String, String>>();
+		Set<String> tempSet = new HashSet<String>();
+		for(ScheduleRealInfo s : list){
+			String jGh = s.getjGh()!=null?s.getjGh().trim():"";
+			String sGh = s.getsGh()!=null?s.getsGh().trim():"";
+			String clZbh = s.getClZbh()!=null?s.getClZbh().trim():"";
+			String xlBm = s.getXlBm()!=null?s.getXlBm().trim():"";
+			String lpName = s.getLpName()!=null?s.getLpName().trim():"";
+			String key = jGh + sGh + clZbh + xlBm + lpName;
+			if(tempSet.add(key)){
+				Map<String, String> m = new HashMap<String, String>();
+				m.put("jGh", jGh);
+				m.put("sGh", sGh);
+				m.put("clZbh", clZbh);
+				m.put("xlBm", xlBm);
+				m.put("lpName", lpName);
+				listMap.add(m);
 			}
-		});
+		}
+		
         for (int i = 0; i < listMap.size(); i++) {
 			Map<String, String> m=listMap.get(i);
 			String jGh=m.get("jGh");
@@ -196,6 +198,7 @@ public class CalcToolServiceImpl implements CalcToolService {
     //list_ 全部班次  lists_执行了的班次（实到实发不为空）
     private List<CalcWaybill> cul(List<ScheduleRealInfo> list_,List<ScheduleRealInfo> list_s, List<Map<String, Object>> xlList, List<Interval> djgList){
     	List<CalcWaybill> list=new ArrayList<CalcWaybill>();
+    	List<CalcWaybill> list2=new ArrayList<CalcWaybill>();
     	if(list_.size()>0){
     		Date date=list_.get(0).getScheduleDate();
     		String dateStr=list_.get(0).getScheduleDateStr();
@@ -356,8 +359,28 @@ public class CalcToolServiceImpl implements CalcToolService {
 		    	t_.setDtbczgf(0);
 		    	t_.setDtbcwgf(0);
 		    	list.add(t_);
+		    	list2.add(t_);
 	    	}
     	}
+    	for(CalcWaybill c2 : list2){
+    		boolean flag = true;
+			String key2 = c2.getjGh() + c2.getsGh()==null?"":c2.getsGh().trim()
+					+ c2.getCl() + c2.getXl() + c2.getLp();
+    		for(CalcWaybill c : list){
+    			String key = c.getjGh() + c.getsGh()==null?"":c.getsGh().trim()
+    					+ c.getCl() + c.getXl() + c.getLp();
+    			if(key2.equals(key)){
+    				c.setSjyylc(Arith.add(c.getSjyylc(), c2.getSjyylc()));
+    				c.setSjfyylc(Arith.add(c.getSjfyylc(), c2.getSjfyylc()));
+    				c.setLjyylc(Arith.add(c.getLjyylc(), c2.getLjyylc()));
+    				c.setLjfyylc(Arith.add(c.getLjfyylc(), c2.getLjfyylc()));
+    				flag = false;
+    				break;
+    			}
+    		}
+    		if(flag)
+    			list.add(c2);
+    	}
     	return list;
     }
  
@@ -33,6 +33,7 @@ import com.bsth.service.calc.CalcWaybillService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
+import com.bsth.util.BatchSaveUtils;
 import com.bsth.util.ReportUtils;
 import com.github.stuxuhai.jpinyin.PinyinException;
 import com.github.stuxuhai.jpinyin.PinyinFormat;
@@ -80,7 +81,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		if(date == null || date.trim().length() == 0){
 			Date d = new Date();
-			d.setTime(d.getTime() - (2 * 1000 * 60 * 60 * 24));
+			d.setTime(d.getTime() - (4 * 1000 * 60 * 60 * 24));
 			date = sdf.format(d);
 		}
 		if(line == null || line.trim().length() == 0){
@@ -120,7 +121,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	        	sql += " and xl_bm = '"+line+"'";
 //				sql += " where t.line_code = " + line;
 	        }
-	        sql += "group by xl_bm";
+	        sql += " group by xl_bm";
 			List<Map<String, Object>> listLineConfig = jdbcTemplate.query(sql,
 						new RowMapper<Map<String, Object>>(){
 					@Override
@@ -148,7 +149,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			Map<String, List<Map<String, Object>>> xlMap = new HashMap<String, List<Map<String, Object>>>();
 			for(Map<String, Object> m : xlList){
 				if(m.containsKey("line") && m.get("line").toString().trim().length() > 0){
-					String key = m.get("line").toString();
+					String key = m.get("line").toString().trim();
 					if(!xlMap.containsKey(key))
 						xlMap.put(key, new ArrayList<Map<String, Object>>());
 					xlMap.get(key).add(m);
@@ -166,7 +167,18 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					return m;
 			}});
  
+			Map<String, List<ScheduleRealInfo>> scheMap = new HashMap<String, List<ScheduleRealInfo>>();
+			List<ScheduleRealInfo> list = calcRepository.findAllScheduleByDate(date);
+			for(ScheduleRealInfo s : list){
+				String xlBm = s.getXlBm();
+				if(!scheMap.containsKey(xlBm)){
+					scheMap.put(xlBm, new ArrayList<ScheduleRealInfo>());
+				}
+				scheMap.get(xlBm).add(s);
+			}
+			
 			Set<String> lineSet = new HashSet<String>();
+			List<CalcWaybill> all = new ArrayList<CalcWaybill>();
 			for (int i = 0; i < listLineConfig.size(); i++) {
 				Map<String, Object> m =listLineConfig.get(i);
 				String lineCode=m.get("line_code").toString().trim();
@@ -179,13 +191,14 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					tempList = xlMap.get(lineCode);
 				}
  
-				List<CalcWaybill> findAll = calcToolService.findAll(date, lineCode, tempList, djgList);
+				if(!scheMap.containsKey(lineCode))
+					continue;
+				List<CalcWaybill> findAll = calcToolService.findAll(date, lineCode, scheMap.get(lineCode), tempList, djgList);
+				all.addAll(findAll);
  
-//				new BatchSaveUtils<CalcWaybill>().saveList2(findAll, CalcWaybill.class);
-
-//				if(xlMap.get(lineCode).size() == 0)
-				calcRepository.save(findAll);
 			}
+//			new BatchSaveUtils<CalcWaybill>().saveList2(all, CalcWaybill.class);
+			calcRepository.save(all);
  
 			newMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
@@ -405,7 +418,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	}
  
 	/**
-	 * @param rq 格式如：2018-03-22（留空""默认当前日期前一天）
+	 * @param rq 格式如：2018-03-22（留空""默认当前日期前两天）
 	 * @param line （留空""默认全部线路）
 	 */
 	@Transactional
@@ -419,7 +432,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				Date dBefore = new Date();
 				Calendar calendar = Calendar.getInstance(); //得到日历
 				calendar.setTime(dNow);//把当前时间赋给日历
-				calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
+				calendar.add(Calendar.DAY_OF_MONTH, -2);  //设置为前一天
 				dBefore = calendar.getTime();   //得到前一天的时间
 				rq = sdf.format(dBefore);
 			} else {