新方法计算车辆最早进场存油量

廖磊
1 parent 478ce683
Showing 4 changed files with 32 additions and 14 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/oil/list_ph.html
@@ -163,6 +163,7 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			m.put("hd", y.getHd()<=0?"0":y.getHd());
 			String shyy ="无";
 			if(y.getShyy()!=null){
+				shyy=y.getShyy();
 				 if(shyy.equals("1")){shyy="票务用油";}
 				 else if(shyy.equals("2")){shyy="保养用油";}
 				 else if(shyy.equals("3")){shyy="报废车用油";}
@@ -46,6 +46,14 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and y.xlbm like %?4%  and y.nbbm like %?5%",nativeQuery=true)
 	List<Ylb> listMaxRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
+	@Query(value="select * from bsth_c_ylb where to_days(?1) -to_days(rq) <30 "
+			+ " and rq< ?1 and ssgsdm like %?2%"
+			+ " and fgsdm like %?3% and xlbm like %?4% and nbbm like %?5% "
+			+ " order by nbbm , rq desc,jcsx desc",nativeQuery=true)
+	List<Ylb> listByRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	
+	
 	/**
 	 * 当天YLB信息
 	 * @param rq
@@ -118,8 +118,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			//当天YLXXB信息
 	//		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
 			//前一天所有车辆最后进场班次信息
-//			List<Ylb> ylListBe=repository.obtainYlbefore(rq,"","","","");
-			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, "", "", "", "");
+			List<Ylb> ylListBe=this.listByRqJcsx(rq,"","","","");
+//			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, "", "", "", "");
 			List<Cyl> clyList=cylRepository.obtainCyl("","");
 			//从排班表中计算出行驶的总里程
 			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", rq, "", "", "", "");
@@ -269,8 +269,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 前一天所有车辆最后进场班次信息
-//			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
-			List<Ylb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
+			List<Ylb> ylListBe = this.listByRqJcsx(rq, gsbm, fgsbm, line, nbbm);
+//			List<Ylb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
 			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
@@ -727,7 +727,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				nbbm=map.get("nbbm_eq").toString();
 			}
 //			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
-			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, gsbm, fgsbm, xlbm, nbbm);
+			List<Ylb> ylListBe=this.listByRqJcsx(rq, gsbm, fgsbm, xlbm, nbbm);
 			List<Ylb> ylbList=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 //					repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 //			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
@@ -1653,9 +1653,17 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		return newMap;
 	}
-	public List<Ylb> listByRqJcsx(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,
-			String px) {
-		
-		return null;
+	public List<Ylb> listByRqJcsx(String rq,String gsdm,String fgsdm,String xlbm,String nbbm) {
+		List<Ylb> list=repository.listByRqJcsx(rq, gsdm, fgsdm, xlbm, nbbm);
+		Map<String, Object> m=new HashMap<String,Object>();
+		List<Ylb> list_=new ArrayList<Ylb>();
+		for (int i = 0; i < list.size(); i++) {
+			Ylb t=list.get(i);
+			if(m.get(t.getNbbm())==null){
+				m.put(t.getNbbm(), t.getNbbm());
+				list_.add(t);
+			}
+		}
+		return list_;
 	}
 }
@@ -173,7 +173,7 @@
 			<thead>
 				<tr role="row" class="heading">
 					<td width="40px">
-						<input type="checkbox" id="selectAll" class="group-checkable icheck" >
+						<input type="checkbox" id="selectAll" class="group-checkable" >
 					</td>
 					<td width="40px">序号</td>
 					<td width="8%">日期</td>
@@ -327,6 +327,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
                 layer.msg('请选择日期.');
             }
         })
+
         //进场等于出场
         $("#outAndIn").on('click', function () {
            // console.log("进场油量等于出场油量");
@@ -970,11 +971,11 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         //全选 全不选
         $("#selectAll").on("click", function () {
  			if ($(this).is(":checked")) {
-//                     $("[name=id]:checkbox").prop("checked", true);
-                    $("input[name='id']").attr('checked', true)
+                    $("[name=id]:checkbox").prop("checked", true);
+//                     $("input[name='id']").attr('checked', true)
                 } else {
-//                     $("[name=id]:checkbox").prop("checked", false);
-                    $("input[name='id']").attr('checked', false);
+                    $("[name=id]:checkbox").prop("checked", false);
+//                     $("input[name='id']").attr('checked', false);
                 }
 		});