用油跨分公司

廖磊
1 parent 99484afe
Showing 3 changed files with 44 additions and 2 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
@@ -126,6 +126,12 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	List<Object[]> checkNbmmYl(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	@Query(value="select nbbm,cs from (select nbbm,count(nbbm) as cs from ("
+			+ " select nbbm,fgsdm from bsth_c_ylb where rq=?1 "
+			+ " and ssgsdm like %?2% group by nbbm,fgsdm "
+			+ " ) t group by t.nbbm) x where x.cs >1 ",nativeQuery=true)
+	List<Object[]> checkNbmmFgs(String rq, String gsbm);
+	
 	@Query(value="select jzl,yh,sh from Ylb s "
 			+ " where to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm like %?2% "
@@ -291,6 +291,26 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
 				listpb=listpbs;
+			}else if (sxtj.equals("5")){
+					List<String> stringList=new ArrayList<String>();
+
+					List<Object[]> objectLists = repository.checkNbmmFgs(rq, gsbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						stringList.add(clbm);
+					}
+					
+					for (int i = 0; i < stringList.size(); i++) {
+						String strNbbm=stringList.get(i);
+						for (int j = 0; j < listpbs.size(); j++) {
+							Map<String, Object> map = listpbs.get(j);
+							String mapNbbm=map.get("clZbh").toString();
+							if(strNbbm.equals(mapNbbm)){
+								listpb.add(map);
+							}
+						}
+					}
+					
 			}else{
 				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, "",nbbm);
 				List<String> stringList=new ArrayList<String>();
@@ -1269,6 +1289,19 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						else
 							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
 					}
+				}else if(sxtj.equals("5")){
+					List<Object[]> objectLists = repository.checkNbmmFgs(rq, gsbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm =objectLists.get(i)[0].toString();
+						stringList.add(clbm);
+					}
+					
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+					}
 				} else {
 					List<Object[]> objectLists;
 					if (sxtj.equals("3")) {
@@ -149,6 +149,7 @@
 									<option value="2">一车多单</option>
 									<option value="3">有加油没里程</option>
 									<option value="4">有里程没加油</option>
+									<option value="5">跨分工用车</option>
 								</select>
 							</div>
@@ -667,9 +668,11 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             }else if(ylbGsdm=="" || ylbGsdm==null){
 //             	 || ylbFgsdm=="" 
             	 layer.msg('请选择公司');
-            }else if( (ylbFgsdm==""||ylbFgsdm==null)  && (nbbm=="" || nbbm==null) ){
+            }
+            /* else if( (ylbFgsdm==""||ylbFgsdm==null)  && (nbbm=="" || nbbm==null) ){
             	layer.msg('不选择分公司处理输入车辆自编号');
-            }else {
+            } */
+            else {
             	 var params = getParamsList();
                 page = 0;
                 jsDoQuery(params, true);