油量信息排除公司编码或分公司编码为空的数据

廖磊
1 parent d1c098ed
Showing 2 changed files with 26 additions and 20 deletions
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
@@ -56,8 +56,8 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 */
 	@Transactional
 	@Modifying
-	@Query(value="select ifnull(jzl,0),ifnull(zlc,0),ifnull(sh,0) from bsth_c_ylb where  nbbm=?1 and rq=?2 and xlbm like %?3%",nativeQuery=true)
-	List<Object[]> sumLcYl(String nbbm,Date rq,String xlbm);
+	@Query(value="select ifnull(jzl,0),ifnull(zlc,0),ifnull(sh,0) from bsth_c_ylb where  nbbm=?1 and rq=?2 and xlbm like %?3% and ssgsdm like %?4% and fgsdm like %?5%",nativeQuery=true)
+	List<Object[]> sumLcYl(String nbbm,Date rq,String xlbm,String fgsbm,String gsbm);
 	/**
 	 * 
@@ -180,7 +180,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 						t.setRq(sdf.parse(rq));
 						t.setCreatetime(dNow);
-						repository.save(t);
+						if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+							repository.save(t);
+						}
+						
 			}
 				result = "success";
@@ -330,12 +333,14 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 					t.setRq(sdf.parse(rq));
 					t.setCreatetime(date);
-					 if(type.equals("add")){
-						 addList.add(t); 
-					 }else{
-					     updateList.add(t); 
-					     ins += t.getId().toString()+",";
-					  }
+					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+						 if(type.equals("add")){
+							 addList.add(t); 
+						 }else{
+						     updateList.add(t); 
+						     ins += t.getId().toString()+",";
+						  }
+					 }
 //					repository.save(t);
 					newMap.put("status", ResponseCode.SUCCESS);
@@ -405,7 +410,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					String nbbm_eq = ylb.getNbbm();
 					Date rq_eq = ylb.getRq();
 					// 得到一天总的加油和里程（根据车，时间）
-					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm());
+					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm(),gsbm,fgsbm);
 					// 保存总的加油量
 					Double jzl = 0.0;
 					// 保存总的里程
@@ -436,14 +441,14 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						if(t.getNbbm().equals(ylb.getNbbm())){
 							if (t.getJcsx() == 1) {
 								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
-								Double yl = t.getCzyl();
-								Double jcyl = t.getCzyl();
-								zyl =Arith.sub( Arith.add(jcyl, jzl),yl);
+//								Double yl = t.getCzyl();
+//								Double jcyl = t.getCzyl();
+								zyl =jzl;
 								Double yh=0.0;
 								if(zlc>0){
 									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 								}
-								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
+								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()), t.getCzyl()),yh);
 								//把进场油量的小数和整数分别取出
 //								int ylxs=(int) nextJzyl; 10.6--11  10.3--10
 								long l=Math.round(nextJzyl);
@@ -459,7 +464,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								if(zlc>0){
 									yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 								}
-								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
+								nextJzyl =Arith.sub( Arith.add(Arith.sub(t.getJzl(),t.getSh()),nextJzyl),yh);
 								long l=Math.round(nextJzyl);
 								double ylxs=l*100/100;
 //								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
@@ -744,10 +749,11 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //					double jzyl=Arith.add(t.getJzl(), t.getCzyl());
 					t.setJzyl(Arith.add(t.getJzl(), t.getCzyl()));
 					t.setYh(0.0);
-					if(fgsdm.equals(fgsbm)){
+					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 						repository.save(t);
 						if(null!=cyl){
 							cyl.setCyl(Arith.add(t.getJzl(), t.getCzyl()));
+							cyl.setUpdatetime(y1.getYyrq());
 							cylRepository.save(cyl);
 						}
 					}
@@ -1090,7 +1096,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				String nbbm_eq = ylb.getNbbm();
 				Date rq_eq = ylb.getRq();
 				// 得到一天总的加油和里程（根据车，时间）
-				List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm());
+				List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm(),ylb.getSsgsdm(),ylb.getFgsdm());
 				// 保存总的加油量
 				Double jzl = 0.0;
 				// 保存总的里程
@@ -1102,7 +1108,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					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);
+//				jzl = Arith.sub(jzl, zsh);
 				//新的 损耗不等于 旧的损耗 总损耗从新算
 				if(Arith.sub(ylb.getSh(),sh )!=0){
 					zsh =Arith.add(Arith.sub(zsh, ylb.getSh()), sh);
@@ -1126,8 +1132,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							t.setSh(sh);
 							t.setShyy(shyy);
 						}
-						Double jcyl = t.getCzyl();
-						zyl = Arith.sub(Arith.add(jcyl, jzl), yl);
+//						Double jcyl = t.getCzyl();
+						zyl =  jzl;
 						Double yh = 0.0;
 						if (zlc > 0 && t.getZlc() > 0) {
 							yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));