潘钊 / bsth_control · Commits

Commit 19a1fcacba8e35efa09f9836a1e29a4829179988

Authored by 廖磊
1 parent 49163cf3

嘉定油 电 功能修改

Inline Side-by-side
Showing 12 changed files with 774 additions and 18 deletions
src/main/java/com/bsth/controller/BusIntervalController.java
  View file @19a1fca
... ... @@ -57,5 +57,10 @@ public class BusIntervalController {
57 57 public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
58 58 return busIntervalService.exportWaybillMore(map);
59 59 }
  60 +
  61 + @RequestMapping(value="/MapById",method = RequestMethod.GET)
  62 + public Map<String, Object> MapById(@RequestParam("id") Long id){
  63 + return busIntervalService.MapById(id);
  64 + }
60 65  
61 66 }
... ...
src/main/java/com/bsth/controller/oil/DlbController.java
  View file @19a1fca
... ... @@ -101,7 +101,7 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
101 101 public Map<String, Object> obtainJd(@RequestParam Map<String, Object> map) throws Exception{
102 102 Map<String, Object> list=new HashMap<String, Object>();
103 103 try {
104   - list = service.obtain(map);
  104 + list = service.obtainJd(map);
105 105 } catch (Exception e) {
106 106 // TODO Auto-generated catch block
107 107 throw e;
... ...
src/main/java/com/bsth/controller/oil/YlbController.java
  View file @19a1fca
... ... @@ -77,7 +77,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
77 77 Map<String, Object> list =new HashMap<String, Object>();
78 78 try {
79 79  
80   - list = ylbService.obtain(map);
  80 + list = ylbService.obtainJd(map);
81 81 } catch (Exception e) {
82 82 // TODO Auto-generated catch block
83 83 throw e;
... ...
src/main/java/com/bsth/repository/LineRepository.java
  View file @19a1fca
... ... @@ -45,7 +45,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
45 45  
46 46 public Line findByLineCode(String string);
47 47  
48   - @Query(value = " SELECT l FROM Line l where l.company like %?1% and l.brancheCompany like %?2% and l.lineCode like ?3")
  48 + @Query(value = " SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
49 49 public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
50 50  
51 51 @Query("SELECT L FROM Line L where L.destroy=0")
... ...
src/main/java/com/bsth/service/BusIntervalService.java
  View file @19a1fca
... ... @@ -21,4 +21,7 @@ public interface BusIntervalService {
21 21 List<Map<String, Object>> correctStatis(Map<String, Object> map);
22 22  
23 23 Map<String, Object> exportWaybillMore(Map<String, Object> map);
  24 +
  25 + Map<String, Object> MapById(Long id) ;
  26 +
24 27 }
... ...
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @19a1fca
... ... @@ -2801,5 +2801,194 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2801 2801 map.put("fileName", file.getName());
2802 2802 return map;
2803 2803 }
  2804 +
  2805 +
  2806 + @Override
  2807 + public Map<String, Object> MapById(Long id) {
  2808 + // TODO Auto-generated method stub
  2809 + Map<String, Object> map = new HashMap<String, Object>();
  2810 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
  2811 + ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(id);
  2812 + String xlbm = s.getXlBm();
  2813 + String fcrq = s.getScheduleDateStr();
  2814 +
  2815 + int type = 3;
  2816 + double ccyl = 0.0;
  2817 + double jcyl = 0.0;
  2818 + double yh = 0.0;
  2819 + double jzl = 0.0;
  2820 + double zlc = 0.0;
  2821 +
  2822 + double ccyl_ = 0.0;
  2823 + double jcyl_ = 0.0;
  2824 + double yh_ = 0.0;
  2825 + double jzl_ = 0.0;
  2826 + double zlc_ = 0.0;
  2827 +
  2828 + List<Cars> listCars = carsRepository.findCarsByCode(s.getClZbh());
  2829 + if (listCars.size() > 0) {
  2830 + if(listCars.get(0).getNyType()!=null){
  2831 + if (listCars.get(0).getNyType().equals("1")) {
  2832 + List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
  2833 + type = 1;
  2834 + for (int i = 0; i < listDlb.size(); i++) {
  2835 + Dlb d = listDlb.get(i);
  2836 + if (d.getLp() == null) {
  2837 + ccyl = Arith.add(ccyl, d.getCzcd());
  2838 + jcyl = Arith.add(jcyl, d.getJzcd());
  2839 + yh = Arith.add(yh, d.getHd());
  2840 + jzl = Arith.add(jzl, d.getCdl());
  2841 + zlc = Arith.add(zlc, d.getZlc());
  2842 + } else {
  2843 + if (d.getLp().equals(s.getLpName())) {
  2844 + ccyl = Arith.add(ccyl, d.getCzcd());
  2845 + jcyl = Arith.add(jcyl, d.getJzcd());
  2846 + yh = Arith.add(yh, d.getHd());
  2847 + jzl = Arith.add(jzl, d.getCdl());
  2848 + zlc = Arith.add(zlc, d.getZlc());
  2849 + }
  2850 + }
  2851 +
  2852 + }
  2853 + } else if(listCars.get(0).getNyType().equals("0")){
  2854 + List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
  2855 + type = 0;
  2856 + for (int i = 0; i < listYlb.size(); i++) {
  2857 + Ylb y = listYlb.get(i);
  2858 + if (y.getLp() == null) {
  2859 + ccyl = Arith.add(ccyl, y.getCzyl());
  2860 + jcyl = Arith.add(jcyl, y.getJzyl());
  2861 + yh = Arith.add(yh, y.getYh());
  2862 + jzl = Arith.add(jzl, y.getJzl());
  2863 + zlc = Arith.add(zlc, y.getZlc());
  2864 + } else {
  2865 + if (y.getLp().equals(s.getLpName())) {
  2866 + ccyl = Arith.add(ccyl, y.getCzyl());
  2867 + jcyl = Arith.add(jcyl, y.getJzyl());
  2868 + yh = Arith.add(yh, y.getYh());
  2869 + jzl = Arith.add(jzl, y.getJzl());
  2870 + zlc = Arith.add(zlc, y.getZlc());
  2871 + }
  2872 + }
  2873 + }
  2874 + }else{
  2875 + List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
  2876 + type = 2;
  2877 + for (int i = 0; i < listDlb.size(); i++) {
  2878 + Dlb d = listDlb.get(i);
  2879 + if (d.getLp() == null) {
  2880 + ccyl_ = Arith.add(ccyl, d.getCzcd());
  2881 + jcyl_ = Arith.add(jcyl, d.getJzcd());
  2882 + yh_ = Arith.add(yh, d.getHd());
  2883 + jzl_ = Arith.add(jzl, d.getCdl());
  2884 + zlc_ = Arith.add(zlc, d.getZlc());
  2885 + } else {
  2886 + if (d.getLp().equals(s.getLpName())) {
  2887 + ccyl_ = Arith.add(ccyl, d.getCzcd());
  2888 + jcyl_ = Arith.add(jcyl, d.getJzcd());
  2889 + yh_ = Arith.add(yh, d.getHd());
  2890 + jzl_ = Arith.add(jzl, d.getCdl());
  2891 + zlc_ = Arith.add(zlc, d.getZlc());
  2892 + }
  2893 + }
  2894 +
  2895 + }
  2896 +
  2897 + List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(), xlbm);
  2898 + for (int i = 0; i < listYlb.size(); i++) {
  2899 + Ylb y = listYlb.get(i);
  2900 + if (y.getLp() == null) {
  2901 + ccyl = Arith.add(ccyl, y.getCzyl());
  2902 + jcyl = Arith.add(jcyl, y.getJzyl());
  2903 + yh = Arith.add(yh, y.getYh());
  2904 + jzl = Arith.add(jzl, y.getJzl());
  2905 + zlc = Arith.add(zlc, y.getZlc());
  2906 + } else {
  2907 + if (y.getLp().equals(s.getLpName())) {
  2908 + ccyl = Arith.add(ccyl, y.getCzyl());
  2909 + jcyl = Arith.add(jcyl, y.getJzyl());
  2910 + yh = Arith.add(yh, y.getYh());
  2911 + jzl = Arith.add(jzl, y.getJzl());
  2912 + zlc = Arith.add(zlc, y.getZlc());
  2913 + }
  2914 + }
  2915 + }
  2916 + }
  2917 + }
  2918 + }
  2919 +
  2920 + map.put("jzl", jzl);
  2921 + map.put("yh", yh);
  2922 + map.put("ccyl", ccyl);
  2923 + map.put("jcyl", jcyl);
  2924 + map.put("type", type);
  2925 + map.put("zlc", zlc);
  2926 + map.put("jzl", jzl_);
  2927 + map.put("yh_", yh_);
  2928 + map.put("ccyl_", ccyl_);
  2929 + map.put("jcyl_", jcyl_);
  2930 + map.put("zlc_", zlc_);
  2931 + map.put("xlName", s.getXlName());
  2932 + map.put("clZbh", s.getClZbh());
  2933 + map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh()));
  2934 + map.put("fcsjActual", s.getFcsjActual());
  2935 + map.put("zdzName", s.getZdzName());
  2936 + map.put("scheduleDate", s.getScheduleDateStr());
  2937 + map.put("lpName", s.getLpName());
  2938 + String zdp = "", zwdp = "", wdp = "";
  2939 + String zdpT = "", zwdpT = "", wdpT = "";
  2940 + String dbdp = "";
  2941 + List<DutyEmployee> list = dutyEmployeeService.getDutyEmployee(xlbm, fcrq + "00:01", fcrq + "23:59");
  2942 + try {
  2943 + Long fcsj1 = sdf.parse(fcrq + " 00:01").getTime();
  2944 + Long fcsj2 = sdf.parse(fcrq + " 11:00").getTime();
  2945 + Long fcsj3 = sdf.parse(fcrq + " 23:59").getTime();
  2946 + for (int i = 0; i < list.size(); i++) {
  2947 + DutyEmployee t = list.get(i);
  2948 + if (dbdp.indexOf(t.getuName()) == -1) {
  2949 + if (!(dbdp.length() > 0)) {
  2950 + dbdp = t.getuName();
  2951 + } else {
  2952 + dbdp += "," + t.getuName();
  2953 + }
  2954 + }
  2955 + Long ts = t.getTs();
  2956 + if (ts > fcsj1 && ts < fcsj2) {
  2957 + if (zdp.indexOf(t.getuName()) == -1) {
  2958 + if (!(zdp.length() > 0)) {
  2959 + zdpT = t.getuName() + "...";
  2960 + }
  2961 + zdp += t.getuName() + ",";
  2962 +
  2963 + }
  2964 + } else if (ts > fcsj2 && ts < fcsj3) {
  2965 + if (zwdp.indexOf(t.getuName()) == -1) {
  2966 + if (!(zwdp.length() > 0)) {
  2967 + zwdpT = t.getuName() + "...";
  2968 + }
  2969 + zwdp += t.getuName() + ",";
  2970 + }
  2971 + } else {
  2972 + if (wdp.indexOf(t.getuName()) == -1) {
  2973 + if (!(wdp.length() > 0)) {
  2974 + wdpT = t.getuName() + "...";
  2975 + }
  2976 + wdp += t.getuName() + ",";
  2977 + }
  2978 + }
  2979 + }
  2980 + } catch (ParseException e) {
  2981 + // TODO Auto-generated catch block
  2982 + e.printStackTrace();
  2983 + }
  2984 + map.put("zdp", zdp);
  2985 + map.put("zwdp", zwdp);
  2986 + map.put("wdp", wdp);
  2987 + map.put("zdpT", zdpT);
  2988 + map.put("zwdpT", zwdpT);
  2989 + map.put("wdpT", wdpT);
  2990 + map.put("dbdp", dbdp);
  2991 + return map;
  2992 + }
