添加新的班次类型油量添加修改时间修改查询最早发车时间方法

廖磊
1 parent 3cad70dd
Showing 5 changed files with 77 additions and 44 deletions
src/main/java/com/bsth/entity/oil/Ylb.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
@@ -49,7 +49,9 @@ public class Ylb {
 	private int sjbc;
 	private String edituser;
 	private Date edittime;
+	private Date updatetime;
 	private Date createtime;
+
 	private int nylx;
 	//进场顺序（根据最先出场和最后进场来关联车辆的存油量）
 	private int jcsx;
@@ -321,6 +323,12 @@ public class Ylb {
 	}
-	
+	public Date getUpdatetime() {
+		return updatetime;
+	}
+
+	public void setUpdatetime(Date updatetime) {
+		this.updatetime = updatetime;
+	}
 }
@@ -79,6 +79,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	public String obtainDsq() throws Exception{
 		String result = "failure";
 		try { 
+			List<Ylb> addList = new ArrayList<Ylb>();
+			String type = "";
 			List<Cars> carsList=carsRepository.findCars();
 			 Map<String, Boolean> carsMap=new HashMap<String, Boolean>();
 			 for (int i = 0; i < carsList.size(); i++) {
@@ -126,6 +128,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								&&t1.getXlbm().equals(map.get("xlBm").toString()))
 						{
 							t=t1;
+							type="update";
 						}
 					}
@@ -182,13 +185,22 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setRq(sdf.parse(rq));
 						t.setCreatetime(dNow);
 						if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
-							repository.save(t);
+							if(type.equals("update")){
+								repository.save(t);
+							}else{
+								addList.add(t);
+							}
+							
 						}
 			}
-				result = "success";
+				
 			} 
+			if(addList.size()>0){ 
+				new BatchSaveUtils<Ylb>().saveList(addList, Ylb.class); 
+			}
+			result = "success";
 		}catch (Exception e) {
 			// TODO Auto-generated catch block
 			throw e;
@@ -334,11 +346,13 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
 					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 					t.setRq(sdf.parse(rq));
-					t.setCreatetime(date);
+					
 					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 						 if(type.equals("add")){
+							 t.setCreatetime(date);
 							 addList.add(t); 
 						 }else{
+							 t.setUpdatetime(date);
 						     updateList.add(t); 
 						     ins += t.getId().toString()+",";
 						  }
@@ -438,6 +452,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					map.put("xlbm_like", ylb.getXlbm());
 //					Iterator<Ylb> iterator2 = repository
 //							.findAll(new CustomerSpecs<Ylb>(map), new Sort(Direction.ASC, "jcsx")).iterator();
+					double czyl=0.0;
 					for (int j = 0; j < iterator2.size(); j++) {
 						Ylb t = iterator2.get(j);
 						if(t.getNbbm().equals(ylb.getNbbm())){
@@ -445,6 +460,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
 //								Double yl = t.getCzyl();
 //								Double jcyl = t.getCzyl();
+								czyl = t.getCzyl();
 								zyl =jzl;
 								Double yh=0.0;
 								if(zlc>0){
@@ -476,10 +492,18 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								}
 								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()),nextJzyl),yh);
 								if(zlc>0){
-									long l=Math.round(nextJzyl);
-									double ylxs=l*100/100;
-//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+									long l=0l;
+									double ylxs=0.0;
+									if(j==iterator2.size()-1){
+										ylxs=czyl;
+									}else{
+										l=Math.round(nextJzyl);
+										ylxs=l*100/100;
+										
+									}
 									yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+//									nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+									
 									t.setYh(yh);
 									t.setJzyl(ylxs);
 									nextJzyl=ylxs;
@@ -704,7 +728,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			}
 //			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
 			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, gsbm, fgsbm, xlbm, nbbm);
