油量拆分添加跨分公司用车处理

廖磊
1 parent 3a9befa5
Showing 3 changed files with 26 additions and 8 deletions
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
@@ -54,7 +54,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
  
 	@Query(value="select * from bsth_c_ylb where rq>=?1 "
 			+ " and rq<= ?2 and ssgsdm =?3"
-			+ " and fgsdm =?4 and xlbm like %?5%  "
+			+ " and fgsdm like %?4% and xlbm like %?5%  "
 			+ " order by nbbm , rq desc,jcsx desc,lp desc",nativeQuery=true)
 	List<Ylb> listByMonthJcsx(String rq,String rq2,String gsbm,String fgsbm,String xlbm);
  
@@ -155,7 +155,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select s from Ylb s "
 			+ " where  to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm =?2 "
-			+ " and s.fgsdm =?3 "
+			+ " and s.fgsdm like %?3% "
 			+ " and s.xlbm like %?4% "
 			+ " and s.nbbm in ?5 order by nbbm,jcsx")
 	List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
@@ -163,7 +163,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select s from Ylb s "
 			+ " where  s.rq=?1 "
 			+ " and s.ssgsdm =?2 "
-			+ " and s.fgsdm =?3 "
+			+ " and s.fgsdm like %?3% "
 			+ " and s.xlbm like %?4% "
 			+ " and s.nbbm in ?5 order by nbbm,jcsx")
 	List<Ylb> listYlb_s(Date rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
@@ -1395,6 +1395,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		try {
 			List<Cyl> cylList = cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
 			String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
+			String fgsbm="999";
+			if(map.get("fgsbm")!=null){
+				fgsbm=map.get("fgsbm").toString();
+			}
 			JSONArray jsonArray=JSONArray.parseArray(json);
 			JSONObject jsonObject;
 			for (int x = 0; x < jsonArray.size(); x++) {
@@ -1409,7 +1413,12 @@ 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.getSsgsdm(),ylb.getFgsdm());
+				List<Object[]>  sumList=new ArrayList<Object[]>();
+				if(fgsbm.equals(""))
+					sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),fgsbm);
+				else
+					sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),ylb.getFgsdm());
+
 				// 保存总的加油量
 				Double jzl = 0.0;
 				// 保存总的里程
@@ -1431,9 +1440,14 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				}*/
 				map.put("nbbm_eq", nbbm_eq);
 				map.put("rq_eq", rq_eq);
-				
-				List<Ylb> iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
-						ylb.getNbbm(),"jcsx");
+				List<Ylb> iterator2=null;
+				if(fgsbm.equals(""))
+					iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),fgsbm,"",
+							ylb.getNbbm(),"jcsx");
+				else
+					iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
+							ylb.getNbbm(),"jcsx");
+					
 //						repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
 //						ylb.getNbbm(),"jcsx");
 				DecimalFormat df = new DecimalFormat("#.00");
@@ -547,6 +547,8 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 		            	 }else{
 		            		 var params2 = {};
 		             		params2['ylbList']=JSON.stringify(ylArray2);
+		             		params2['fgsbm']=$("#ylbListFgsdmId").val();
+
 		             		 var i = layer.load(2);
 		             		//保存操作
 		               	 	 $post('/ylb/saveYlbList', params, function () {
@@ -661,7 +663,8 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
      		var ylbFgsdm=$("#ylbListFgsdmId").val();
             if ($("#rq").val() == "" || $("#rq").val() ==null){
             	  layer.msg('请选择日期.');
-            }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
+            }else if(ylbGsdm=="" || ylbGsdm==null||ylbFgsdm==null){
+//             	 || ylbFgsdm=="" 
             	 layer.msg('请选择公司和分公司.');
             }else {
             	 var params = getParamsList();
@@ -697,6 +700,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
     				}
     			}
     		}
+			options += '<option value="">全部分公司</option>';
     		$('#ylbListFgsdmId').html(options);
     		initXl();
     		initCl();