2804 2993  
2805 2994 }
... ...
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
  View file @19a1fca
... ... @@ -109,7 +109,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
109 109 //当天DLB信息
110 110 List<Dlb> dlList=repository.obtainDl(rq, "", "", line, "", "nbbm");
111 111 //当天YLXXB信息
112   - List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,"");
  112 + List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,3,"");
113 113 //当天加电信息表
114 114 List<Jdl> jdlList=jdlRepository.JdlList(rq);
115 115 //前一天所有车辆最后进场班次信息
... ... @@ -261,7 +261,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
261 261 // 当天DLB信息
262 262 List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
263 263 // 当天YLXXB信息
264   - List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 1,gsbm);
  264 + List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 3,gsbm);
265 265 // 从排班表中计算出行驶的总里程
266 266 List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
267 267 List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
... ... @@ -570,7 +570,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
570 570 // 当天DLB信息
571 571 List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
572 572 // 当天YLXXB信息
573   - List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 1,gsbm);
  573 + List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 3,gsbm);
574 574 // 从排班表中计算出行驶的总里程
575 575 List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
576 576 List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList("", rq, gsbm, fgsbm, "", nbbm);
... ... @@ -631,10 +631,10 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
631 631 Collections.sort(listpb,new NbbmJcsxMap());
632 632 for (int x = 0; x < listpb_.size(); x++) {
633 633 String type = "add";
634   - boolean sfdc = false;
  634 + boolean sfdc = true;
635 635 Map<String, Object> map_ = listpb_.get(x);
636 636 if (carsMap.get(map_.get("clZbh").toString()) != null) {
637   - if(map_.get("clZbh").toString().equals("0")){
  637 + if(carsMap.get(map_.get("clZbh").toString()).toString().equals("0")){
638 638 sfdc = false;
639 639 }
640 640 } else {
... ... @@ -1379,7 +1379,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
1379 1379 }
1380 1380 }
1381 1381 List<Jdl> jdlList=jdlRepository.JdlList(date);
1382   - List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 1,gsdm);
  1382 + List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(date, 3,gsdm);
