潘钊 / bsth_control · Commits

Commit bfea90a682b3b9676e5782841f4d648d13f537d8

Authored by 廖磊
1 parent 3fe3cf97

电车保存入库，统计日报修改，报表加入电量

Inline Side-by-side
Showing 5 changed files with 188 additions and 76 deletions
src/main/java/com/bsth/repository/oil/DlbRepository.java
  View file @bfea90a
... ... @@ -81,7 +81,8 @@ public interface DlbRepository extends BaseRepository<Dlb, Integer>{
81 81 + " and nbbm like %?5%",nativeQuery=true)
82 82 List<Object[]> sumDlb2(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
83 83  
84   -
  84 + @Transactional
  85 + @Modifying
85 86 @Query(value="UPDATE bsth_c_dlb SET " +
86 87 " czcd= ?2,"+
87 88 " jzcd = ?3, " +
... ...
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @bfea90a
... ... @@ -559,8 +559,9 @@ public class FormsServiceImpl implements FormsService {
559 559 return sin;
560 560 }
561 561 });
562   -
  562 + DecimalFormat df = new DecimalFormat("0.00");
563 563 List<Ylb> listYlb= ylbRepository.obtainYl(startDate, gsdm, fgsdm, xlbm, "", "xlbm");
  564 + List<Dlb> listDlb= dlbRepository.obtainDl(startDate, gsdm, fgsdm, xlbm, "", "xlbm");
564 565 List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLine(xlbm, startDate);
565 566 for (int i = 0; i < list.size(); i++) {
566 567 List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
... ... @@ -569,10 +570,12 @@ public class FormsServiceImpl implements FormsService {
569 570 String jsy=sin.getJsy();
570 571 String clzbh=sin.getClzbh();
571 572 String xl=sin.getxL();
  573 + String spy=sin.getSgh();
572 574 sin.setxL(BasicData.lineCode2NameMap.get(xl));
573 575 for (int j = 0; j < listReal.size(); j++) {
574 576 ScheduleRealInfo s=listReal.get(j);
575   - if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)&&s.getXlBm().equals(xl)){
  577 + if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
  578 + &&s.getXlBm().equals(xl)&&s.getsGh().equals(spy)){
576 579 newList.add(s);
577 580 }
578 581 }
... ... @@ -584,23 +587,39 @@ public class FormsServiceImpl implements FormsService {
584 587 double jcgl=culateMileageService.culateJccgl(newList);
585 588 double zyygl=Arith.add(yygl, ljgl);
586 589 double zksgl=Arith.add(ksgl, jcgl);
  590 + double zlc=Arith.add(zyygl,zksgl);
587 591 sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
588 592 sin.setEmptMileage(String.valueOf(zksgl));
589 593 sin.setJhjl(String.valueOf(jhgl));
590 594 double yhl=0.0;
591 595 double jzl=0.0;
592 596 double fyy=0.0;
  597 + double zlcs=0.0;
593 598 for (int j = 0; j < listYlb.size(); j++) {
594 599 Ylb y=listYlb.get(j);
595 600 if(y.getJsy().equals(jsy) && y.getNbbm().equals(clzbh)){
596 601 yhl=Arith.add(yhl, y.getYh()==null?0:y.getYh());
597 602 jzl=Arith.add(jzl, y.getJzl()==null?0:y.getJzl());
598 603 fyy=Arith.add(fyy, y.getSh()==null?0:y.getSh());
  604 + zlcs=Arith.add(zlcs, y.getZlc()==null?0:y.getZlc());
599 605 }
600 606 }
601   - sin.setHyl(String.valueOf(yhl));
602   - sin.setJzl(String.valueOf(jzl));
603   - sin.setUnyyyl(String.valueOf(fyy));
  607 +
  608 + for(int j=0;j<listDlb.size();j++){
  609 + Dlb d=listDlb.get(j);
  610 + if(d.getJsy().equals(jsy)&&d.getNbbm().equals(clzbh)){
  611 + yhl=Arith.add(yhl, d.getHd()==null?0:d.getHd());
  612 + jzl=Arith.add(jzl, d.getCdl()==null?0:d.getCdl());
  613 + fyy=Arith.add(fyy, d.getSh()==null?0:d.getSh());
  614 + zlcs=Arith.add(zlcs, d.getZlc()==null?0:d.getZlc());
  615 + }
  616 + }
  617 + if(zlcs>0){
  618 + double lcbfb= zlc/zlcs;
  619 + sin.setHyl(df.format(yhl*lcbfb));
  620 + sin.setJzl(df.format(jzl*lcbfb));
  621 + sin.setUnyyyl(df.format(fyy*lcbfb));
  622 + }
604 623 }
605 624 return list;
606 625 }
... ... @@ -658,6 +677,24 @@ public class FormsServiceImpl implements FormsService {
658 677 return y;
659 678 }
660 679 });
  680 +
  681 + String dlbSql=" select * from bsth_c_dlb where rq BETWEEN '"+startDate+"' and '"+endDate+"'";
  682 + if(xlbm.equals("")){
  683 + ylbSql +="and ssgsdm='"+gsdm+"' "
  684 + + " and fgsdm='"+fgsdm+"'";
  685 + }else{
  686 + ylbSql += " and xlbm = '"+xlbm+"'";
  687 + }
  688 + List<Dlb> dlbList= jdbcTemplate.query(dlbSql, new RowMapper<Dlb>() {
  689 + @Override
  690 + public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
  691 + Dlb d = new Dlb();
  692 + d.setCdl(arg0.getDouble("cdl"));
  693 + d.setXlbm(arg0.getString("xlbm"));
  694 + d.setHd(arg0.getDouble("hd"));
  695 + return d;
  696 + }
  697 + });