-			List<Cyl> cylList=cylRepository.obtainCyl(nbbm, gsbm);
 			List<Ylb> ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
 			for (int i = 0; i < ylxxbList.size(); i++) {
@@ -719,7 +742,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				}
 				if(fage){
-					Cyl cyl=null;
 					Ylb t=new Ylb();
 					t.setNbbm(y1.getNbbm());
 					t.setRq(y1.getYyrq());
@@ -749,23 +771,13 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						}
 					}
 					if(status){
-						for (int j = 0; j < cylList.size(); j++) {
-							Cyl c=cylList.get(j);
-							if(c.getNbbm().equals(y1.getNbbm())){
-								t.setCzyl(c.getCyl());
-								cyl=c;
-								status=false;
-								break;
-							}
-						}
-					}
-					if(status){
 						t.setCzyl(0.0);
 					}
 //					double jzyl=Arith.add(t.getJzl(), t.getCzyl());
 					t.setJzyl(Arith.add(t.getJzl(), t.getCzyl()));
 					t.setYh(0.0);
 					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+						 t.setCreatetime(new Date());
 						repository.save(t);
 						/*if(null!=cyl){
 							cyl.setCyl(Arith.add(t.getJzl(), t.getCzyl()));
@@ -1141,6 +1153,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				Double zyl = 0.0;
 				Double nextJzyl = 0.0;
 				// 车的，进，出油量及耗油
+				double czyl=0.0;
 				for (int i = 0; i < iterator2.size(); i++) {
 					Ylb t = iterator2.get(i);
 					if (t.getJcsx() == 1) {
@@ -1148,6 +1161,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							t.setSh(sh);
 							t.setShyy(shyy);
 						}
+						czyl=t.getCzyl();
 //						Double jcyl = t.getCzyl();
 						zyl =  jzl;
 						Double yh = 0.0;
@@ -1179,8 +1193,14 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							}
 							nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
 							if(zlc>0){
-								long l=Math.round(nextJzyl);
-								double ylxs=l*100/100;
+								long l=0l;
+								double ylxs=0.0;
+								if(i==iterator2.size()){
+									ylxs=czyl;
+								}else{
+									l=Math.round(nextJzyl);
+									ylxs=l*100/100;
+								}
 //								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
 								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
 								t.setYh(yh);
@@ -1791,8 +1791,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> list = null;
         list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
-		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        String sqlMinYysj="select start_opt from bsth_c_line_config where "
+        		+ " id = ("
+        		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
+        		+ ")";
+        String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
 		String[] minSjs = minfcsj.split(":");
 		Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
@@ -151,8 +151,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		int lbbc=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!(scheduleRealInfo.getBcType().equals("in") 
-					|| scheduleRealInfo.getBcType().equals("out"))) {
+			if (!isInOut(scheduleRealInfo)) {
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 				if(childTaskPlans.isEmpty()){
 					if(scheduleRealInfo.getStatus() == -1){
@@ -187,8 +186,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!(scheduleRealInfo.getBcType().equals("in") 
-					|| scheduleRealInfo.getBcType().equals("out"))) {
+			if (!isInOut(scheduleRealInfo)) {
 //			Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 //			if(childTaskPlans.isEmpty()){
 				if(scheduleRealInfo.isSflj()){
@@ -221,8 +219,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		double ljgl=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!(scheduleRealInfo.getBcType().equals("in") 
-					|| scheduleRealInfo.getBcType().equals("out"))) {
+			if (!isInOut(scheduleRealInfo)) {
 				if(!scheduleRealInfo.isDestroy()){
 					if(scheduleRealInfo.isSflj()){
 						ljgl=Arith.add(ljgl,scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
@@ -250,8 +247,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		int ljbc=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!(scheduleRealInfo.getBcType().equals("in") 
-					|| scheduleRealInfo.getBcType().equals("out"))) {
+			if (!isInOut(scheduleRealInfo)) {
 				if(scheduleRealInfo.isSflj()){
 					if(item.equals("zgf") || item.equals("wgf")){
 						String time="";
@@ -292,8 +288,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		double jhgl=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!(scheduleRealInfo.getBcType().equals("in") 
-					|| scheduleRealInfo.getBcType().equals("out"))) {
+			if (!isInOut(scheduleRealInfo)) {
 				if(!scheduleRealInfo.isSflj()){
 					jhgl=Arith.add(jhgl,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
 				}
@@ -308,8 +303,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		int jhbc=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!(scheduleRealInfo.getBcType().equals("in") 
-					|| scheduleRealInfo.getBcType().equals("out"))) {
+			if (!isInOut(scheduleRealInfo)) {
 				if(!scheduleRealInfo.isSflj()){
 					String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
 					long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
@@ -375,8 +369,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		int sjbc=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!(scheduleRealInfo.getBcType().equals("in") 
-					|| scheduleRealInfo.getBcType().equals("out"))) {
+			if (!isInOut(scheduleRealInfo)) {
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 				if(!scheduleRealInfo.isSflj()){
 					String time="";
@@ -491,7 +484,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.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.isDestroy())
@@ -521,7 +514,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if(!scheduleRealInfo.isSflj()){
 				if (scheduleRealInfo.getBcType().equals("in") 
-						|| scheduleRealInfo.getBcType().equals("out")) {
+						|| scheduleRealInfo.getBcType().equals("out")|| scheduleRealInfo.getBcType().equals("ldks")) {
 					double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
 					if(jhlcOrig-scheduleRealInfo.getJhlc()>0){
 						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
@@ -542,6 +535,9 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		if(s.getBcType().equals("out")){
 			fage=true;
 		}
+		if(s.getBcType().equals("ldks")){
+			fage=true;
+		}
 		return fage;
 	}
@@ -369,8 +369,11 @@ public class ReportServiceImpl implements ReportService{
 		DecimalFormat df = new DecimalFormat("#0.00");
 		// TODO Auto-generated method stub
 		//最早营运时间 区分夜宵线
-		String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
-		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		 String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	        		+ " id = ("
+	        		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
+	        		+ ")";
+		 String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
 		String[] minSjs = minfcsj.split(":");
 		int minSj=Integer.parseInt(minSjs[0])*60+Integer.parseInt(minSjs[1]);
 		//查询时间里程
@@ -564,8 +567,11 @@ public class ReportServiceImpl implements ReportService{
 		List<Map<String, Object>> list =new ArrayList<>();
 		// TODO Auto-generated method stub
 		//最早营运时间 区分夜宵线
-		String sqlMinYysj="select start_opt from bsth_c_line_config where line = '"+BasicData.lineId2CodeMap.inverse().get(line) +"'";
-		String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+		 String sqlMinYysj="select start_opt from bsth_c_line_config where "
+	        		+ " id = ("
+	        		+ "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
+	        		+ ")";
+		 String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
 		//查询全程
 		String sqlqc="select t.*,x.station_name as qdz_name from ( "