1383 1383 Map<String, Object> newMap_=new HashMap<String,Object>();
1384 1384 Map<String, Object> cMap=new HashMap<String, Object>();
1385 1385 List<Map<String, Object>> listpb_=listpbDc;
... ...
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @19a1fca
... ... @@ -333,14 +333,13 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
333 333 boolean sfdc = true;
334 334 Map<String, Object> map = listpb.get(x);
335 335 if (carsMap.get(map.get("clZbh").toString()) != null) {
336   - if(map.get("clZbh").toString().equals("1")){
337   - sfdc=true;
  336 + if(carsMap.get(map.get("clZbh").toString()).toString().equals("1")){
  337 + sfdc=false;
338 338 }
339   -// sfdc = carsMap.get(map.get("clZbh").toString());
340 339 } else {
341   - sfdc = true;
  340 + sfdc = false;
342 341 }
343   - if (!sfdc) {
  342 + if (sfdc) {
344 343 // 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
345 344 Ylb t = new Ylb();
346 345 for (int k = 0; k < ylList.size(); k++) {
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @19a1fca
... ... @@ -1234,7 +1234,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1234 1234 ScheduleModifyLogger.sftz(sch, fcsjActual, remarks);
1235 1235  
1236 1236 sch.setFcsjActualAll(fcsjActual);
1237   - sch.setRemark(remarks);
  1237 + sch.addRemarks(remarks);
1238 1238 sch.calcStatus();
1239 1239 //if(sch.isLate2()){
1240 1240 //取消应发未到标记
... ...
src/main/resources/static/pages/electricity/list/list_jd.html
  View file @19a1fca
... ... @@ -422,7 +422,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
422 422 }
423 423 })
424 424 //获取加存信息
425   - $("#obtainJd").on('click', function () {
  425 + $("#obtain").on('click', function () {
426 426 if ($("#rq").val() != "") {
427 427 var params=getParamsList();
428 428 $get('/ylb/checkDate',params,function(status){
... ... @@ -430,7 +430,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
430 430 layer.msg('只能操作三天内数据.');
431 431 }else{
432 432 var i = layer.load(2);
433   - $get('/dlb/obtain', params, function () {
  433 + $get('/dlb/obtainJd', params, function () {
434 434 layer.close(i);
435 435 jsDoQuery(params, true);
436 436 });
... ...
src/main/resources/static/pages/forms/statement/waybillJd.html 0 → 100644
  View file @19a1fca
  1 +<style type="text/css">
  2 + .table-bordered {
  3 + border: 1px solid; }
  4 + .table-bordered > thead > tr > th,
  5 + .table-bordered > thead > tr > td,
  6 + .table-bordered > tbody > tr > th,
  7 + .table-bordered > tbody > tr > td,
  8 + .table-bordered > tfoot > tr > th,
  9 + .table-bordered > tfoot > tr > td {
  10 + border: 1px solid; }
  11 + .table-bordered > thead > tr > th,
  12 + .table-bordered > thead > tr > td {
  13 + border-bottom-width: 2px; }
  14 +
  15 + .table > tbody + tbody {
  16 + border-top: 1px solid; }
  17 +</style>
  18 +
  19 +<div class="page-head">
  20 + <div class="page-title">
  21 + <h1>行车路单</h1>
  22 + </div>
  23 +</div>
  24 +
  25 +<div class="row">
  26 + <div class="col-md-12">
  27 + <div class="portlet light porttlet-fit bordered">
  28 + <div class="portlet-title">
  29 + <form class="form-inline" action="">
  30 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_xcld">
  31 + <span class="item-label" style="width: 80px;">公司: </span>
  32 + <select class="form-control" name="company" id="gsdmXcld" style="width: 180px;"></select>
  33 + </div>
  34 + <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_xcld">
  35 + <span class="item-label" style="width: 80px;">分公司: </span>
  36 + <select class="form-control" name="subCompany" id="fgsdmXcld" style="width: 180px;"></select>
  37 + </div>
  38 + <div style="margin-top: 2px"></div>
  39 + <div style="display: inline-block; margin-left: 33px;">
  40 + <span class="item-label" style="width: 80px;">线路: </span>
  41 + <select class="form-control" name="line" id="line" style="width: 180px;"></select>
  42 + </div>
  43 + <div style="display: inline-block;margin-left: 24px;">
  44 + <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
  45 + <input class="form-control" type="text" id="date" style="width: 180px;"/>
  46 + </div>
  47 + <div class="form-group" style="display: inline-block;margin-left: 15px;">
  48 + <input class="btn btn-default" type="button" id="query" value="查询"/>
  49 + <input class="btn btn-default" type="button" id="export" value="导出"/>
  50 + <input class="btn btn-default" type="button" id="print" value="打印"/>
  51 + <input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
  52 + </div>
  53 + </form>
  54 + </div>
  55 + <div class="portlet-body">
  56 + <div class="row">
  57 + <div class="col-md-3">
  58 + <div class="" id="left_height" style="margin-top: 10px;overflow:auto;">
  59 + <table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
  60 + <thead>
  61 + <tr class="hidden">
  62 + <th class="rypx" style="cursor:pointer ">人员</th>
  63 + <th class="zbhpx" style="cursor:pointer ">自编号</th>
  64 + <th class="lppx" style="cursor:pointer ">路牌</th>
  65 + </tr>
  66 + </thead>
  67 + <tbody>
  68 +
  69 + </tbody>
  70 + </table>
  71 + </div>
  72 + </div>
  73 + <div class="col-md-9" id="printArea">
  74 + <div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;">
  75 + <table class="table table-bordered table-checkable" id="forms">
  76 + <tbody class="ludan_1">
  77 +
  78 + </tbody>
  79 + <tbody class="ludan_2">
  80 +
  81 + </tbody>
  82 + <tbody class="ludan_3">
  83 +
  84 + </tbody>
  85 + <tbody class="ludan_4">
  86 +
  87 + </tbody>
  88 + </table>
  89 + </div>
  90 + </div>
  91 + </div>
  92 + </div>
  93 + </div>
  94 + </div>
  95 +</div>
  96 +
  97 +<script>
  98 + $(function(){
  99 + var fage=false;
  100 + // 关闭左侧栏
  101 + if (!$('body').hasClass('page-sidebar-closed'))
  102 + $('.menu-toggler.sidebar-toggler').click();
  103 +
  104 + $("#date").datetimepicker({
  105 + format : 'YYYY-MM-DD',
  106 + locale : 'zh-cn'
  107 + });
  108 +
  109 + $("#left_height").height($(window).height()-100);
  110 + $("#xcld_height").height($(window).height()-100);
  111 +
  112 + var d = new Date();
  113 + var year = d.getFullYear();
  114 + var month = d.getMonth() + 1;
  115 + var day = d.getDate();
  116 + if(month < 10)
  117 + month = "0" + month;
  118 + if(day < 10)
  119 + day = "0" + day;
  120 + $("#date").val(year + "-" + month + "-" + day);
  121 +
  122 + var obj = [];
  123 + var xlList;
  124 + $.get('/report/lineList',function(result){
  125 + xlList=result;
  126 +
  127 + $.get('/user/companyData', function(result){
  128 + obj = result;
  129 + console.log(obj);
  130 + var options = '';
  131 + for(var i = 0; i < obj.length; i++){
  132 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  133 + }
  134 +
  135 + if(obj.length ==0){
  136 + $("#gsdmDiv_xcld").css('display','none');
  137 + }else if(obj.length ==1){
  138 + $("#gsdmDiv_xcld").css('display','none');
  139 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  140 + $('#fgsdmDiv_xcld').css('display','none');
  141 + }
  142 + $('#gsdmXcld').html(options);
  143 +
  144 + updateCompany();
  145 + });
  146 + });
  147 +
  148 + $("#gsdmXcld").on("change",updateCompany);
  149 + function updateCompany(){
  150 + var company = $('#gsdmXcld').val();
  151 + var options = '';
  152 + for(var i = 0; i < obj.length; i++){
  153 + if(obj[i].companyCode == company){
  154 + var children = obj[i].children;
  155 + for(var j = 0; j < children.length; j++){
  156 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  157 + }
  158 + }
  159 + }
  160 + $('#fgsdmXcld').html(options);
  161 +// initXl();
  162 + }
  163 +
  164 +
  165 +
  166 +
  167 +// $("#fgsdmXcld").on("change",initXl);
  168 + /* function initXl(){
  169 + var data=[];
  170 + if(fage){
  171 + $("#line").select2("destroy").html('');
  172 + }
  173 + var fgs=$('#fgsdmXcld').val();
  174 + var gs=$('#gsdmXcld').val();
  175 + for(var i=0;i<xlList.length;i++){
  176 + if(gs!=""){
  177 + if(fgs!=""){
  178 + if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
  179 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  180 + }
  181 + }else{
  182 + if(xlList[i]["gsbm"]==gs){
  183 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  184 + }
  185 + }
  186 + }
  187 + }
  188 + initPinYinSelect2('#line',data,'');
  189 + fage=true;
  190 + } */
  191 +
  192 + var tempData = {};
  193 + $.get('/report/lineList',function(xlList){
  194 + var data = [];
  195 +// data.push({id: " ", text: "全部线路"});
  196 + $.get('/user/companyData', function(result){
  197 + for(var i = 0; i < result.length; i++){
  198 + var companyCode = result[i].companyCode;
  199 + var children = result[i].children;
  200 + for(var j = 0; j < children.length; j++){
  201 + var code = children[j].code;
  202 + for(var k=0;k < xlList.length;k++ ){
  203 + if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
  204 + data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
  205 + tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
  206 + }
  207 + }
  208 + }
  209 + }
  210 + initPinYinSelect2('#line',data,'');
  211 +
  212 + });
  213 + });
  214 +
  215 + $("#line").on("change", function(){
  216 + if($("#line").val() == " "){
  217 + $("#gsdmXcld").attr("disabled", false);
  218 + $("#fgsdmXcld").attr("disabled", false);
  219 + } else {
  220 + var temp = tempData[$("#line").val()].split(":");
  221 + $("#gsdmXcld").val(temp[0]);
  222 + updateCompany();
  223 + $("#fgsdmXcld").val(temp[1]);
  224 + $("#gsdmXcld").attr("disabled", true);
  225 + $("#fgsdmXcld").attr("disabled", true);
  226 + }
  227 + });
  228 + var date = '';
  229 + var line = '';
  230 + $("#query").on("click",function(){
  231 + $("#left_height").height($(window).height()-100);
  232 + line = $("#line").val();
  233 + date = $("#date").val();
  234 + $(".hidden").removeClass("hidden");
  235 + $get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
  236 + // 把数据填充到模版中
  237 + var tbodyHtml = template('list_info',{list:result});
  238 + // 把渲染好的模版html文本追加到表格中
  239 + $('#info tbody').html(tbodyHtml);
  240 + });
  241 + });
  242 + var type="desc";
  243 + $(".rypx").on("click",function(){
  244 + line = $("#line").val();
  245 + date = $("#date").val();
  246 + $(".hidden").removeClass("hidden");
  247 + $get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"jGh",type:type},function(result){
  248 + if(type=="desc"){
  249 + type ="asc";
  250 + }else{
  251 + type ="desc";
  252 + }
  253 + // 把数据填充到模版中
  254 + var tbodyHtml = template('list_info_px',{list:result});
  255 + // 把渲染好的模版html文本追加到表格中
  256 + $('#info tbody').html(tbodyHtml);
  257 + });
  258 + })
  259 +
  260 + $(".zbhpx").on("click",function(){
  261 + line = $("#line").val();
  262 + date = $("#date").val();
  263 + $(".hidden").removeClass("hidden");
  264 + $get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"clZbh",type:type},function(result){
  265 + if(type=="desc"){
  266 + type ="asc";
  267 + }else{
  268 + type ="desc";
  269 + }
  270 + // 把数据填充到模版中
  271 + var tbodyHtml = template('list_info_px',{list:result});
  272 + // 把渲染好的模版html文本追加到表格中
  273 + $('#info tbody').html(tbodyHtml);
  274 + });
  275 + })
  276 +
  277 + $(".lppx").on("click",function(){
  278 + line = $("#line").val();
  279 + date = $("#date").val();
  280 + $(".hidden").removeClass("hidden");
  281 + $get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"lpName",type:type},function(result){
  282 + if(type=="desc"){
  283 + type ="asc";
  284 + }else{
  285 + type ="desc";
  286 + }
  287 + // 把数据填充到模版中
  288 + var tbodyHtml = template('list_info_px',{list:result});
  289 + // 把渲染好的模版html文本追加到表格中
  290 + $('#info tbody').html(tbodyHtml);
  291 + });
  292 + })
  293 +
  294 + var params = new Array();
  295 + var jName = '';
  296 + var jGh = '';
  297 + $("#info tbody").on("click","tr",function(){
  298 + if($(this).children().size() < 2){
  299 + return;
  300 + }
  301 + $("#xcld_height").height($(window).height()-100);
  302 + $(this).children().each(function(index){
  303 + params[index] = $(this).text();
  304 + });
  305 + jName = params[0].split("\\")[0];
  306 + jGh = params[0].split("\\")[1];
  307 + var id = params[3];
  308 + var obj = $(this);
  309 + $get('/busInterval/MapById',{id:id},function(result){
  310 + result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
  311 + var ludan_1 = template('ludan_1',result);
  312 + // 把渲染好的模版html文本追加到表格中
  313 + $('#forms .ludan_1').html(ludan_1);
  314 + });
  315 + $get('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  316 + getTime(result);
  317 + var ludan_2 = template('ludan_2',{list:result});
  318 + // 把渲染好的模版html文本追加到表格中
  319 + $('#forms .ludan_2').html(ludan_2);
  320 + });
  321 + $get('/realSchedule/findKMBC',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  322 + var ludan_3 = template('ludan_3',result);
  323 + $('#forms .ludan_3').html(ludan_3);
  324 + $("#info tbody tr").css('background-color', '');
  325 + obj.css('background-color', '#99CCFF');
  326 + });
  327 +
  328 +
  329 + });
  330 +
  331 + $("#export").on("click",function(){
  332 + if(params.length < 1){
  333 + return;
  334 + }
  335 + var i = layer.load(2);
  336 + $get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  337 + var fileName=date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单";
  338 + window.open("/downloadFile/download?fileName="+encodeURIComponent(fileName));
  339 + layer.close(i);
  340 + });
  341 + });
  342 +
  343 + $("#print").click(function(){
  344 + $("#printArea").printArea();
  345 + });
  346 +
  347 + $("#exportMore").on("click",function(){
  348 + if($("#info tbody tr td").length <= 1)
  349 + return;
  350 + var i = layer.load(2);
  351 + var param = new Array();
  352 + $("#info tbody tr").each(function(index){
  353 + param[index] = new Array();
  354 + $(this).children().each(function(i){
  355 + if(i<3){
  356 + param[index][i] = $(this).text().split("\\")[0];
  357 + if(i==0){
  358 + param[index][3] = $(this).text().split("\\")[1];
  359 +
  360 + }
  361 + }
  362 + });
  363 + });
  364 +// $get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
  365 +// window.open("/downloadFile/downloadList?fileName="+result.fileName); //下载压缩包
  366 + $get('/busInterval/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
  367 + window.open("/downloadFile/download?fileName="+result.fileName);
  368 + layer.close(i);
  369 + });
  370 + });
  371 +
  372 + function getTime(list){
  373 + $.each(list, function(i, obj) {
  374 + if(obj.zdsj != null && obj.zdsjActual != null ){
  375 + var zdsjActual = (obj.zdsjActual).split(":");
  376 + var zdsj = (obj.zdsj).split(":");
  377 + if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
  378 + obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
  379 + }
  380 + else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
  381 + obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
  382 + }
  383 + }
  384 + });
  385 + }
  386 + });
  387 +</script>
  388 +<script type="text/html" id="list_info">
  389 + {{each list as obj i}}
  390 + <tr>
  391 + <td width="45%">{{obj[4]}}\{{obj[1]}}</td>
  392 + <td width="32%">{{obj[2]}}</td>
  393 + <td width="20%">{{obj[3]}}</td>
  394 + <td width="3%" hidden="true">{{obj[0]}}</td>
  395 + </tr>
  396 + {{/each}}
  397 + {{if list.length == 0}}
  398 + <tr>
  399 + <td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
  400 + </tr>
  401 + {{/if}}
  402 +</script>
  403 +<script type="text/html" id="list_info_px">
  404 + {{each list as obj i}}
  405 + <tr>
  406 +
  407 + <td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
  408 + <td width="32%">{{obj.clZbh}}</td>
  409 + <td width="23%">{{obj.lpName}}</td>
  410 + <td hidden="true">{{obj.id}}</td>
  411 + </tr>
  412 + {{/each}}
  413 + {{if list.length == 0}}
  414 + <tr>
  415 + <td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
  416 + </tr>
  417 + {{/if}}
  418 +</script>
  419 +<script type="text/html" id="ludan_1">
  420 + <tr>
  421 + <td colspan="14">行车路单</td>
  422 + </tr>
  423 + <tr>
  424 + <td colspan="14">路别:{{xlName}} 路牌:{{lpName}} 车号:{{clZbh}}({{plate}}) 出场时间:{{fcsjActual}} 到达站名:{{zdzName}} 当班调派:{{dbdp}} 日期:{{scheduleDate}}</td>
  425 + </tr>
  426 + <tr>
  427 + {{if type==0}}
  428 + <td colspan="2">出场存油 {{ccyl}}升</td>
  429 + <td colspan="2">加注量 {{jzl}}升</td>
  430 + <td colspan="2">进场存油 {{jcyl}}升</td>
  431 + <td colspan="4">加注机油 &nbsp;升</td>
  432 + <td colspan="4">本日耗油 {{yh}}升</td>
  433 + {{/if}}
  434 + {{if type==1}}
  435 + <td colspan="2">出场存电 {{ccyl}}%</td>
  436 + <td colspan="2">充电量 {{jzl}}度</td>
  437 + <td colspan="2">进场存电 {{jcyl}}%</td>
  438 + <td colspan="4">加注机油 &nbsp;升</td>
  439 + <td colspan="4">本日耗电 {{yh}}度</td>
  440 + {{/if}}
  441 + {{if type==2}}
  442 + <td colspan="2">出场存电 {{ccyl}}%</td>
  443 + <td colspan="2">充电量 {{jzl}}度</td>
  444 + <td colspan="2">进场存电 {{jcyl}}%</td>
  445 + <td colspan="4">加注机油 &nbsp;升</td>
  446 + <td colspan="4">本日耗电 {{yh}}度</td>
  447 + {{/if}}
  448 + </tr>
  449 + <tr>
  450 + <td rowspan="2">调度章</td>
  451 + <td colspan="1">&nbsp;</td>
  452 + <td rowspan="2">早班</td>
  453 + <td colspan="1">&nbsp;</td>
  454 + <td rowspan="2">夜班</td>
  455 + <td colspan="1">&nbsp;</td>
  456 + <td rowspan="2" colspan="2">交叉</td>
  457 + <td colspan="2">&nbsp;</td>
  458 + <td rowspan="2">其他</td>
  459 + <td colspan="1">&nbsp;</td>
  460 + <td colspan="1">&nbsp;</td>
  461 + <td colspan="1">&nbsp;</td>
  462 + </tr>
  463 + <tr>
  464 + <td colspan="1">&nbsp;</td>
  465 + <td colspan="1">&nbsp;</td>
  466 + <td colspan="1">&nbsp;</td>
  467 + <td colspan="2">&nbsp;</td>
  468 + <td colspan="1">&nbsp;</td>
  469 + <td colspan="1">&nbsp;</td>
  470 + <td colspan="1">&nbsp;</td>
  471 + </tr>
  472 + <tr>
  473 + <td rowspan="2">车次</td>
  474 + <td colspan="2">工号</td>
  475 + <td rowspan="2">公里耗油</td>
  476 + <td colspan="2">起讫站</td>
  477 + <td colspan="4">时间</td>
  478 + <td colspan="2">误点</td>
  479 + <td rowspan="2" width="66px">里程(公里)计划</td>
  480 + <td rowspan="2">备注</td>
  481 + </tr>
  482 + <tr>
  483 + <td colspan="1" width="60px">司&nbsp;机</td>
  484 + <td colspan="1" width="60px">售&nbsp;票</td>
  485 + <td colspan="1">起点</td>
  486 + <td colspan="1">终点</td>
  487 + <td colspan="1">计发</td>
  488 + <td colspan="1">实发</td>
  489 + <td colspan="1">应到</td>
  490 + <td colspan="1">实到</td>
  491 + <td colspan="1">快</td>
  492 + <td colspan="1">慢</td>
  493 + </tr>
  494 +</script>
  495 +<script type="text/html" id="ludan_2">
  496 + {{each list as obj i}}
  497 + <tr>
  498 + <td>{{obj.adjustExps}}</td>
  499 + <td>{{obj.jGh}}{{obj.jName}}</td>
  500 + <td>{{if obj.sGh !=null}}
  501 + {{obj.sGh}}{{obj.sName}}
  502 + {{/if}}
  503 + </td>
  504 + <td>&nbsp;</td>
  505 + <td>{{obj.qdzName}}</td>
  506 + <td>{{obj.zdzName}}</td>
  507 + <td>{{obj.fcsj}}</td>
  508 + <td>{{obj.fcsjActual}}</td>
  509 + <td>{{obj.zdsj}}</td>
  510 + <td>{{obj.zdsjActual}}</td>
  511 + <td>{{obj.fast}}</td>
  512 + <td>{{obj.slow}}</td>
  513 + <td>
  514 + {{if obj.zdsjActual!=null}}
  515 + {{obj.jhlc}}
  516 + {{/if}}
  517 + </td>
  518 + <td >
  519 + {{obj.remarks}}
  520 + </td>
  521 + </tr>
  522 + {{/each}}
  523 + {{if list.length == 0}}
  524 + <tr>
  525 + <td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
  526 + </tr>
  527 + {{/if}}
  528 +</script>
  529 +<script type="text/html" id="ludan_3">
  530 + <tr>
  531 + <td colspan="2">计划班次</td>
  532 + <td>{{jhbc}}</td>
  533 + <td colspan="2">计划公里</td>
  534 + <td>{{jhlc}}</td>
  535 + <td colspan="2">烂班班次</td>
  536 + <td>{{cjbc}}</td>
  537 + <td colspan="3"> 烂班公里</td>
  538 + <td colspan="2">{{remMileage}}</td>
  539 + </tr>
  540 + <tr>
  541 + <td colspan="2">临加班次</td>
  542 + <td>{{ljbc}}</td>
  543 + <td colspan="2">临加公里</td>
  544 + <td>{{addMileage}}</td>
  545 + <td colspan="2">实际班次</td>
  546 + <td>{{sjbc}}</td>
  547 + <td colspan="3">营运公里</td>
  548 + <td colspan="2">{{yygl}}</td>
  549 + </tr>
  550 + <tr>
  551 + <td colspan="2">空驶公里</td>
  552 + <td>{{zkslc}}</td>
  553 + <td colspan="2">总公里</td>
  554 + <td>{{realMileage}}</td>
  555 + <td colspan="2"></td>
  556 + <td></td>
  557 + <td colspan="3"></td>
  558 + <td colspan="2"></td>
  559 + </tr>
  560 +</script>
... ...
src/main/resources/static/pages/oil/list_jd.html
  View file @19a1fca
... ... @@ -619,7 +619,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
619 619 layer.msg('只能操作三天内数据.');
620 620 }else{
621 621 var i = layer.load(2);
622   - $get('/ylb/obtain', params, function () {
  622 + $get('/ylb/obtainJd', params, function () {
623 623 layer.close(i);
624 624 jsDoQuery(params, true);
625 625 });
... ...