661 698 List<ScheduleRealInfo> listReal;
662 699 if(xlbm.equals("")){
663 700 listReal=scheduleRealInfoRepository.scheduleByDateAndLineTj(xlbm, startDate, endDate, gsdm, fgsdm);
... ... @@ -700,6 +737,13 @@ public class FormsServiceImpl implements FormsService {
700 737 xhl=Arith.add(xhl, t.getYh());
701 738 }
702 739 }
  740 + for (int j = 0; j < dlbList.size(); j++) {
  741 + Dlb d=dlbList.get(j);
  742 + if(d.getXlbm().equals(line)){
  743 + jzl=Arith.add(jzl, d.getCdl());
  744 + xhl=Arith.add(xhl, d.getHd());
  745 + }
  746 + }
703 747  
704 748 o.setJzl(String.valueOf(jzl));
705 749 o.setXhl(String.valueOf(xhl));
... ... @@ -731,7 +775,8 @@ public class FormsServiceImpl implements FormsService {
731 775 });
732 776  
733 777  
734   - List<Ylb> listYlb= ylbRepository.obtainYl(startDate, "", "", line, "", "xlbm");
  778 + List<Ylb> listYlb= ylbRepository.obtainYl(date, "", "", line, "", "xlbm");
  779 + List<Dlb> listDlb= dlbRepository.obtainDl(date, "", "", line, "", "xlbm");
735 780 List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
736 781 for (int i = 0; i < list.size(); i++) {
737 782 List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
... ... @@ -771,6 +816,14 @@ public class FormsServiceImpl implements FormsService {
771 816 ns =Arith.add(ns, y.getNs()==null?0:y.getNs());
772 817 }
773 818 }
  819 + for (int j = 0; j < listDlb.size(); j++) {
  820 + Dlb d=listDlb.get(j);
  821 + if(d.getJsy().equals(jsy) && d.getNbbm().equals(clzbh)){
  822 + yhl=Arith.add(yhl, d.getHd()==null?0:d.getHd());
  823 + jzl=Arith.add(jzl, d.getCdl()==null?0:d.getCdl());
  824 + fyy=Arith.add(fyy, d.getSh()==null?0:d.getSh());
  825 + }
  826 + }
774 827 sin.setHyl(String.valueOf(yhl));
775 828 sin.setJzl(String.valueOf(jzl));
776 829 sin.setUnyyyl(String.valueOf(fyy));
... ...
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
  View file @bfea90a
... ... @@ -704,15 +704,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
704 704 // String nbbm =jsonObject.getString("nbbm");
705 705 // String rq=jsonObject.getString("rq");
706 706 repository.dlbUpdate(id, czcd, jzcd, hd, sh, shyy, yhlx);
707   - /*for (int z = 0; z < cylList.size(); z++) {
708   - Cyl cyl = cylList.get(z);
709   - if (nbbm.equals(cyl.getNbbm())) {
710   - cyl.setCyl(jzyl);
711   - cyl.setUpdatetime(sdf.parse(rq));
712   - break;
713   - }
714   - cylRepository.save(cyl);
715   - }*/
  707 +
716 708 }
717 709 newMap.put("status", ResponseCode.SUCCESS);
718 710 }catch(Exception e){
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @bfea90a
... ... @@ -724,12 +724,31 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
724 724 state = state + "+1";
725 725 type = "ASC";
726 726 }
727   - String sqlPlan = "select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"
728   - + " s.lp_Name as lpName,s.j_Name as jName,min(s.schedule_date_str) as dateStr ,min(s.fcsj) as fcsj"
  727 + /*String sqlPlan = "select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"
  728 + + " s.lp_Name as lpName,s.j_Name as jName,min(s.schedule_date_str) as dateStr ,"
  729 + + " min(s.fcsj) as fcsj, min(s.schedule_date) as date"
729 730 + " from bsth_c_s_sp_info_real s "
730 731 + " where s.xl_Bm = '" + line + "' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='" + date + "' "
731 732 + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name"
732   - + " order by (" + state + "),dateStr,fcsj " + type;
  733 + + " order by (" + state + "),dateStr,fcsj " + type;*/
  734 + String sqlMinYysj="select start_opt from bsth_c_line_config where "
  735 + + " id = ("
  736 + + "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
  737 + + ")";
  738 + String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
  739 + String sqlPlan ="select * from (select * from ("
  740 + + " select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh, "
  741 + + " s.lp_Name as lpName,s.j_Name as jName,max(s.schedule_date_str) as dateStr ,"
  742 + + " min(s.fcsj) as fcsj,1 as px from bsth_c_s_sp_info_real s where "
  743 + + " s.xl_Bm = '"+line+"' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='"+date+"'"
  744 + + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name ) x where x.fcsj >'"+minfcsj+"'"
  745 + + " UNION "
  746 + + " select * from ( select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh, "
  747 + + " s.lp_Name as lpName,s.j_Name as jName, max(s.schedule_date_str) as dateStr,"
  748 + + " min(s.fcsj) as fcsj,2 as px from bsth_c_s_sp_info_real s "
  749 + + " where s.xl_Bm = '"+line+"' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='"+date+"'"
  750 + + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name "
  751 + + " ) y where y.fcsj <='"+minfcsj+"') z order by (" + state + "),dateStr,px " + type;
733 752 List<ScheduleRealInfo> list = jdbcTemplate.query(sqlPlan,
734 753 new RowMapper<ScheduleRealInfo>() {
735 754 @Override
... ... @@ -740,10 +759,48 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
740 759 t.setClZbh(rs.getString("clZbh"));
741 760 t.setLpName(rs.getString("lpName"));
742 761 t.setjName(rs.getString("jName"));
  762 + t.setFcsj(rs.getString("fcsj"));
743 763 return t;
744 764 }
745 765 });
746 766 if (lpname.equals("lpName")) {
  767 + /* SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
  768 + String sqlMinYysj="select start_opt from bsth_c_line_config where "
  769 + + " id = ("
  770 + + "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
  771 + + ")";
  772 + String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
  773 + String[] minSjs = minfcsj.split(":");
  774 + Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
  775 + for (int i = 0; i < list.size(); i++) {
  776 + ScheduleRealInfo s=list.get(i);
  777 + String[] fcsj= s.getFcsj().split(":");
  778 + Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
  779 +
  780 + Long fscjT=0L;
  781 + if(fcsjL<minSj){
  782 + Calendar calendar = new GregorianCalendar();
  783 + calendar.setTime(s.getScheduleDate());
  784 + calendar.add(calendar.DATE,1);
  785 + s.setScheduleDate(calendar.getTime());
  786 + try {
  787 + fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
  788 + } catch (ParseException e) {
  789 + // TODO Auto-generated catch block
  790 + e.printStackTrace();
  791 + }
  792 +
  793 + }else{
  794 + try {
  795 + fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
  796 + } catch (ParseException e) {
  797 + // TODO Auto-generated catch block
  798 + e.printStackTrace();
  799 + };
  800 + }
  801 + s.setFcsjT(fscjT);
  802 + }
  803 + Collections.sort(list, new ComparableReal());*/
747 804 List<ScheduleRealInfo> listNew = new ArrayList<ScheduleRealInfo>();
748 805 Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
749 806 // if (px.equals("desc")) {
... ... @@ -2610,6 +2667,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2610 2667 }*/
2611 2668  
2612 2669 public final Map<String, Object> staticTj(List<ScheduleRealInfo> list){
  2670 +
2613 2671 List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
2614 2672 for(int i=0;i<list.size();i++){
2615 2673 ScheduleRealInfo s=list.get(i);
... ... @@ -2623,57 +2681,59 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2623 2681 }
2624 2682 }
2625 2683 Map<String, Object> map = new HashMap<String, Object>();
2626   - map.put("xlName", lists.get(0).getXlName());
2627   - double jhyygl=culateService.culateJhgl(list);//计划营运公里
2628   - double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
2629   - map.put("jhlc", jhyygl);
2630   - map.put("jcclc", jhjcclc);
2631   - map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
2632   -
2633   - double ljgl= culateService.culateLjgl(lists);
2634   - double sjyygl= culateService.culateSjgl(lists);
2635   - double zyygl= Arith.add(sjyygl,ljgl);
2636   -
2637   - double sjjccgl=culateService.culateJccgl(lists);
2638   - double sjksgl=culateService.culateKsgl(lists);
2639   - double zksgl=Arith.add(sjjccgl, sjksgl);
2640   - map.put("sjzgl", Arith.add(zyygl, zksgl));
2641   - map.put("sjgl",zyygl);
2642   - map.put("sjksgl", zksgl);
2643   -
2644   - map.put("ssgl", culateService.culateLbgl(list));
2645   - map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
2646   - map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
2647   - map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
2648   - map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));
2649   - map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));
2650   - map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));
2651   - map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));
2652   - map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
2653   - map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
2654   - map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
2655   - map.put("ssgl_other", culateService.culateCJLC(list, "其他"));
2656   - map.put("ssbc", culateService.culateLbbc(list));
2657   - map.put("ljgl", ljgl);
2658   - map.put("jhbc", culateService.culateJhbc(list,""));
2659   - map.put("jhbc_m", culateService.culateJhbc(list, "zgf"));
2660   - map.put("jhbc_a", culateService.culateJhbc(list, "wgf"));
2661   - map.put("sjbc", culateService.culateSjbc(lists,""));
2662   - map.put("sjbc_m", culateService.culateSjbc(lists,"zgf"));
2663   - map.put("sjbc_a", culateService.culateSjbc(lists,"wgf"));
2664   - map.put("ljbc", culateService.culateLjbc(lists,""));
2665   - map.put("ljbc_m", culateService.culateLjbc(lists,"zgf"));
2666   - map.put("ljbc_a", culateService.culateLjbc(lists,"wgf"));
2667   - map.put("fzbc", culateService.culateFzbc(lists, ""));
2668   - map.put("fzbc_m", culateService.culateFzbc(lists, "zgf"));
2669   - map.put("fzbc_a", culateService.culateFzbc(lists, "wgf"));
2670   - map.put("dtbc", 0);
2671   - map.put("dtbc_m", 0);
2672   - map.put("dtbc_a", 0);
2673   - map.put("djg", 0);
2674   - map.put("djg_m", 0);
2675   - map.put("djg_a", 0);
2676   - map.put("djg_time", 0);
  2684 + if(list.size()>0){
  2685 + map.put("xlName", list.get(0).getXlName());
  2686 + double jhyygl=culateService.culateJhgl(list);//计划营运公里
  2687 + double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
  2688 + map.put("jhlc", jhyygl);
  2689 + map.put("jcclc", jhjcclc);
  2690 + map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
  2691 +
  2692 + double ljgl= culateService.culateLjgl(lists);
  2693 + double sjyygl= culateService.culateSjgl(lists);
  2694 + double zyygl= Arith.add(sjyygl,ljgl);
  2695 +
  2696 + double sjjccgl=culateService.culateJccgl(lists);
  2697 + double sjksgl=culateService.culateKsgl(lists);
  2698 + double zksgl=Arith.add(sjjccgl, sjksgl);
  2699 + map.put("sjzgl", Arith.add(zyygl, zksgl));
  2700 + map.put("sjgl",zyygl);
  2701 + map.put("sjksgl", zksgl);
  2702 +
  2703 + map.put("ssgl", culateService.culateLbgl(list));
  2704 + map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
  2705 + map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
  2706 + map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
  2707 + map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));
  2708 + map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));
  2709 + map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));
  2710 + map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));
  2711 + map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
  2712 + map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
  2713 + map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
  2714 + map.put("ssgl_other", culateService.culateCJLC(list, "其他"));
  2715 + map.put("ssbc", culateService.culateLbbc(list));
  2716 + map.put("ljgl", ljgl);
  2717 + map.put("jhbc", culateService.culateJhbc(list,""));
  2718 + map.put("jhbc_m", culateService.culateJhbc(list, "zgf"));
  2719 + map.put("jhbc_a", culateService.culateJhbc(list, "wgf"));
  2720 + map.put("sjbc", culateService.culateSjbc(lists,""));
  2721 + map.put("sjbc_m", culateService.culateSjbc(lists,"zgf"));
  2722 + map.put("sjbc_a", culateService.culateSjbc(lists,"wgf"));
  2723 + map.put("ljbc", culateService.culateLjbc(lists,""));
  2724 + map.put("ljbc_m", culateService.culateLjbc(lists,"zgf"));
  2725 + map.put("ljbc_a", culateService.culateLjbc(lists,"wgf"));
  2726 + map.put("fzbc", culateService.culateFzbc(lists, ""));
  2727 + map.put("fzbc_m", culateService.culateFzbc(lists, "zgf"));
  2728 + map.put("fzbc_a", culateService.culateFzbc(lists, "wgf"));
  2729 + map.put("dtbc", 0);
  2730 + map.put("dtbc_m", 0);
  2731 + map.put("dtbc_a", 0);
  2732 + map.put("djg", 0);
  2733 + map.put("djg_m", 0);
  2734 + map.put("djg_a", 0);
  2735 + map.put("djg_time", 0);
  2736 + }
2677 2737 return map;
2678 2738 }
2679 2739  
... ...
src/main/resources/static/pages/forms/statement/account.html
  View file @bfea90a
... ... @@ -38,8 +38,11 @@
38 38 <div style="display: inline-block;margin-left: 15px">
39 39 <span class="item-label" style="width: 140px;">内部编码： </span>
40 40 <select class="form-control" name="code" id="code" style="width: 180px;"></select>
  41 + <input class="btn btn-default" type="button" id="czcl" value="X"/>
  42 +
41 43 </div>
42 44 <div class="form-group">
  45 +
43 46 <input class="btn btn-default" type="button" id="query" value="筛选"/>
44 47 <input class="btn btn-default" type="button" id="export" value="导出"/>
45 48 </div>
... ... @@ -89,19 +92,22 @@
89 92 for(var code in result){
90 93 data.push({id: code, text: result[code]});
91 94 }
92   - console.log(data);
93 95 initPinYinSelect2('#line',data,'');
94 96  
95 97 })
96   -
97   -
  98 + //重置
  99 + $('#czcl').on('click', function () {
  100 + $('#code').val('').change();
  101 + });
  102 + $("#line").on("change",initCl);
  103 + function initCl(){
98 104 $('#code').select2({
99 105 ajax: {
100   - url: '/realSchedule/sreachVehic',
  106 + url: '/report/carList',
101 107 dataType: 'json',
102 108 delay: 150,
103 109 data: function(params){
104   - return{nbbm: params.term};
  110 + return{nbbm: params.term,xlbm:$('#line').val()};
105 111 },
106 112 processResults: function (data) {
107 113 return {
... ... @@ -133,7 +139,7 @@
133 139 }
134 140 }
135 141 });
136   -
  142 + }
137 143 var line = $("#line").val();
138 144 var xlName = $("#select2-line-container").html();
139 145 var date = $("#date").val();
... ...