潘钊 / bsth_control · Commits

Commit 69ffd8ba41a2f4ce7e620576b560e4d7faefbe79

Authored by 娄高锋
1 parent 0f8ff1f7
build: skipped

报表统计新烂班类型“路救抛锚”里程、班次；每日自动最近一周的营收、人次(通过票务系统接口)

Inline Side-by-side
Showing 37 changed files with 1010 additions and 926 deletions
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
  View file @69ffd8b
... ... @@ -4,6 +4,7 @@ import com.bsth.data.directive.DayOfDirectives;
4 4 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
5 5 import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
6 6 import com.bsth.service.calc.CalcWaybillService;
  7 +import com.bsth.service.forms.BudgetService;
7 8 import com.bsth.service.oil.DlbService;
8 9 import com.bsth.data.safe_driv.SafeDrivCenter;
9 10 import com.bsth.service.oil.YlbService;
... ... @@ -35,6 +36,9 @@ public class CalcOilThread extends Thread{
35 36  
36 37 @Autowired
37 38 CalcWaybillService calcWaybillService;
  39 +
  40 + @Autowired
  41 + BudgetService budgetService;
38 42  
39 43 @Override
40 44 public void run() {
... ... @@ -55,7 +59,7 @@ public class CalcOilThread extends Thread{
55 59 }
56 60  
57 61 try{
58   - logger.info("计算路单里程加注量结束！");
  62 + logger.info("计算路单里程开始");
59 63 calcWaybillService.autoGenerate("", "");
60 64 }catch(Exception e){
61 65 logger.error("计算路单里程失败",e);
... ... @@ -67,6 +71,14 @@ public class CalcOilThread extends Thread{
67 71 }catch(Exception e){
68 72 logger.error("统计日报失败",e);
69 73 }
  74 +
  75 + logger.info("开始获取营收人次....");
  76 + try{
  77 + budgetService.updateRevenueRange("", "");
  78 + }catch(Exception e){
  79 + logger.error("获取营收人次失败",e);
  80 + }
  81 +
70 82 //清除指令数据
71 83 dayOfDirectives.clearAll();
72 84 //清除安全驾驶数据
... ...
src/main/java/com/bsth/entity/calc/CalcLineMileage.java
  View file @69ffd8b
1   -package com.bsth.entity.calc;
2   -
3   -import java.util.Date;
4   -
5   -import javax.persistence.*;
6   -
7   -@Entity
8   -@Table(name = "calc_line_mileage")
9   -public class CalcLineMileage {
10   - /* 主键*/
11   - @Id
12   - @GeneratedValue(strategy = GenerationType.IDENTITY)
13   - private Long id;
14   - /* 日期*/
15   - private Date date;
16   - /* 日期字符串*/
17   - private String dateStr;
18   - /* 线路编码*/
19   - private String xl;
20   - /* 线路名称*/
21   - private String xlName;
22   - /* 公司代码*/
23   - private String gsdm;
24   - /* 公司名称*/
25   - private String gsName;
26   - /* 分公司代码*/
27   - private String fgsdm;
28   - /* 分公司名称*/
29   - private String fgsName;
30   - /* 计划总里程*/
31   - private Double jhzlc;
32   - /* 计划营运程*/
33   - private Double jhlc;
34   - /* 计划空驶程*/
35   - private Double jcclc;
36   - /* 实际总里程*/
37   - private Double sjzgl;
38   - /* 计划内里程*/
39   - private Double jhnlc;
40   - /* 计划外里程*/
41   - private Double jhwlc;
42   - /* 计划内进出场空驶*/
43   - private Double jhnjcclc;
44   - /* 计划外进出场空驶*/
45   - private Double jhwjcclc;
46   - /* 计划外进出场空驶_*/
47   - private Double jhwjcclcz;
48   - /* 故障进出场空驶*/
49   - private Double zrwjcclc;
50   - /* 肇事进出场空驶*/
51   - private Double zrwjcclc1;
52   - /* 纠纷进出场空驶*/
53   - private Double zrwjcclc2;
54   - /* 其他进出场空驶*/
55   - private Double zrwjcclcqt;
56   - /* 空放 空驶*/
57   - private Double kfks;
58   - /* 少驶营运里程*/
59   - private Double lbss;
60   - /* 少驶 路阻*/
61   - private Double ssglLz;
62   - /* 少驶 吊慢*/
63   - private Double ssglDm;
64   - /* 少驶 故障*/
65   - private Double ssglGz;
66   - /* 少驶 纠纷*/
67   - private Double ssglJf;
68   - /* 少驶 肇事*/
69   - private Double ssglZs;
70   - /* 少驶 缺人*/
71   - private Double ssglQr;
72   - /* 少驶 缺车*/
73   - private Double ssglQc;
74   - /* 少驶 客稀*/
75   - private Double ssglKx;
76   - /* 少驶 气候*/
77   - private Double ssglQh;
78   - /* 少驶 援外*/
79   - private Double ssglYw;
80   - /* 少驶 其他*/
81   - private Double ssglOther;
82   - /* 临加营运公里*/
83   - private Double ljyy;
84   - /* 临加进出场空驶*/
85   - private Double ljjcc;
86   - /* 临加空放空驶*/
87   - private Double ljkfks;
88   - /* 备注*/
89   - private String remark;
90   - /* 创建时间*/
91   - private Date createDate;
92   -
93   - public Long getId() {
94   - return id;
95   - }
96   - public void setId(Long id) {
97   - this.id = id;
98   - }
99   - public Date getDate() {
100   - return date;
101   - }
102   - public void setDate(Date date) {
103   - this.date = date;
104   - }
105   - public String getDateStr() {
106   - return dateStr;
107   - }
108   - public void setDateStr(String dateStr) {
109   - this.dateStr = dateStr;
110   - }
111   - public String getXl() {
112   - return xl;
113   - }
114   - public void setXl(String xl) {
115   - this.xl = xl;
116   - }
117   - public String getXlName() {
118   - return xlName;
119   - }
120   - public void setXlName(String xlName) {
121   - this.xlName = xlName;
122   - }
123   - public String getGsdm() {
124   - return gsdm;
125   - }
126   - public void setGsdm(String gsdm) {
127   - this.gsdm = gsdm;
128   - }
129   - public String getGsName() {
130   - return gsName;
131   - }
132   - public void setGsName(String gsName) {
133   - this.gsName = gsName;
134   - }
135   - public String getFgsdm() {
136   - return fgsdm;
137   - }
138   - public void setFgsdm(String fgsdm) {
139   - this.fgsdm = fgsdm;
140   - }
141   - public String getFgsName() {
142   - return fgsName;
143   - }
144   - public void setFgsName(String fgsName) {
145   - this.fgsName = fgsName;
146   - }
147   - public Double getJhzlc() {
148   - return jhzlc;
149   - }
150   - public void setJhzlc(Double jhzlc) {
151   - this.jhzlc = jhzlc;
152   - }
153   - public Double getJhlc() {
154   - return jhlc;
155   - }
156   - public void setJhlc(Double jhlc) {
157   - this.jhlc = jhlc;
158   - }
159   - public Double getJcclc() {
160   - return jcclc;
161   - }
162   - public void setJcclc(Double jcclc) {
163   - this.jcclc = jcclc;
164   - }
165   - public Double getSjzgl() {
166   - return sjzgl;
167   - }
168   - public void setSjzgl(Double sjzgl) {
169   - this.sjzgl = sjzgl;
170   - }
171   - public Double getJhnlc() {
172   - return jhnlc;
173   - }
174   - public void setJhnlc(Double jhnlc) {
175   - this.jhnlc = jhnlc;
176   - }
177   - public Double getJhwlc() {
178   - return jhwlc;
179   - }
180   - public void setJhwlc(Double jhwlc) {
181   - this.jhwlc = jhwlc;
182   - }
183   - public Double getJhnjcclc() {
184   - return jhnjcclc;
185   - }
186   - public void setJhnjcclc(Double jhnjcclc) {
187   - this.jhnjcclc = jhnjcclc;
188   - }
189   - public Double getJhwjcclc() {
190   - return jhwjcclc;
191   - }
192   - public void setJhwjcclc(Double jhwjcclc) {
193   - this.jhwjcclc = jhwjcclc;
194   - }
195   - public Double getJhwjcclcz() {
196   - return jhwjcclcz;
197   - }
198   - public void setJhwjcclcz(Double jhwjcclcz) {
199   - this.jhwjcclcz = jhwjcclcz;
200   - }
201   - public Double getZrwjcclc() {
202   - return zrwjcclc;
203   - }
204   - public void setZrwjcclc(Double zrwjcclc) {
205   - this.zrwjcclc = zrwjcclc;
206   - }
207   - public Double getZrwjcclc1() {
208   - return zrwjcclc1;
209   - }
210   - public void setZrwjcclc1(Double zrwjcclc1) {
211   - this.zrwjcclc1 = zrwjcclc1;
212   - }
213   - public Double getZrwjcclc2() {
214   - return zrwjcclc2;
215   - }
216   - public void setZrwjcclc2(Double zrwjcclc2) {
217   - this.zrwjcclc2 = zrwjcclc2;
218   - }
219   - public Double getZrwjcclcqt() {
220   - return zrwjcclcqt;
221   - }
222   - public void setZrwjcclcqt(Double zrwjcclcqt) {
223   - this.zrwjcclcqt = zrwjcclcqt;
224   - }
225   - public Double getKfks() {
226   - return kfks;
227   - }
228   - public void setKfks(Double kfks) {
229   - this.kfks = kfks;
230   - }
231   - public Double getLbss() {
232   - return lbss;
233   - }
234   - public void setLbss(Double lbss) {
235   - this.lbss = lbss;
236   - }
237   - public Double getSsglLz() {
238   - return ssglLz;
239   - }
240   - public void setSsglLz(Double ssglLz) {
241   - this.ssglLz = ssglLz;
242   - }
243   - public Double getSsglDm() {
244   - return ssglDm;
245   - }
246   - public void setSsglDm(Double ssglDm) {
247   - this.ssglDm = ssglDm;
248   - }
249   - public Double getSsglGz() {
250   - return ssglGz;
251   - }
252   - public void setSsglGz(Double ssglGz) {
253   - this.ssglGz = ssglGz;
254   - }
255   - public Double getSsglJf() {
256   - return ssglJf;
257   - }
258   - public void setSsglJf(Double ssglJf) {
259   - this.ssglJf = ssglJf;
260   - }
261   - public Double getSsglZs() {
262   - return ssglZs;
263   - }
264   - public void setSsglZs(Double ssglZs) {
265   - this.ssglZs = ssglZs;
266   - }
267   - public Double getSsglQr() {
268   - return ssglQr;
269   - }
270   - public void setSsglQr(Double ssglQr) {
271   - this.ssglQr = ssglQr;
272   - }
273   - public Double getSsglQc() {
274   - return ssglQc;
275   - }
276   - public void setSsglQc(Double ssglQc) {
277   - this.ssglQc = ssglQc;
278   - }
279   - public Double getSsglKx() {
280   - return ssglKx;
281   - }
282   - public void setSsglKx(Double ssglKx) {
283   - this.ssglKx = ssglKx;
284   - }
285   - public Double getSsglQh() {
286   - return ssglQh;
287   - }
288   - public void setSsglQh(Double ssglQh) {
289   - this.ssglQh = ssglQh;
290   - }
291   - public Double getSsglYw() {
292   - return ssglYw;
293   - }
294   - public void setSsglYw(Double ssglYw) {
295   - this.ssglYw = ssglYw;
296   - }
297   - public Double getSsglOther() {
298   - return ssglOther;
299   - }
300   - public void setSsglOther(Double ssglOther) {
301   - this.ssglOther = ssglOther;
302   - }
303   - public Double getLjyy() {
304   - return ljyy;
305   - }
306   - public void setLjyy(Double ljyy) {
307   - this.ljyy = ljyy;
308   - }
309   - public Double getLjjcc() {
310   - return ljjcc;
311   - }
312   - public void setLjjcc(Double ljjcc) {
313   - this.ljjcc = ljjcc;
314   - }
315   - public Double getLjkfks() {
316   - return ljkfks;
317   - }
318   - public void setLjkfks(Double ljkfks) {
319   - this.ljkfks = ljkfks;
320   - }
321   - public String getRemark() {
322   - return remark;
323   - }
324   - public void setRemark(String remark) {
325   - this.remark = remark;
326   - }
327   - public Date getCreateDate() {
328   - return createDate;
329   - }
330   - public void setCreateDate(Date createDate) {
331   - this.createDate = createDate;
332   - }
333   -
334   -}
  1 +package com.bsth.entity.calc;
  2 +
  3 +import java.util.Date;
  4 +
  5 +import javax.persistence.*;
  6 +
  7 +@Entity
  8 +@Table(name = "calc_line_mileage")
  9 +public class CalcLineMileage {
  10 + /* 主键*/
  11 + @Id
  12 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  13 + private Long id;
  14 + /* 日期*/
  15 + private Date date;
  16 + /* 日期字符串*/
  17 + private String dateStr;
  18 + /* 线路编码*/
  19 + private String xl;
  20 + /* 线路名称*/
  21 + private String xlName;
  22 + /* 公司代码*/
  23 + private String gsdm;
  24 + /* 公司名称*/
  25 + private String gsName;
  26 + /* 分公司代码*/
  27 + private String fgsdm;
  28 + /* 分公司名称*/
  29 + private String fgsName;
  30 + /* 计划总里程*/
  31 + private Double jhzlc;
  32 + /* 计划营运程*/
  33 + private Double jhlc;
  34 + /* 计划空驶程*/
  35 + private Double jcclc;
  36 + /* 实际总里程*/
  37 + private Double sjzgl;
  38 + /* 计划内里程*/
  39 + private Double jhnlc;
  40 + /* 计划外里程*/
  41 + private Double jhwlc;
  42 + /* 计划内进出场空驶*/
  43 + private Double jhnjcclc;
  44 + /* 计划外进出场空驶*/
  45 + private Double jhwjcclc;
  46 + /* 计划外进出场空驶_*/
  47 + private Double jhwjcclcz;
  48 + /* 故障进出场空驶*/
  49 + private Double zrwjcclc;
  50 + /* 肇事进出场空驶*/
  51 + private Double zrwjcclc1;
  52 + /* 纠纷进出场空驶*/
  53 + private Double zrwjcclc2;
  54 + /* 其他进出场空驶*/
  55 + private Double zrwjcclcqt;
  56 + /* 空放 空驶*/
  57 + private Double kfks;
  58 + /* 少驶营运里程*/
  59 + private Double lbss;
  60 + /* 少驶 路阻*/
  61 + private Double ssglLz;
  62 + /* 少驶 吊慢*/
  63 + private Double ssglDm;
  64 + /* 少驶 故障*/
  65 + private Double ssglGz;
  66 + /* 少驶 纠纷*/
  67 + private Double ssglJf;
  68 + /* 少驶 肇事*/
  69 + private Double ssglZs;
  70 + /* 少驶 缺人*/
  71 + private Double ssglQr;
  72 + /* 少驶 缺车*/
  73 + private Double ssglQc;
  74 + /* 少驶 客稀*/
  75 + private Double ssglKx;
  76 + /* 少驶 气候*/
  77 + private Double ssglQh;
  78 + /* 少驶 援外*/
  79 + private Double ssglYw;
  80 + /* 少驶 路救抛锚*/
  81 + private Double ssglLjpm;
  82 + /* 少驶 其他*/
  83 + private Double ssglOther;
  84 + /* 临加营运公里*/
  85 + private Double ljyy;
  86 + /* 临加进出场空驶*/
  87 + private Double ljjcc;
  88 + /* 临加空放空驶*/
  89 + private Double ljkfks;
  90 + /* 备注*/
  91 + private String remark;
  92 + /* 创建时间*/
  93 + private Date createDate;
  94 +
  95 + public Long getId() {
  96 + return id;
  97 + }
  98 + public void setId(Long id) {
  99 + this.id = id;
  100 + }
  101 + public Date getDate() {
  102 + return date;
  103 + }
  104 + public void setDate(Date date) {
  105 + this.date = date;
  106 + }
  107 + public String getDateStr() {
  108 + return dateStr;
  109 + }
  110 + public void setDateStr(String dateStr) {
  111 + this.dateStr = dateStr;
  112 + }
  113 + public String getXl() {
  114 + return xl;
  115 + }
  116 + public void setXl(String xl) {
  117 + this.xl = xl;
  118 + }
  119 + public String getXlName() {
  120 + return xlName;
  121 + }
  122 + public void setXlName(String xlName) {
  123 + this.xlName = xlName;
  124 + }
  125 + public String getGsdm() {
  126 + return gsdm;
  127 + }
  128 + public void setGsdm(String gsdm) {
  129 + this.gsdm = gsdm;
  130 + }
  131 + public String getGsName() {
  132 + return gsName;
  133 + }
  134 + public void setGsName(String gsName) {
  135 + this.gsName = gsName;
  136 + }
  137 + public String getFgsdm() {
  138 + return fgsdm;
  139 + }
  140 + public void setFgsdm(String fgsdm) {
  141 + this.fgsdm = fgsdm;
  142 + }
  143 + public String getFgsName() {
  144 + return fgsName;
  145 + }
  146 + public void setFgsName(String fgsName) {
  147 + this.fgsName = fgsName;
  148 + }
  149 + public Double getJhzlc() {
  150 + return jhzlc;
  151 + }
  152 + public void setJhzlc(Double jhzlc) {
  153 + this.jhzlc = jhzlc;
  154 + }
  155 + public Double getJhlc() {
  156 + return jhlc;
  157 + }
  158 + public void setJhlc(Double jhlc) {
  159 + this.jhlc = jhlc;
  160 + }
  161 + public Double getJcclc() {
  162 + return jcclc;
  163 + }
  164 + public void setJcclc(Double jcclc) {
  165 + this.jcclc = jcclc;
  166 + }
  167 + public Double getSjzgl() {
  168 + return sjzgl;
  169 + }
  170 + public void setSjzgl(Double sjzgl) {
  171 + this.sjzgl = sjzgl;
  172 + }
  173 + public Double getJhnlc() {
  174 + return jhnlc;
  175 + }
  176 + public void setJhnlc(Double jhnlc) {
  177 + this.jhnlc = jhnlc;
  178 + }
  179 + public Double getJhwlc() {
  180 + return jhwlc;
  181 + }
  182 + public void setJhwlc(Double jhwlc) {
  183 + this.jhwlc = jhwlc;
  184 + }
  185 + public Double getJhnjcclc() {
  186 + return jhnjcclc;
  187 + }
  188 + public void setJhnjcclc(Double jhnjcclc) {
  189 + this.jhnjcclc = jhnjcclc;
  190 + }
  191 + public Double getJhwjcclc() {
  192 + return jhwjcclc;
  193 + }
  194 + public void setJhwjcclc(Double jhwjcclc) {
  195 + this.jhwjcclc = jhwjcclc;
  196 + }
  197 + public Double getJhwjcclcz() {
  198 + return jhwjcclcz;
  199 + }
  200 + public void setJhwjcclcz(Double jhwjcclcz) {
  201 + this.jhwjcclcz = jhwjcclcz;
  202 + }
  203 + public Double getZrwjcclc() {
  204 + return zrwjcclc;
  205 + }
  206 + public void setZrwjcclc(Double zrwjcclc) {
  207 + this.zrwjcclc = zrwjcclc;
  208 + }
  209 + public Double getZrwjcclc1() {
  210 + return zrwjcclc1;
  211 + }
  212 + public void setZrwjcclc1(Double zrwjcclc1) {
  213 + this.zrwjcclc1 = zrwjcclc1;
  214 + }
  215 + public Double getZrwjcclc2() {
  216 + return zrwjcclc2;
  217 + }
  218 + public void setZrwjcclc2(Double zrwjcclc2) {
  219 + this.zrwjcclc2 = zrwjcclc2;
  220 + }
  221 + public Double getZrwjcclcqt() {
  222 + return zrwjcclcqt;
  223 + }
  224 + public void setZrwjcclcqt(Double zrwjcclcqt) {
  225 + this.zrwjcclcqt = zrwjcclcqt;
  226 + }
  227 + public Double getKfks() {
  228 + return kfks;
  229 + }
  230 + public void setKfks(Double kfks) {
  231 + this.kfks = kfks;
  232 + }
  233 + public Double getLbss() {
  234 + return lbss;
  235 + }
  236 + public void setLbss(Double lbss) {
  237 + this.lbss = lbss;
  238 + }
  239 + public Double getSsglLz() {
  240 + return ssglLz;
  241 + }
  242 + public void setSsglLz(Double ssglLz) {
  243 + this.ssglLz = ssglLz;
  244 + }
  245 + public Double getSsglDm() {
  246 + return ssglDm;
  247 + }
  248 + public void setSsglDm(Double ssglDm) {
  249 + this.ssglDm = ssglDm;
  250 + }
  251 + public Double getSsglGz() {
  252 + return ssglGz;
  253 + }
  254 + public void setSsglGz(Double ssglGz) {
  255 + this.ssglGz = ssglGz;
  256 + }
  257 + public Double getSsglJf() {
  258 + return ssglJf;
  259 + }
  260 + public void setSsglJf(Double ssglJf) {
  261 + this.ssglJf = ssglJf;
  262 + }
  263 + public Double getSsglZs() {
  264 + return ssglZs;
  265 + }
  266 + public void setSsglZs(Double ssglZs) {
  267 + this.ssglZs = ssglZs;
  268 + }
  269 + public Double getSsglQr() {
  270 + return ssglQr;
  271 + }
  272 + public void setSsglQr(Double ssglQr) {
  273 + this.ssglQr = ssglQr;
  274 + }
  275 + public Double getSsglQc() {
  276 + return ssglQc;
  277 + }
  278 + public void setSsglQc(Double ssglQc) {
  279 + this.ssglQc = ssglQc;
  280 + }
  281 + public Double getSsglKx() {
  282 + return ssglKx;
  283 + }
  284 + public void setSsglKx(Double ssglKx) {
  285 + this.ssglKx = ssglKx;
  286 + }
  287 + public Double getSsglQh() {
  288 + return ssglQh;
  289 + }
  290 + public void setSsglQh(Double ssglQh) {
  291 + this.ssglQh = ssglQh;
  292 + }
  293 + public Double getSsglYw() {
  294 + return ssglYw;
  295 + }
  296 + public void setSsglYw(Double ssglYw) {
  297 + this.ssglYw = ssglYw;
  298 + }
  299 + public Double getSsglLjpm() {
  300 + return ssglLjpm;
  301 + }
  302 + public void setSsglLjpm(Double ssglLjpm) {
  303 + this.ssglLjpm = ssglLjpm;
  304 + }
  305 + public Double getSsglOther() {
  306 + return ssglOther;
  307 + }
  308 + public void setSsglOther(Double ssglOther) {
  309 + this.ssglOther = ssglOther;
  310 + }
  311 + public Double getLjyy() {
  312 + return ljyy;
  313 + }
  314 + public void setLjyy(Double ljyy) {
  315 + this.ljyy = ljyy;
  316 + }
  317 + public Double getLjjcc() {
  318 + return ljjcc;
  319 + }
  320 + public void setLjjcc(Double ljjcc) {
  321 + this.ljjcc = ljjcc;
  322 + }
  323 + public Double getLjkfks() {
  324 + return ljkfks;
  325 + }
  326 + public void setLjkfks(Double ljkfks) {
  327 + this.ljkfks = ljkfks;
  328 + }
  329 + public String getRemark() {
  330 + return remark;
  331 + }
  332 + public void setRemark(String remark) {
  333 + this.remark = remark;
  334 + }
  335 + public Date getCreateDate() {
  336 + return createDate;
  337 + }
  338 + public void setCreateDate(Date createDate) {
  339 + this.createDate = createDate;
  340 + }
  341 +
  342 +}
... ...
src/main/java/com/bsth/entity/calc/CalcStatistics.java
  View file @69ffd8b
... ... @@ -59,6 +59,8 @@ public class CalcStatistics {
59 59 private Double qhlc;
60 60 /* 援外公里*/
61 61 private Double ywlc;
  62 + /* 路救抛锚公里*/
  63 + private Double ljpmlc;
62 64 /* 其他公里*/
63 65 private Double qtlc;
64 66 /* 临加公里*/
... ... @@ -262,6 +264,12 @@ public class CalcStatistics {
262 264 public void setYwlc(Double ywlc) {
263 265 this.ywlc = ywlc;
264 266 }
  267 + public Double getLjpmlc() {
  268 + return ljpmlc;
  269 + }
  270 + public void setLjpmlc(Double ljpmlc) {
  271 + this.ljpmlc = ljpmlc;
  272 + }
265 273 public Double getQtlc() {
266 274 return qtlc;
267 275 }
... ...
src/main/java/com/bsth/entity/calc/CalcWaybill.java
  View file @69ffd8b
1   -package com.bsth.entity.calc;
2   -
3   -import java.util.Date;
4   -
5   -import javax.persistence.*;
6   -
7   -@Entity
8   -@Table(name = "calc_waybill")
9   -public class CalcWaybill {
10   - /* 主键*/
11   - @Id
12   - @GeneratedValue(strategy = GenerationType.IDENTITY)
13   - private Long id;
14   - /* 公司代码*/
15   - private String gsdm;
16   - /* 公司名称*/
17   - private String gsname;
18   - /* 分公司代码*/
19   - private String fgsdm;
20   - /* 分公司名称*/
21   - private String fgsname;
22   - /* 日期*/
23   - private Date rq;
24   - /* 日期字符串*/
25   - private String rqStr;
26   - /* 线路编码*/
27   - private String xl;
28   - /* 线路名称*/
29   - private String xlName;
30   - /* 车辆自编号*/
31   - private String cl;
32   - /* 路牌名字*/
33   - private String lp;
34   - /* 驾驶员工号*/
35   - private String jGh;
36   - /* 驾驶员名字*/
37   - private String jName;
38   - /* 售票员工号*/
39   - private String sGh;
40   - /* 售票员名字*/
41   - private String sName;
42   - /* 计划营运班次*/
43   - private int jhyybc;
44   - /* 计划早高峰营运班次*/
45   - private int jhyybczgf;
46   - /* 计划晚高峰营运班次*/
47   - private int jhyybcwgf;
48   - /* 计划非营运班次*/
49   - private int jhfyybc;
50   - /* 计划营运里程*/
51   - private Double jhyylc;
52   - /* 计划非营运里程*/
53   - private Double jhfyylc;
54   - /* 实际营运班次*/
55   - private int sjyybc;
56   - /* 实际早高峰营运班次*/
57   - private int sjyybczgf;
58   - /* 实际晚高峰营运班次*/
59   - private int sjyybcwgf;
60   - /* 实际非营运班次*/
61   - private int sjfyybc;
62   - /* 实际营运里程*/
63   - private Double sjyylc;
64   - /* 实际非营运里程*/
65   - private Double sjfyylc;
66   - /* 临加班次*/
67   - private int ljbc;
68   - /* 临加早高峰班次*/
69   - private int ljbczgf;
70   - /* 临加晚高峰班次*/
71   - private int ljbcwgf;
72   - /* 临加营运里程*/
73   - private Double ljyylc;
74   - /* 临加非营运里程*/
75   - private Double ljfyylc;
76   - /* 烂班班次*/
77   - private int lbbc;
78   - /* 烂班里程*/
79   - private Double lblc;
80   - /* 路阻*/
81   - private Double lblcLz;
82   - /* 吊慢*/
83   - private Double lblcDm;
84   - /* 故障*/
85   - private Double lblcGz;
86   - /* 纠纷*/
87   - private Double lblcJf;
88   - /* 肇事*/
89   - private Double lblcZs;
90   - /* 缺人*/
91   - private Double lblcQr;
92   - /* 缺车*/
93   - private Double lblcQc;
94   - /* 客稀*/
95   - private Double lblcKx;
96   - /* 气候*/
97   - private Double lblcQh;
98   - /* 援外*/
99   - private Double lblcYw;
100   - /* 其他*/
101   - private Double lblcQt;
102   - /* 放站班次*/
103   - private int fzbc;
104   - /* 放站早高峰班次*/
105   - private int fzbczgf;
106   - /* 放站晚高峰班次*/
107   - private int fzbcwgf;
108   - /* 掉头班次*/
109   - private int dtbc;
110   - /* 掉头早高峰班次*/
111   - private int dtbczgf;
112   - /* 掉头晚高峰班次*/
113   - private int dtbcwgf;
114   - /* 创建时间*/
115   - private Date createTime;
116   - /* 修改时间*/
117   - private Date updateTime;
118   - public Long getId() {
119   - return id;
120   - }
121   - public void setId(Long id) {
122   - this.id = id;
123   - }
124   - public String getGsdm() {
125   - return gsdm;
126   - }
127   - public void setGsdm(String gsdm) {
128   - this.gsdm = gsdm;
129   - }
130   - public String getGsname() {
131   - return gsname;
132   - }
133   - public void setGsname(String gsname) {
134   - this.gsname = gsname;
135   - }
136   - public String getFgsdm() {
137   - return fgsdm;
138   - }
139   - public void setFgsdm(String fgsdm) {
140   - this.fgsdm = fgsdm;
141   - }
142   - public String getFgsname() {
143   - return fgsname;
144   - }
145   - public void setFgsname(String fgsname) {
146   - this.fgsname = fgsname;
147   - }
148   - public Date getRq() {
149   - return rq;
150   - }
151   - public void setRq(Date rq) {
152   - this.rq = rq;
153   - }
154   - public String getRqStr() {
155   - return rqStr;
156   - }
157   - public void setRqStr(String rqStr) {
158   - this.rqStr = rqStr;
159   - }
160   - public String getXl() {
161   - return xl;
162   - }
163   - public void setXl(String xl) {
164   - this.xl = xl;
165   - }
166   - public String getXlName() {
167   - return xlName;
168   - }
169   - public void setXlName(String xlName) {
170   - this.xlName = xlName;
171   - }
172   - public String getCl() {
173   - return cl;
174   - }
175   - public void setCl(String cl) {
176   - this.cl = cl;
177   - }
178   - public String getLp() {
179   - return lp;
180   - }
181   - public void setLp(String lp) {
182   - this.lp = lp;
183   - }
184   - public String getjGh() {
185   - return jGh;
186   - }
187   - public void setjGh(String jGh) {
188   - this.jGh = jGh;
189   - }
190   - public String getjName() {
191   - return jName;
192   - }
193   - public void setjName(String jName) {
194   - this.jName = jName;
195   - }
196   - public String getsGh() {
197   - return sGh;
198   - }
199   - public void setsGh(String sGh) {
200   - this.sGh = sGh;
201   - }
202   - public String getsName() {
203   - return sName;
204   - }
205   - public void setsName(String sName) {
206   - this.sName = sName;
207   - }
208   - public int getJhyybc() {
209   - return jhyybc;
210   - }
211   - public void setJhyybc(int jhyybc) {
212   - this.jhyybc = jhyybc;
213   - }
214   - public int getJhyybczgf() {
215   - return jhyybczgf;
216   - }
217   - public void setJhyybczgf(int jhyybczgf) {
218   - this.jhyybczgf = jhyybczgf;
219   - }
220   - public int getJhyybcwgf() {
221   - return jhyybcwgf;
222   - }
223   - public void setJhyybcwgf(int jhyybcwgf) {
224   - this.jhyybcwgf = jhyybcwgf;
225   - }
226   - public int getJhfyybc() {
227   - return jhfyybc;
228   - }
229   - public void setJhfyybc(int jhfyybc) {
230   - this.jhfyybc = jhfyybc;
231   - }
232   - public Double getJhyylc() {
233   - return jhyylc;
234   - }
235   - public void setJhyylc(Double jhyylc) {
236   - this.jhyylc = jhyylc;
237   - }
238   - public Double getJhfyylc() {
239   - return jhfyylc;
240   - }
241   - public void setJhfyylc(Double jhfyylc) {
242   - this.jhfyylc = jhfyylc;
243   - }
244   - public int getSjyybc() {
245   - return sjyybc;
246   - }
247   - public void setSjyybc(int sjyybc) {
248   - this.sjyybc = sjyybc;
249   - }
250   - public int getSjyybczgf() {
251   - return sjyybczgf;
252   - }
253   - public void setSjyybczgf(int sjyybczgf) {
254   - this.sjyybczgf = sjyybczgf;
255   - }
256   - public int getSjyybcwgf() {
257   - return sjyybcwgf;
258   - }
259   - public void setSjyybcwgf(int sjyybcwgf) {
260   - this.sjyybcwgf = sjyybcwgf;
261   - }
262   - public int getSjfyybc() {
263   - return sjfyybc;
264   - }
265   - public void setSjfyybc(int sjfyybc) {
266   - this.sjfyybc = sjfyybc;
267   - }
268   - public Double getSjyylc() {
269   - return sjyylc;
270   - }
271   - public void setSjyylc(Double sjyylc) {
272   - this.sjyylc = sjyylc;
273   - }
274   - public Double getSjfyylc() {
275   - return sjfyylc;
276   - }
277   - public void setSjfyylc(Double sjfyylc) {
278   - this.sjfyylc = sjfyylc;
279   - }
280   - public int getLjbc() {
281   - return ljbc;
282   - }
283   - public void setLjbc(int ljbc) {
284   - this.ljbc = ljbc;
285   - }
286   - public int getLjbczgf() {
287   - return ljbczgf;
288   - }
289   - public void setLjbczgf(int ljbczgf) {
290   - this.ljbczgf = ljbczgf;
291   - }
292   - public int getLjbcwgf() {
293   - return ljbcwgf;
294   - }
295   - public void setLjbcwgf(int ljbcwgf) {
296   - this.ljbcwgf = ljbcwgf;
297   - }
298   - public Double getLjyylc() {
299   - return ljyylc;
300   - }
301   - public void setLjyylc(Double ljyylc) {
302   - this.ljyylc = ljyylc;
303   - }
304   - public Double getLjfyylc() {
305   - return ljfyylc;
306   - }
307   - public void setLjfyylc(Double ljfyylc) {
308   - this.ljfyylc = ljfyylc;
309   - }
310   - public int getLbbc() {
311   - return lbbc;
312   - }
313   - public void setLbbc(int lbbc) {
314   - this.lbbc = lbbc;
315   - }
316   - public Double getLblc() {
317   - return lblc;
318   - }
319   - public void setLblc(Double lblc) {
320   - this.lblc = lblc;
321   - }
322   - public Double getLblcLz() {
323   - return lblcLz;
324   - }
325   - public void setLblcLz(Double lblcLz) {
326   - this.lblcLz = lblcLz;
327   - }
328   - public Double getLblcDm() {
329   - return lblcDm;
330   - }
331   - public void setLblcDm(Double lblcDm) {
332   - this.lblcDm = lblcDm;
333   - }
334   - public Double getLblcGz() {
335   - return lblcGz;
336   - }
337   - public void setLblcGz(Double lblcGz) {
338   - this.lblcGz = lblcGz;
339   - }
340   - public Double getLblcJf() {
341   - return lblcJf;
342   - }
343   - public void setLblcJf(Double lblcJf) {
344   - this.lblcJf = lblcJf;
345   - }
346   - public Double getLblcZs() {
347   - return lblcZs;
348   - }
349   - public void setLblcZs(Double lblcZs) {
350   - this.lblcZs = lblcZs;
351   - }
352   - public Double getLblcQr() {
353   - return lblcQr;
354   - }
355   - public void setLblcQr(Double lblcQr) {
356   - this.lblcQr = lblcQr;
357   - }
358   - public Double getLblcQc() {
359   - return lblcQc;
360   - }
361   - public void setLblcQc(Double lblcQc) {
362   - this.lblcQc = lblcQc;
363   - }
364   - public Double getLblcKx() {
365   - return lblcKx;
366   - }
367   - public void setLblcKx(Double lblcKx) {
368   - this.lblcKx = lblcKx;
369   - }
370   - public Double getLblcQh() {
371   - return lblcQh;
372   - }
373   - public void setLblcQh(Double lblcQh) {
374   - this.lblcQh = lblcQh;
375   - }
376   - public Double getLblcYw() {
377   - return lblcYw;
378   - }
379   - public void setLblcYw(Double lblcYw) {
380   - this.lblcYw = lblcYw;
381   - }
382   - public Double getLblcQt() {
383   - return lblcQt;
384   - }
385   - public void setLblcQt(Double lblcQt) {
386   - this.lblcQt = lblcQt;
387   - }
388   - public int getFzbc() {
389   - return fzbc;
390   - }
391   - public void setFzbc(int fzbc) {
392   - this.fzbc = fzbc;
393   - }
394   - public int getFzbczgf() {
395   - return fzbczgf;
396   - }
397   - public void setFzbczgf(int fzbczgf) {
398   - this.fzbczgf = fzbczgf;
399   - }
400   - public int getFzbcwgf() {
401   - return fzbcwgf;
402   - }
403   - public void setFzbcwgf(int fzbcwgf) {
404   - this.fzbcwgf = fzbcwgf;
405   - }
406   - public int getDtbc() {
407   - return dtbc;
408   - }
409   - public void setDtbc(int dtbc) {
410   - this.dtbc = dtbc;
411   - }
412   - public int getDtbczgf() {
413   - return dtbczgf;
414   - }
415   - public void setDtbczgf(int dtbczgf) {
416   - this.dtbczgf = dtbczgf;
417   - }
418   - public int getDtbcwgf() {
419   - return dtbcwgf;
420   - }
421   - public void setDtbcwgf(int dtbcwgf) {
422   - this.dtbcwgf = dtbcwgf;
423   - }
424   - public Date getCreateTime() {
425   - return createTime;
426   - }
427   - public void setCreateTime(Date createTime) {
428   - this.createTime = createTime;
429   - }
430   - public Date getUpdateTime() {
431   - return updateTime;
432   - }
433   - public void setUpdateTime(Date updateTime) {
434   - this.updateTime = updateTime;
435   - }
436   -
437   -
438   -
439   -}
  1 +package com.bsth.entity.calc;
  2 +
  3 +import java.util.Date;
  4 +
  5 +import javax.persistence.*;
  6 +
  7 +@Entity
  8 +@Table(name = "calc_waybill")
  9 +public class CalcWaybill {
  10 + /* 主键*/
  11 + @Id
  12 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  13 + private Long id;
  14 + /* 公司代码*/
  15 + private String gsdm;
  16 + /* 公司名称*/
  17 + private String gsname;
  18 + /* 分公司代码*/
  19 + private String fgsdm;
  20 + /* 分公司名称*/
  21 + private String fgsname;
  22 + /* 日期*/
  23 + private Date rq;
  24 + /* 日期字符串*/
  25 + private String rqStr;
  26 + /* 线路编码*/
  27 + private String xl;
  28 + /* 线路名称*/
  29 + private String xlName;
  30 + /* 车辆自编号*/
  31 + private String cl;
  32 + /* 路牌名字*/
  33 + private String lp;
  34 + /* 驾驶员工号*/
  35 + private String jGh;
  36 + /* 驾驶员名字*/
  37 + private String jName;
  38 + /* 售票员工号*/
  39 + private String sGh;
  40 + /* 售票员名字*/
  41 + private String sName;
  42 + /* 计划营运班次*/
  43 + private int jhyybc;
  44 + /* 计划早高峰营运班次*/
  45 + private int jhyybczgf;
  46 + /* 计划晚高峰营运班次*/
  47 + private int jhyybcwgf;
  48 + /* 计划非营运班次*/
  49 + private int jhfyybc;
  50 + /* 计划营运里程*/
  51 + private Double jhyylc;
  52 + /* 计划非营运里程*/
  53 + private Double jhfyylc;
  54 + /* 实际营运班次*/
  55 + private int sjyybc;
  56 + /* 实际早高峰营运班次*/
  57 + private int sjyybczgf;
  58 + /* 实际晚高峰营运班次*/
  59 + private int sjyybcwgf;
  60 + /* 实际非营运班次*/
  61 + private int sjfyybc;
  62 + /* 实际营运里程*/
  63 + private Double sjyylc;
  64 + /* 实际非营运里程*/
  65 + private Double sjfyylc;
  66 + /* 临加班次*/
  67 + private int ljbc;
  68 + /* 临加早高峰班次*/
  69 + private int ljbczgf;
  70 + /* 临加晚高峰班次*/
  71 + private int ljbcwgf;
  72 + /* 临加营运里程*/
  73 + private Double ljyylc;
  74 + /* 临加非营运里程*/
  75 + private Double ljfyylc;
  76 + /* 烂班班次*/
  77 + private int lbbc;
  78 + /* 烂班里程*/
  79 + private Double lblc;
  80 + /* 路阻*/
  81 + private Double lblcLz;
  82 + /* 吊慢*/
  83 + private Double lblcDm;
  84 + /* 故障*/
  85 + private Double lblcGz;
  86 + /* 纠纷*/
  87 + private Double lblcJf;
  88 + /* 肇事*/
  89 + private Double lblcZs;
  90 + /* 缺人*/
  91 + private Double lblcQr;
  92 + /* 缺车*/
  93 + private Double lblcQc;
  94 + /* 客稀*/
  95 + private Double lblcKx;
  96 + /* 气候*/
  97 + private Double lblcQh;
  98 + /* 援外*/
  99 + private Double lblcYw;
  100 + /* 路救抛锚*/
  101 + private Double lblcLjpm;
  102 + /* 其他*/
  103 + private Double lblcQt;
  104 + /* 放站班次*/
  105 + private int fzbc;
  106 + /* 放站早高峰班次*/
  107 + private int fzbczgf;
  108 + /* 放站晚高峰班次*/
  109 + private int fzbcwgf;
  110 + /* 掉头班次*/
  111 + private int dtbc;
  112 + /* 掉头早高峰班次*/
  113 + private int dtbczgf;
  114 + /* 掉头晚高峰班次*/
  115 + private int dtbcwgf;
  116 + /* 创建时间*/
  117 + private Date createTime;
  118 + /* 修改时间*/
  119 + private Date updateTime;
  120 + public Long getId() {
  121 + return id;
  122 + }
  123 + public void setId(Long id) {
  124 + this.id = id;
  125 + }
  126 + public String getGsdm() {
  127 + return gsdm;
  128 + }
  129 + public void setGsdm(String gsdm) {
  130 + this.gsdm = gsdm;
  131 + }
  132 + public String getGsname() {
  133 + return gsname;
  134 + }
  135 + public void setGsname(String gsname) {
  136 + this.gsname = gsname;
  137 + }
  138 + public String getFgsdm() {
  139 + return fgsdm;
  140 + }
  141 + public void setFgsdm(String fgsdm) {
  142 + this.fgsdm = fgsdm;
  143 + }
  144 + public String getFgsname() {
  145 + return fgsname;
  146 + }
  147 + public void setFgsname(String fgsname) {
  148 + this.fgsname = fgsname;
  149 + }
  150 + public Date getRq() {
  151 + return rq;
  152 + }
  153 + public void setRq(Date rq) {
  154 + this.rq = rq;
  155 + }
  156 + public String getRqStr() {
  157 + return rqStr;
  158 + }
  159 + public void setRqStr(String rqStr) {
  160 + this.rqStr = rqStr;
  161 + }
  162 + public String getXl() {
  163 + return xl;
  164 + }
  165 + public void setXl(String xl) {
  166 + this.xl = xl;
  167 + }
  168 + public String getXlName() {
  169 + return xlName;
  170 + }
  171 + public void setXlName(String xlName) {
  172 + this.xlName = xlName;
  173 + }
  174 + public String getCl() {
  175 + return cl;
  176 + }
  177 + public void setCl(String cl) {
  178 + this.cl = cl;
  179 + }
  180 + public String getLp() {
  181 + return lp;
  182 + }
  183 + public void setLp(String lp) {
  184 + this.lp = lp;
  185 + }
  186 + public String getjGh() {
  187 + return jGh;
  188 + }
  189 + public void setjGh(String jGh) {
  190 + this.jGh = jGh;
  191 + }
  192 + public String getjName() {
  193 + return jName;
  194 + }
  195 + public void setjName(String jName) {
  196 + this.jName = jName;
  197 + }
  198 + public String getsGh() {
  199 + return sGh;
  200 + }
  201 + public void setsGh(String sGh) {
  202 + this.sGh = sGh;
  203 + }
  204 + public String getsName() {
  205 + return sName;
  206 + }
  207 + public void setsName(String sName) {
  208 + this.sName = sName;
  209 + }
  210 + public int getJhyybc() {
  211 + return jhyybc;
  212 + }
  213 + public void setJhyybc(int jhyybc) {
  214 + this.jhyybc = jhyybc;
  215 + }
  216 + public int getJhyybczgf() {
  217 + return jhyybczgf;
  218 + }
  219 + public void setJhyybczgf(int jhyybczgf) {
  220 + this.jhyybczgf = jhyybczgf;
  221 + }
  222 + public int getJhyybcwgf() {
  223 + return jhyybcwgf;
  224 + }
  225 + public void setJhyybcwgf(int jhyybcwgf) {
  226 + this.jhyybcwgf = jhyybcwgf;
  227 + }
  228 + public int getJhfyybc() {
  229 + return jhfyybc;
  230 + }
  231 + public void setJhfyybc(int jhfyybc) {
  232 + this.jhfyybc = jhfyybc;
  233 + }
  234 + public Double getJhyylc() {
  235 + return jhyylc;
  236 + }
  237 + public void setJhyylc(Double jhyylc) {
  238 + this.jhyylc = jhyylc;
  239 + }
  240 + public Double getJhfyylc() {
  241 + return jhfyylc;
  242 + }
  243 + public void setJhfyylc(Double jhfyylc) {
  244 + this.jhfyylc = jhfyylc;
  245 + }
  246 + public int getSjyybc() {
  247 + return sjyybc;
  248 + }
  249 + public void setSjyybc(int sjyybc) {
  250 + this.sjyybc = sjyybc;
  251 + }
  252 + public int getSjyybczgf() {
  253 + return sjyybczgf;
  254 + }
  255 + public void setSjyybczgf(int sjyybczgf) {
  256 + this.sjyybczgf = sjyybczgf;
  257 + }
  258 + public int getSjyybcwgf() {
  259 + return sjyybcwgf;
  260 + }
  261 + public void setSjyybcwgf(int sjyybcwgf) {
  262 + this.sjyybcwgf = sjyybcwgf;
  263 + }
  264 + public int getSjfyybc() {
  265 + return sjfyybc;
  266 + }
  267 + public void setSjfyybc(int sjfyybc) {
  268 + this.sjfyybc = sjfyybc;
  269 + }
  270 + public Double getSjyylc() {
  271 + return sjyylc;
  272 + }
  273 + public void setSjyylc(Double sjyylc) {
  274 + this.sjyylc = sjyylc;
  275 + }
  276 + public Double getSjfyylc() {
  277 + return sjfyylc;
  278 + }
  279 + public void setSjfyylc(Double sjfyylc) {
  280 + this.sjfyylc = sjfyylc;
  281 + }
  282 + public int getLjbc() {
  283 + return ljbc;
  284 + }
  285 + public void setLjbc(int ljbc) {
  286 + this.ljbc = ljbc;
  287 + }
  288 + public int getLjbczgf() {
  289 + return ljbczgf;
  290 + }
  291 + public void setLjbczgf(int ljbczgf) {
  292 + this.ljbczgf = ljbczgf;
  293 + }
  294 + public int getLjbcwgf() {
  295 + return ljbcwgf;
  296 + }
  297 + public void setLjbcwgf(int ljbcwgf) {
  298 + this.ljbcwgf = ljbcwgf;
  299 + }
  300 + public Double getLjyylc() {
  301 + return ljyylc;
  302 + }
  303 + public void setLjyylc(Double ljyylc) {
  304 + this.ljyylc = ljyylc;
  305 + }
  306 + public Double getLjfyylc() {
  307 + return ljfyylc;
  308 + }
  309 + public void setLjfyylc(Double ljfyylc) {
  310 + this.ljfyylc = ljfyylc;
  311 + }
  312 + public int getLbbc() {
  313 + return lbbc;
  314 + }
  315 + public void setLbbc(int lbbc) {
  316 + this.lbbc = lbbc;
  317 + }
  318 + public Double getLblc() {
  319 + return lblc;
  320 + }
  321 + public void setLblc(Double lblc) {
  322 + this.lblc = lblc;
  323 + }
  324 + public Double getLblcLz() {
  325 + return lblcLz;
  326 + }
  327 + public void setLblcLz(Double lblcLz) {
  328 + this.lblcLz = lblcLz;
  329 + }
  330 + public Double getLblcDm() {
  331 + return lblcDm;
  332 + }
  333 + public void setLblcDm(Double lblcDm) {
  334 + this.lblcDm = lblcDm;
  335 + }
  336 + public Double getLblcGz() {
  337 + return lblcGz;
  338 + }
  339 + public void setLblcGz(Double lblcGz) {
  340 + this.lblcGz = lblcGz;
  341 + }
  342 + public Double getLblcJf() {
  343 + return lblcJf;
  344 + }
  345 + public void setLblcJf(Double lblcJf) {
  346 + this.lblcJf = lblcJf;
  347 + }
  348 + public Double getLblcZs() {
  349 + return lblcZs;
  350 + }
  351 + public void setLblcZs(Double lblcZs) {
  352 + this.lblcZs = lblcZs;
  353 + }
  354 + public Double getLblcQr() {
  355 + return lblcQr;
  356 + }
  357 + public void setLblcQr(Double lblcQr) {
  358 + this.lblcQr = lblcQr;
  359 + }
  360 + public Double getLblcQc() {
  361 + return lblcQc;
  362 + }
  363 + public void setLblcQc(Double lblcQc) {
  364 + this.lblcQc = lblcQc;
  365 + }
  366 + public Double getLblcKx() {
  367 + return lblcKx;
  368 + }
  369 + public void setLblcKx(Double lblcKx) {
  370 + this.lblcKx = lblcKx;
  371 + }
  372 + public Double getLblcQh() {
  373 + return lblcQh;
  374 + }
  375 + public void setLblcQh(Double lblcQh) {
  376 + this.lblcQh = lblcQh;
  377 + }
  378 + public Double getLblcYw() {
  379 + return lblcYw;
  380 + }
  381 + public void setLblcYw(Double lblcYw) {
  382 + this.lblcYw = lblcYw;
  383 + }
  384 + public Double getLblcLjpm() {
  385 + return lblcLjpm;
  386 + }
  387 + public void setLblcLjpm(Double lblcLjpm) {
  388 + this.lblcLjpm = lblcLjpm;
  389 + }
  390 + public Double getLblcQt() {
  391 + return lblcQt;
  392 + }
  393 + public void setLblcQt(Double lblcQt) {
  394 + this.lblcQt = lblcQt;
  395 + }
  396 + public int getFzbc() {
  397 + return fzbc;
  398 + }
  399 + public void setFzbc(int fzbc) {
  400 + this.fzbc = fzbc;
  401 + }
  402 + public int getFzbczgf() {
  403 + return fzbczgf;
  404 + }
  405 + public void setFzbczgf(int fzbczgf) {
  406 + this.fzbczgf = fzbczgf;
  407 + }
  408 + public int getFzbcwgf() {
  409 + return fzbcwgf;
  410 + }
  411 + public void setFzbcwgf(int fzbcwgf) {
  412 + this.fzbcwgf = fzbcwgf;
  413 + }
  414 + public int getDtbc() {
  415 + return dtbc;
  416 + }
  417 + public void setDtbc(int dtbc) {
  418 + this.dtbc = dtbc;
  419 + }
  420 + public int getDtbczgf() {
  421 + return dtbczgf;
  422 + }
  423 + public void setDtbczgf(int dtbczgf) {
  424 + this.dtbczgf = dtbczgf;
  425 + }
  426 + public int getDtbcwgf() {
  427 + return dtbcwgf;
  428 + }
  429 + public void setDtbcwgf(int dtbcwgf) {
  430 + this.dtbcwgf = dtbcwgf;
  431 + }
  432 + public Date getCreateTime() {
  433 + return createTime;
  434 + }
  435 + public void setCreateTime(Date createTime) {
  436 + this.createTime = createTime;
  437 + }
  438 + public Date getUpdateTime() {
  439 + return updateTime;
  440 + }
  441 + public void setUpdateTime(Date updateTime) {
  442 + this.updateTime = updateTime;
  443 + }
  444 +
  445 +
  446 +
  447 +}
... ...
src/main/java/com/bsth/service/calc/impl/CalcToolServiceImpl.java
  View file @69ffd8b
... ... @@ -127,12 +127,7 @@ public class CalcToolServiceImpl implements CalcToolService {
127 127 if(i != l){
128 128 CalcWaybill c1 = listCal.get(i);
129 129 CalcWaybill c2 = listCal.get(l);
130   -//
131   -// c1.setSjyylc(c1.getSjyylc() + c2.getSjyylc());
132   -// c1.setSjfyylc(c1.getSjfyylc() + c2.getSjfyylc());
133   -// c1.setLjyylc(c1.getLjyylc() + c2.getLjyylc());
134   -// c1.setLjfyylc(c1.getLjfyylc() + c2.getLjfyylc());
135   -//
  130 +
136 131 listCal.remove(l);
137 132 } else {
138 133 break;
... ... @@ -191,6 +186,7 @@ public class CalcToolServiceImpl implements CalcToolService {
191 186 double ssgl_kx= culateMileageService.culateCJLC(list_, "客稀");
192 187 double ssgl_qh= culateMileageService.culateCJLC(list_, "气候");
193 188 double ssgl_yw= culateMileageService.culateCJLC(list_, "援外");
  189 + double ssgl_ljpm= culateMileageService.culateCJLC(list_, "路救抛锚");
194 190  
195 191 double ssgl_pc=culateMileageService.culateCJLC(list_, "配车");
196 192 double ssgl_by=culateMileageService.culateCJLC(list_, "保养");
... ... @@ -245,6 +241,7 @@ public class CalcToolServiceImpl implements CalcToolService {
245 241 t.setLblcKx(ssgl_kx);
246 242 t.setLblcQh(ssgl_qh);
247 243 t.setLblcYw(ssgl_yw);
  244 + t.setLblcLjpm(ssgl_ljpm);
248 245 t.setLblcQt(ssgl_qtz);
249 246 t.setFzbc(fzbc+zfbc);
250 247 t.setFzbczgf(fzbcZgf+zfbcZgf);
... ...
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
  View file @69ffd8b
... ... @@ -327,6 +327,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
327 327 calc.setLblcKx(Arith.add(calc.getLblcKx(), c.getLblcKx()));
328 328 calc.setLblcQh(Arith.add(calc.getLblcQh(), c.getLblcQh()));
329 329 calc.setLblcYw(Arith.add(calc.getLblcYw(), c.getLblcYw()));
  330 + calc.setLblcLjpm(Arith.add(calc.getLblcLjpm(), c.getLblcLjpm()));
330 331 calc.setLblcQt(Arith.add(calc.getLblcQt(), c.getLblcQt()));
331 332 calc.setLjyylc(Arith.add(calc.getLjyylc(), c.getLjyylc()));
332 333 calc.setLjfyylc(Arith.add(calc.getLjfyylc(), c.getLjfyylc()));
... ... @@ -371,6 +372,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
371 372 sum.setLblcKx(Arith.add(sum.getLblcKx()!=null?sum.getLblcKx():0, c.getLblcKx()));
372 373 sum.setLblcQh(Arith.add(sum.getLblcQh()!=null?sum.getLblcQh():0, c.getLblcQh()));
373 374 sum.setLblcYw(Arith.add(sum.getLblcYw()!=null?sum.getLblcYw():0, c.getLblcYw()));
  375 + sum.setLblcLjpm(Arith.add(sum.getLblcLjpm()!=null?sum.getLblcLjpm():0, c.getLblcLjpm()));
374 376 sum.setLblcQt(Arith.add(sum.getLblcQt()!=null?sum.getLblcQt():0, c.getLblcQt()));
375 377 sum.setJhyybc(sum.getJhyybc() + c.getJhyybc());
376 378 sum.setJhyybczgf(sum.getJhyybczgf() + c.getJhyybczgf());
... ... @@ -416,6 +418,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
416 418 m.put("ssgl_kx", c.getLblcKx());
417 419 m.put("ssgl_qh", c.getLblcQh());
418 420 m.put("ssgl_yw", c.getLblcYw());
  421 + m.put("ssgl_ljpm", c.getLblcLjpm());
419 422 m.put("ssgl_other", c.getLblcQt());
420 423 m.put("ljgl", c.getLjyylc());
421 424 m.put("jhbc", c.getJhyybc());
... ... @@ -666,6 +669,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
666 669 s.setKxlc(culateService.culateCJLC(list, "客稀"));
667 670 s.setQhlc(culateService.culateCJLC(list, "气候"));
668 671 s.setYwlc(culateService.culateCJLC(list, "援外"));
  672 + s.setLjpmlc(culateService.culateCJLC(list, "路救抛锚"));
669 673 double ssgl_pc=culateService.culateCJLC(list, "配车");
670 674 double ssgl_by=culateService.culateCJLC(list, "保养");
671 675 double ssgl_cj=culateService.culateCJLC(list, "抽减");
... ... @@ -835,6 +839,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
835 839 m.put("ssgl_kx", c.getKxlc());
836 840 m.put("ssgl_qh", c.getQhlc());
837 841 m.put("ssgl_yw", c.getYwlc());
  842 + m.put("ssgl_ljpm", c.getLjpmlc());
838 843 m.put("ssgl_other", c.getQtlc());
839 844 m.put("ljgl", c.getLjlc());
840 845 m.put("ljks", c.getLjkslc());
... ... @@ -1291,6 +1296,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
1291 1296 s.setKxlc(Arith.add(s.getKxlc()!=null?s.getKxlc():0, s_.getKxlc()));
1292 1297 s.setQhlc(Arith.add(s.getQhlc()!=null?s.getQhlc():0, s_.getQhlc()));
1293 1298 s.setYwlc(Arith.add(s.getYwlc()!=null?s.getYwlc():0, s_.getYwlc()));
  1299 + s.setLjpmlc(Arith.add(s.getLjpmlc()!=null?s.getLjpmlc():0, s_.getLjpmlc()));
1294 1300 s.setQtlc(Arith.add(s.getQtlc()!=null?s.getQtlc():0, s_.getQtlc()));
1295 1301 s.setLjlc(Arith.add(s.getLjlc()!=null?s.getLjlc():0, s_.getLjlc()));
1296 1302 if(s_.getLjkslc() == null){
... ... @@ -1410,6 +1416,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
1410 1416 c.setSsglKx(Double.valueOf(m.get("ssgl_kx").toString()));
1411 1417 c.setSsglQh(Double.valueOf(m.get("ssgl_qh").toString()));
1412 1418 c.setSsglYw(Double.valueOf(m.get("ssgl_yw").toString()));
  1419 + c.setSsglLjpm(Double.valueOf(m.get("ssgl_ljpm").toString()));
1413 1420 c.setSsglOther(Double.valueOf(m.get("ssgl_other").toString()));
1414 1421 c.setLjyy(Double.valueOf(m.get("ljyy").toString()));
1415 1422 c.setLjjcc(Double.valueOf(m.get("ljjcc").toString()));
... ... @@ -1649,6 +1656,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
1649 1656 m.put("ssgl_kx", c.getSsglKx());
1650 1657 m.put("ssgl_qh", c.getSsglQh());
1651 1658 m.put("ssgl_yw", c.getSsglYw());
  1659 + m.put("ssgl_ljpm", c.getSsglLjpm());
1652 1660 m.put("ssgl_other", c.getSsglOther());
1653 1661 m.put("ljyy", c.getLjyy());
1654 1662 m.put("ljjcc", c.getLjjcc());
... ... @@ -1884,6 +1892,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
1884 1892 temp.setSsglKx(Arith.add(temp.getSsglKx()!=null?temp.getSsglKx():0, c.getSsglKx()));
1885 1893 temp.setSsglQh(Arith.add(temp.getSsglQh()!=null?temp.getSsglQh():0, c.getSsglQh()));
1886 1894 temp.setSsglYw(Arith.add(temp.getSsglYw()!=null?temp.getSsglYw():0, c.getSsglYw()));
  1895 + temp.setSsglLjpm(Arith.add(temp.getSsglLjpm()!=null?temp.getSsglLjpm():0, c.getSsglLjpm()));
1887 1896 temp.setSsglOther(Arith.add(temp.getSsglOther()!=null?temp.getSsglOther():0, c.getSsglOther()));
1888 1897 temp.setLjyy(Arith.add(temp.getLjyy()!=null?temp.getLjyy():0, c.getLjyy()));
1889 1898 temp.setLjjcc(Arith.add(temp.getLjjcc()!=null?temp.getLjjcc():0, c.getLjjcc()));
... ...
src/main/java/com/bsth/service/forms/BudgetService.java
  View file @69ffd8b
... ... @@ -15,6 +15,8 @@ public interface BudgetService extends BaseService<Budget, Integer> {
15 15  
16 16 public Map<String, Object> updateRevenue(String date) throws Exception;
17 17  
  18 + public void updateRevenueRange(String date1, String date2);
  19 +
18 20 public List<Map<String, Object>> budgetMileage(String year, String type);
19 21  
20 22 public List<Map<String, Object>> budgetPerson(String year, String type);
... ...
src/main/java/com/bsth/service/forms/impl/BudgetServiceImpl.java
  View file @69ffd8b
... ... @@ -277,6 +277,37 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
277 277 }
278 278 return maps;
279 279 }
  280 +
  281 + @Override
  282 + public void updateRevenueRange(String date1, String date2) {
  283 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  284 + try {
  285 + if(date1 == null || date2 == null
  286 + || date1.trim().length() == 0
  287 + || date2.trim().length() == 0){
  288 + Date d = new Date();
  289 + d.setTime(d.getTime() - (1l * 1000 * 60 * 60 * 24));
  290 + date2 = sdf.format(d);
  291 + d.setTime(d.getTime() - (8l * 1000 * 60 * 60 * 24));
  292 + date1 = sdf.format(d);
  293 + }
  294 + Date parse1 = sdf.parse(date1);
  295 + Date parse2 = sdf.parse(date2);
  296 + for(Date parse = new Date(parse1.getTime());
  297 + parse.getTime() <= parse2.getTime();
  298 + parse.setTime(parse.getTime() + 1l*1000*60*60*24)){
  299 + try {
  300 + updateRevenue(sdf.format(parse));
  301 + } catch (Exception e) {
  302 + // TODO: handle exception
  303 + e.printStackTrace();
  304 + }
  305 + }
  306 + } catch (ParseException e) {
  307 + // TODO: handle exception
  308 + e.printStackTrace();
  309 + }
  310 + }
280 311  
281 312 @Override
282 313 public Map<String, Object> updateRevenue(String date) throws Exception {
... ...
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @69ffd8b
... ... @@ -1966,32 +1966,32 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1966 1966  
1967 1967 Map<String, Object> temp = new HashMap<String, Object>();
1968 1968 int jhbc_ = 0, sjbc_ = 0,
1969   - lzbc_ = 0, dmbc_ = 0,
1970   - gzbc_ = 0, jfbc_ = 0, zsbc_ = 0,
1971   - qrbc_ = 0, qcbc_ = 0, kxbc_ = 0,
1972   - qhbc_ = 0, wybc_ = 0, qtbc_ = 0;
  1969 + lzbc_ = 0, dmbc_ = 0, gzbc_ = 0,
  1970 + jfbc_ = 0, zsbc_ = 0, qrbc_ = 0,
  1971 + qcbc_ = 0, kxbc_ = 0, qhbc_ = 0,
  1972 + wybc_ = 0, ljpmbc_ = 0, qtbc_ = 0;
1973 1973 BigDecimal jhlc_ = new BigDecimal("0"), sjlc_ = new BigDecimal("0"),
1974 1974 lzlc_ = new BigDecimal("0"), dmlc_ = new BigDecimal("0"),
1975 1975 gzlc_ = new BigDecimal("0"), jflc_ = new BigDecimal("0"),
1976 1976 zslc_ = new BigDecimal("0"), qrlc_ = new BigDecimal("0"),
1977 1977 qclc_ = new BigDecimal("0"), kxlc_ = new BigDecimal("0"),
1978 1978 qhlc_ = new BigDecimal("0"), wylc_ = new BigDecimal("0"),
1979   - qtlc_ = new BigDecimal("0");
1980   -// for(String key : keyMap.keySet()){
  1979 + ljpmlc_ = new BigDecimal("0"), qtlc_ = new BigDecimal("0");
  1980 +
1981 1981 for(String key : keyList){
1982 1982 Map<String, Object> tempMap = new HashMap<String, Object>();
1983 1983 int jhbc = 0, sjbc = 0,
1984   - lzbc = 0, dmbc = 0,
1985   - gzbc = 0, jfbc = 0, zsbc = 0,
1986   - qrbc = 0, qcbc = 0, kxbc = 0,
1987   - qhbc = 0, wybc = 0, qtbc = 0;
  1984 + lzbc = 0, dmbc = 0, gzbc = 0,
  1985 + jfbc = 0, zsbc = 0, qrbc = 0,
  1986 + qcbc = 0, kxbc = 0, qhbc = 0,
  1987 + wybc = 0, ljpmbc = 0, qtbc = 0;
1988 1988 BigDecimal jhlc = new BigDecimal("0"), sjlc = new BigDecimal("0"),
1989 1989 lzlc = new BigDecimal("0"), dmlc = new BigDecimal("0"),
1990 1990 gzlc = new BigDecimal("0"), jflc = new BigDecimal("0"),
1991 1991 zslc = new BigDecimal("0"), qrlc = new BigDecimal("0"),
1992 1992 qclc = new BigDecimal("0"), kxlc = new BigDecimal("0"),
1993 1993 qhlc = new BigDecimal("0"), wylc = new BigDecimal("0"),
1994   - qtlc = new BigDecimal("0");
  1994 + ljpmlc = new BigDecimal("0"), qtlc = new BigDecimal("0");
1995 1995 String companyName = "", subCompanyName = "";
1996 1996 for(ScheduleRealInfo schedule : keyMap.get(key)){
1997 1997 if(schedule.getGsName() != null && companyName.trim().length() == 0)
... ... @@ -2045,6 +2045,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2045 2045 }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("援外") != -1){
2046 2046 wybc++;
2047 2047 // wylc = wylc.add(lc);
  2048 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路救抛锚") != -1){
  2049 + ljpmbc++;
2048 2050 } else {
2049 2051 qtbc++;
2050 2052 // qtlc = qtlc.add(lc);
... ... @@ -2075,6 +2077,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2075 2077 kxlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "客稀"));
2076 2078 qhlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "气候"));
2077 2079 wylc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "援外"));
  2080 + ljpmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "路救抛锚"));
2078 2081 qtlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "配车")).add(
2079 2082 new BigDecimal(culateService.culateCJLC(keyMap.get(key), "保养"))).add(
2080 2083 new BigDecimal(culateService.culateCJLC(keyMap.get(key), "抽减"))).add(
... ... @@ -2128,6 +2131,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2128 2131 tempMap.put("wybc", wybc);
2129 2132 tempMap.put("wylc", df.format(wylc.doubleValue()));
2130 2133 tempMap.put("wybfb", df.format(jhbc>0?(double)wybc/jhbc*100:0)+"%");
  2134 + tempMap.put("ljpmbc", ljpmbc);
  2135 + tempMap.put("ljpmlc", df.format(ljpmlc.doubleValue()));
  2136 + tempMap.put("ljpmbfb", df.format(jhbc>0?(double)ljpmbc/jhbc*100:0)+"%");
2131 2137 tempMap.put("qtbc", qtbc);
2132 2138 tempMap.put("qtlc", df.format(qtlc.doubleValue()));
2133 2139 tempMap.put("qtbfb", df.format(jhbc>0?(double)qtbc/jhbc*100:0)+"%");
... ... @@ -2136,17 +2142,17 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2136 2142  
2137 2143  
2138 2144 jhbc_ += jhbc; sjbc_ += sjbc;
2139   - lzbc_ += lzbc; dmbc_ += dmbc;
2140   - gzbc_ += gzbc; jfbc_ += jfbc; zsbc_ += zsbc;
2141   - qrbc_ += qrbc; qcbc_ += qcbc; kxbc_ += kxbc;
2142   - qhbc_ += qhbc; wybc_ += wybc; qtbc_ += qtbc;
  2145 + lzbc_ += lzbc; dmbc_ += dmbc; gzbc_ += gzbc;
  2146 + jfbc_ += jfbc; zsbc_ += zsbc; qrbc_ += qrbc;
  2147 + qcbc_ += qcbc; kxbc_ += kxbc; qhbc_ += qhbc;
  2148 + wybc_ += wybc; ljpmbc_ += ljpmbc; qtbc_ += qtbc;
2143 2149 jhlc_ = jhlc_.add(jhlc); sjlc_ = sjlc_.add(sjlc);
2144 2150 lzlc_ = lzlc_.add(lzlc); dmlc_ = dmlc_.add(dmlc);
2145 2151 gzlc_ = gzlc_.add(gzlc); jflc_ = jflc_.add(jflc);
2146 2152 zslc_ = zslc_.add(zslc); qrlc_ = qrlc_.add(qrlc);
2147 2153 qclc_ = qclc_.add(qclc); kxlc_ = kxlc_.add(kxlc);
2148 2154 qhlc_ = qhlc_.add(qhlc); wylc_ = wylc_.add(wylc);
2149   - qtlc_ = qtlc_.add(qtlc);
  2155 + ljpmlc_ = ljpmlc_.add(ljpmlc); qtlc_ = qtlc_.add(qtlc);
2150 2156 }
2151 2157  
2152 2158 if(resList.size() > 0){
... ... @@ -2195,6 +2201,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2195 2201 temp.put("wybc", wybc_);
2196 2202 temp.put("wylc", df.format(wylc_.doubleValue()));
2197 2203 temp.put("wybfb", df.format(jhbc_>0?(double)wybc_/jhbc_*100:0)+"%");
  2204 + temp.put("ljpmbc", ljpmbc_);
  2205 + temp.put("ljpmlc", df.format(ljpmlc_.doubleValue()));
  2206 + temp.put("ljpmbfb", df.format(jhbc_>0?(double)ljpmbc_/jhbc_*100:0)+"%");
2198 2207 temp.put("qtbc", qtbc_);
2199 2208 temp.put("qtlc", df.format(qtlc_.doubleValue()));
2200 2209 temp.put("qtbfb", df.format(jhbc_>0?(double)qtbc_/jhbc_*100:0)+"%");
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @69ffd8b
... ... @@ -2715,6 +2715,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2715 2715 map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
2716 2716 map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
2717 2717 map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
  2718 + map.put("ssgl_ljpm", culateService.culateCJLC(list_s, "路救抛锚"));
2718 2719 double ssgl_pc = culateService.culateCJLC(list_s, "配车");
2719 2720 double ssgl_by = culateService.culateCJLC(list_s, "保养");
2720 2721 double ssgl_cj = culateService.culateCJLC(list_s, "抽减");
... ... @@ -2822,6 +2823,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2822 2823 map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
2823 2824 map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
2824 2825 map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
  2826 + map.put("ssgl_ljpm", culateService.culateCJLC(list_s, "路救抛锚"));
2825 2827 double ssgl_pc = culateService.culateCJLC(list_s, "配车");
2826 2828 double ssgl_by = culateService.culateCJLC(list_s, "保养");
2827 2829 double ssgl_cj = culateService.culateCJLC(list_s, "抽减");
... ... @@ -2921,6 +2923,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2921 2923 map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
2922 2924 map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
2923 2925 map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
  2926 + map.put("ssgl_ljpm", culateService.culateCJLC(list, "路救抛锚"));
2924 2927 double ssgl_pc = culateService.culateCJLC(list, "配车");
2925 2928 double ssgl_by = culateService.culateCJLC(list, "保养");
2926 2929 double ssgl_cj = culateService.culateCJLC(list, "抽减");
... ... @@ -3144,6 +3147,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3144 3147 m.put("ssgl_kx", m.get("kxlc"));
3145 3148 m.put("ssgl_qh", m.get("qhlc"));
3146 3149 m.put("ssgl_yw", m.get("ywlc"));
  3150 + m.put("ssgl_ljpm", m.get("ljpmlc"));
3147 3151 m.put("ssgl_other", m.get("qtlc"));
3148 3152 m.put("ljgl", m.get("ljlc"));
3149 3153 m.put("ljks", m.get("ljkslc"));
... ... @@ -3349,6 +3353,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3349 3353 map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
3350 3354 map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
3351 3355 map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
  3356 + map.put("ssgl_ljpm", culateService.culateCJLC(list, "路救抛锚"));
3352 3357 double ssgl_pc = culateService.culateCJLC(list, "配车");
3353 3358 double ssgl_by = culateService.culateCJLC(list, "保养");
3354 3359 double ssgl_cj = culateService.culateCJLC(list, "抽减");
... ... @@ -3639,6 +3644,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3639 3644 map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
3640 3645 map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
3641 3646 map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
  3647 + map.put("ssgl_ljpm", culateService.culateCJLC(list, "路救抛锚"));
3642 3648 double ssgl_pc = culateService.culateCJLC(list, "配车");
3643 3649 double ssgl_by = culateService.culateCJLC(list, "保养");
3644 3650 double ssgl_cj = culateService.culateCJLC(list, "抽减");
... ... @@ -3697,7 +3703,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3697 3703 List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
3698 3704 Map<String, Object> map = new HashMap<String, Object>();
3699 3705 Double jhlc = 0.00;
3700   - Float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
  3706 + Float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f,
  3707 + ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_ljpm = 0f,
  3708 + ssgl_other = 0f, ljgl = 0f;
3701 3709 int jhbc = 0;
3702 3710 for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
3703 3711 if (scheduleRealInfo != null) {
... ... @@ -3733,6 +3741,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3733 3741 ssgl_qh += childTaskPlan.getMileage();
3734 3742 } else if (childTaskPlan.getDestroyReason().equals("援外")) {
3735 3743 ssgl_yw += childTaskPlan.getMileage();
  3744 + } else if (childTaskPlan.getDestroyReason().equals("路救抛锚")) {
  3745 + ssgl_ljpm += childTaskPlan.getMileage();
3736 3746 } else {
3737 3747 ssgl_other += childTaskPlan.getMileage();
3738 3748 }
... ... @@ -3761,6 +3771,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3761 3771 map.put("ssgl_kx", ssgl_kx);
3762 3772 map.put("ssgl_qh", ssgl_qh);
3763 3773 map.put("ssgl_yw", ssgl_yw);
  3774 + map.put("ssgl_ljpm", ssgl_ljpm);
3764 3775 map.put("ssgl_other", ssgl_other);
3765 3776 map.put("ljgl", ljgl);
3766 3777  
... ... @@ -5553,21 +5564,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
5553 5564 nMap.put("date", xlName + date);
5554 5565 nMap.put("jls", list1.get(0).get("jls"));
5555 5566 nMap.put("sjgl", list1.get(0).get("sjgl"));
5556   - for (Map<String, Object> m : list1) {
5557   -// m.put("ssgl", m.get("ssgl"));
5558   -// m.put("ssbc", m.get("ssbc"));
5559   -// m.put("ssgl_lz", m.get("ssgl_lz") + " / " + m.get("ssbc_lz"));
5560   -// m.put("ssgl_dm", m.get("ssgl_dm") + " / " + m.get("ssbc_dm"));
5561   -// m.put("ssgl_gz", m.get("ssgl_gz") + " / " + m.get("ssbc_gz"));
5562   -// m.put("ssgl_jf", m.get("ssgl_jf") + " / " + m.get("ssbc_jf"));
5563   -// m.put("ssgl_zs", m.get("ssgl_zs") + " / " + m.get("ssbc_zs"));
5564   -// m.put("ssgl_qr", m.get("ssgl_qr") + " / " + m.get("ssbc_qr"));
5565   -// m.put("ssgl_qc", m.get("ssgl_qc") + " / " + m.get("ssbc_qc"));
5566   -// m.put("ssgl_kx", m.get("ssgl_kx") + " / " + m.get("ssbc_kx"));
5567   -// m.put("ssgl_qh", m.get("ssgl_qh") + " / " + m.get("ssbc_qh"));
5568   -// m.put("ssgl_yw", m.get("ssgl_yw") + " / " + m.get("ssbc_yw"));
5569   -// m.put("ssgl_other", m.get("ssgl_other") + " / " + m.get("ssbc_other"));
5570   - }
5571 5567  
5572 5568 int size = 0;
5573 5569 Map<String, Object> tempMap = new HashMap<String, Object>();
... ... @@ -5599,53 +5595,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
5599 5595 }
5600 5596  
5601 5597 dataList2.add(tempMap);
5602   -/*
5603   - size = 0;
5604   - tempMap = new HashMap<String, Object>();
5605   - for (ScheduleRealInfo schedule : list3) {
5606   - if (size == 3) {
5607   - size = 0;
5608   - dataList3.add(tempMap);
5609   - tempMap = new HashMap<String, Object>();
5610   - }
5611   - tempMap.put("lpName" + size, schedule.getLpName());
5612   - tempMap.put("qdzName" + size, schedule.getQdzName());
5613   - tempMap.put("zdsj" + size, schedule.getZdsj());
5614   - tempMap.put("zdsjActual" + size, schedule.getZdsjActual() != null ? schedule.getZdsjActual() : "");
5615   - tempMap.put("zdsjk" + size, "");
5616   - tempMap.put("zdsjm" + size, "");
5617   - tempMap.put("fcsj" + size, schedule.getFcsj());
5618   - String fcsjActural=schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "";
5619   - String bcType=schedule.getBcType()!=null?schedule.getBcType():"";
5620   - if(bcType.equals("in")){
5621   - fcsjActural=fcsjActural+"(进)";
5622   - }
5623   - if(bcType.equals("out")){
5624   - fcsjActural=fcsjActural+"(出)";
5625   - }
5626   - tempMap.put("fcsjActual" + size, fcsjActural);
5627   - tempMap.put("fcsjk" + size, "");
5628   - tempMap.put("fcsjm" + size, "");
5629   - tempMap.put("remarks" + size, schedule.getRemarks() != null ? schedule.getRemarks() : "");
5630   -
5631   - size++;
5632   - }
5633   - if (size < 3) {
5634   - for (; size < 3; size++) {
5635   - tempMap.put("lpName" + size, "");
5636   - tempMap.put("qdzName" + size, "");
5637   - tempMap.put("zdsj" + size, "");
5638   - tempMap.put("zdsjActual" + size, "");
5639   - tempMap.put("zdsjk" + size, "");
5640   - tempMap.put("zdsjm" + size, "");
5641   - tempMap.put("fcsj" + size, "");
5642   - tempMap.put("fcsjActual" + size, "");
5643   - tempMap.put("fcsjk" + size, "");
5644   - tempMap.put("fcsjm" + size, "");
5645   - tempMap.put("remarks" + size, "");
5646   - }
5647   - }
5648   -*/
5649 5598  
5650 5599 size = 0;
5651 5600 tempMap = new HashMap<String, Object>();
... ...
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @69ffd8b
... ... @@ -31,7 +31,11 @@ public class CulateMileageServiceImpl implements CulateMileageService{
31 31 @Override
32 32 public List<Map<String, Object>> jobFwqk(List<ScheduleRealInfo> lists) {
33 33 // TODO Auto-generated method stub
34   - String[] lblxs = {"配车","保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","路救","其他" };
  34 + String[] lblxs = {"配车","保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","路救抛锚","其他" };
  35 + Set<String> lblxSet = new HashSet<String>();
  36 + for(String s : lblxs){
  37 + lblxSet.add(s);
  38 + }
35 39 List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
36 40 for (int i = 0; i < lists.size(); i++) {
37 41 ScheduleRealInfo scheduleRealInfo = lists.get(i);
... ... @@ -43,6 +47,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{
43 47 String adjustExps = "";
44 48 if (scheduleRealInfo.getAdjustExps() == "" || scheduleRealInfo.getAdjustExps() == null) {
45 49 adjustExps = "其他";
  50 + } else if(!(lblxSet.contains(scheduleRealInfo.getAdjustExps()))){
  51 + adjustExps = "其他";
46 52 } else {
47 53 adjustExps = scheduleRealInfo.getAdjustExps();
48 54 }
... ... @@ -75,6 +81,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{
75 81 String adjustExps = "";
76 82 if (scheduleRealInfo.getAdjustExps() == "" || scheduleRealInfo.getAdjustExps() == null) {
77 83 adjustExps = "其他";
  84 + } else if(!(lblxSet.contains(scheduleRealInfo.getAdjustExps()))){
  85 + adjustExps = "其他";
78 86 } else {
79 87 adjustExps = scheduleRealInfo.getAdjustExps();
80 88 }
... ... @@ -95,6 +103,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{
95 103 String destroyReason = "";
96 104 if (childTaskPlan.getDestroyReason() == "" || childTaskPlan.getDestroyReason() == null) {
97 105 destroyReason = "其他";
  106 + } else if(!(lblxSet.contains(childTaskPlan.getDestroyReason()))){
  107 + destroyReason = "其他";
98 108 } else {
99 109 destroyReason = childTaskPlan.getDestroyReason();
100 110 }
... ...
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @69ffd8b
... ... @@ -1746,7 +1746,11 @@ public class ReportServiceImpl implements ReportService{
1746 1746 @Override
1747 1747 public List<Map<String, Object>> jobFwqk(Map<String, Object> map) {
1748 1748 // TODO Auto-generated method stub
1749   - String[] lblxs = {"配车", "保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
  1749 + String[] lblxs = {"配车","保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","路救抛锚","其他" };
  1750 + Set<String> lblxSet = new HashSet<String>();
  1751 + for(String s : lblxs){
  1752 + lblxSet.add(s);
  1753 + }
1750 1754 String line=map.get("line").toString();
1751 1755 String date=map.get("date").toString();
1752 1756 map.put("bcType", "normal");
... ... @@ -1765,7 +1769,9 @@ public class ReportServiceImpl implements ReportService{
1765 1769 adjustExps = "其他";
1766 1770 } else if(scheduleRealInfo.getAdjustExps().equals("")){
1767 1771 adjustExps = "其他";
1768   - }else {
  1772 + } else if(!(lblxSet.contains(scheduleRealInfo.getAdjustExps()))){
  1773 + adjustExps = "其他";
  1774 + } else {
1769 1775 adjustExps = scheduleRealInfo.getAdjustExps();
1770 1776 }
1771 1777 if (scheduleRealInfo.getStatus() == -1) {
... ... @@ -1798,6 +1804,8 @@ public class ReportServiceImpl implements ReportService{
1798 1804 String adjustExps = "";
1799 1805 if (scheduleRealInfo.getAdjustExps() == "" || scheduleRealInfo.getAdjustExps() == null) {
1800 1806 adjustExps = "其他";
  1807 + } else if(!(lblxSet.contains(scheduleRealInfo.getAdjustExps()))){
  1808 + adjustExps = "其他";
1801 1809 } else {
1802 1810 adjustExps = scheduleRealInfo.getAdjustExps();
1803 1811 }
... ... @@ -1821,6 +1829,8 @@ public class ReportServiceImpl implements ReportService{
1821 1829 destroyReason = "其他";
1822 1830 } else if (childTaskPlan.getDestroyReason().equals("")) {
1823 1831 destroyReason = "其他";
  1832 + } else if(!(lblxSet.contains(childTaskPlan.getDestroyReason()))){
  1833 + destroyReason = "其他";
1824 1834 } else {
1825 1835 destroyReason = childTaskPlan.getDestroyReason();
1826 1836 }
... ... @@ -3052,6 +3062,7 @@ public class ReportServiceImpl implements ReportService{
3052 3062 map.put("ssgl_kx", culateService.culateSsMileXx(list, "客稀"));
3053 3063 map.put("ssgl_qh", culateService.culateSsMileXx(list, "气候"));
3054 3064 map.put("ssgl_yw", culateService.culateSsMileXx(list, "援外"));
  3065 + map.put("ssgl_ljpm", culateService.culateSsMileXx(list, "路救抛锚"));
3055 3066 map.put("ssgl_other", culateService.culateSsMileXx(list, "其他"));
3056 3067  
3057 3068  
... ...
src/main/resources/static/pages/calc/company/countLineMileage.html
  View file @69ffd8b
... ... @@ -69,7 +69,7 @@
69 69 <table class="table table-bordered table-hover table-checkable" id="forms">
70 70 <thead>
71 71 <tr>
72   - <th colspan="31"><label id="datetodate"></label>线路公里统计表</th>
  72 + <th colspan="32"><label id="datetodate"></label>线路公里统计表</th>
73 73 </tr>
74 74 <tr>
75 75 <td rowspan="2"><span>公司</span></td>
... ... @@ -82,7 +82,7 @@
82 82 <td colspan="2"><label>实际营</label><label>运公里</label></td>
83 83 <td colspan="7"><label>实际空</label><label>驶公里</label></td>
84 84 <td rowspan="2"><label>少驶营</label><label>运里程</label></td>
85   - <td colspan="11">少驶原因(公里)</td>
  85 + <td colspan="12">少驶原因(公里)</td>
86 86 <td colspan="3">临加公里</td>
87 87 </tr>
88 88 <tr>
... ... @@ -105,6 +105,7 @@
105 105 <td><span>客稀</span></td>
106 106 <td><span>气候</span></td>
107 107 <td><span>援外</span></td>
  108 + <td><span>路救抛锚</span></td>
108 109 <td><span>其他</span></td>
109 110 <td><label>临加营</label><label>运公里</label></td>
110 111 <td><label>临加进出</label><label>场空驶</label></td>
... ... @@ -341,6 +342,7 @@
341 342 <td>{{obj.ssgl_kx}}</td>
342 343 <td>{{obj.ssgl_qh}}</td>
343 344 <td>{{obj.ssgl_yw}}</td>
  345 + <td>{{obj.ssgl_ljpm}}</td>
344 346 <td>{{obj.ssgl_other}}</td>
345 347 <td>{{obj.ljyy}}</td>
346 348 <td>{{obj.ljjcc}}</td>
... ... @@ -349,7 +351,7 @@
349 351 {{/each}}
350 352 {{if list.length == 0}}
351 353 <tr>
352   - <td colspan="30"><h6 class="muted">没有找到相关数据</h6></td>
  354 + <td colspan="32"><h6 class="muted">没有找到相关数据</h6></td>
353 355 </tr>
354 356 {{/if}}
355 357 </script>
356 358 \ No newline at end of file
... ...
src/main/resources/static/pages/calc/countLineMileage.html
  View file @69ffd8b
... ... @@ -69,7 +69,7 @@
69 69 <table class="table table-bordered table-hover table-checkable" id="forms">
70 70 <thead>
71 71 <tr>
72   - <th colspan="30"><label id="datetodate"></label>线路公里统计表</th>
  72 + <th colspan="31"><label id="datetodate"></label>线路公里统计表</th>
73 73 </tr>
74 74 <tr>
75 75 <td rowspan="2"><span>公司</span></td>
... ... @@ -82,7 +82,7 @@
82 82 <td colspan="2"><label>实际营</label><label>运公里</label></td>
83 83 <td colspan="6"><label>实际空</label><label>驶公里</label></td>
84 84 <td rowspan="2"><label>少驶营</label><label>运里程</label></td>
85   - <td colspan="11">少驶原因(公里)</td>
  85 + <td colspan="12">少驶原因(公里)</td>
86 86 <td colspan="3">临加公里</td>
87 87 </tr>
88 88 <tr>
... ... @@ -104,6 +104,7 @@
104 104 <td><span>客稀</span></td>
105 105 <td><span>气候</span></td>
106 106 <td><span>援外</span></td>
  107 + <td><span>路救抛锚</span></td>
107 108 <td><span>其他</span></td>
108 109 <td><label>临加营</label><label>运公里</label></td>
109 110 <td><label>临加进出</label><label>场空驶</label></td>
... ... @@ -337,6 +338,7 @@
337 338 <td>{{obj.ssgl_kx}}</td>
338 339 <td>{{obj.ssgl_qh}}</td>
339 340 <td>{{obj.ssgl_yw}}</td>
  341 + <td>{{obj.ssgl_ljpm}}</td>
340 342 <td>{{obj.ssgl_other}}</td>
341 343 <td>{{obj.ljyy}}</td>
342 344 <td>{{obj.ljjcc}}</td>
... ... @@ -345,7 +347,7 @@
345 347 {{/each}}
346 348 {{if list.length == 0}}
347 349 <tr>
348   - <td colspan="30"><h6 class="muted">没有找到相关数据</h6></td>
  350 + <td colspan="31"><h6 class="muted">没有找到相关数据</h6></td>
349 351 </tr>
350 352 {{/if}}
351 353 </script>
352 354 \ No newline at end of file
... ...
src/main/resources/static/pages/electricity/list/list.html
  View file @69ffd8b
... ... @@ -285,7 +285,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
285 285 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
286 286 $get('/ylb/checkDate',par,function(status){
287 287 if(status=='2'){
288   - layer.msg('只能操作三天内数据.');
  288 + layer.msg('只能操作一天内数据.');
289 289 }else{
290 290 var i = layer.load(2);
291 291 $get('/dlb/checkDl', params, function () {
... ... @@ -309,7 +309,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
309 309 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
310 310 $get('/ylb/checkDate',par,function(status){
311 311 if(status=='2'){
312   - layer.msg('只能操作三天内数据.');
  312 + layer.msg('只能操作一天内数据.');
313 313 }else{
314 314 var i = layer.load(2);
315 315 $get('/ylb/outAndIn', params, function () {
... ... @@ -332,7 +332,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
332 332 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
333 333 $get('/ylb/checkDate',par,function(status){
334 334 if(status=='2'){
335   - layer.msg('只能操作三天内数据.');
  335 + layer.msg('只能操作一天内数据.');
336 336 }else{
337 337 var ylArray = [];
338 338 $('input.icheck').each(function(){
... ... @@ -447,7 +447,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
447 447 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
448 448 $get('/ylb/checkDate',par,function(status){
449 449 if(status=='2'){
450   - layer.msg('只能操作三天内数据.');
  450 + layer.msg('只能操作一天内数据.');
451 451 }else{
452 452 var i = layer.load(2);
453 453 $get('/dlb/obtain', params, function () {
... ... @@ -615,7 +615,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
615 615 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
616 616 $get('/ylb/checkDate',par,function(status){
617 617 if(status=='2'){
618   - layer.msg('只能操作三天内数据.');
  618 + layer.msg('只能操作一天内数据.');
619 619 }else{
620 620 var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
621 621 console.log(id+"修改驾驶员:"+jsy);
... ... @@ -762,7 +762,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
762 762 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
763 763 $get('/ylb/checkDate',par,function(status){
764 764 if(status=='2'){
765   - layer.msg('只能操作三天内数据.');
  765 + layer.msg('只能操作一天内数据.');
766 766 }else{
767 767 var idArray = [];
768 768 var x=0;
... ...
src/main/resources/static/pages/forms/calc/calcLbStatuAnaly.html
  View file @69ffd8b
... ... @@ -42,6 +42,7 @@
42 42 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="7" checked="true"/>客稀
43 43 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="8" checked="true"/>气候
44 44 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="9" checked="true"/>援外
  45 + <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="9" checked="true"/>路救抛锚
45 46 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="10" checked="true"/>其他
46 47 </div>
47 48 <div style="margin-top: 5px"></div>
... ... @@ -217,7 +218,7 @@
217 218 g.checked = checked;
218 219 });
219 220 if(checked == true)
220   - lb = 33;
  221 + lb = 36;
221 222 else
222 223 lb = 0;
223 224 });
... ... @@ -422,7 +423,8 @@
422 423 {{if reason[7].checked == true}}<th colspan="3">客稀</th>{{/if}}
423 424 {{if reason[8].checked == true}}<th colspan="3">气候</th>{{/if}}
424 425 {{if reason[9].checked == true}}<th colspan="3">援外</th>{{/if}}
425   - {{if reason[10].checked == true}}<th colspan="3">其他</th>{{/if}}
  426 + {{if reason[10].checked == true}}<th colspan="3">路救抛锚</th>{{/if}}
  427 + {{if reason[11].checked == true}}<th colspan="3">其他</th>{{/if}}
426 428 </tr>
427 429 <tr>
428 430 <th class="hidden"></th>
... ... @@ -439,6 +441,7 @@
439 441 {{if reason[8].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
440 442 {{if reason[9].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
441 443 {{if reason[10].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
  444 + {{if reason[11].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
442 445 </tr>
443 446 </thead>
444 447 <tbody>
... ... @@ -465,12 +468,13 @@
465 468 {{if reason[7].checked==true}}<td>{{obj.kxbc}}</td><td>{{obj.kxlc}}</td><td>{{obj.kxbfb}}</td>{{/if}}
466 469 {{if reason[8].checked==true}}<td>{{obj.qhbc}}</td><td>{{obj.qhlc}}</td><td>{{obj.qhbfb}}</td>{{/if}}
467 470 {{if reason[9].checked==true}}<td>{{obj.ywbc}}</td><td>{{obj.ywlc}}</td><td>{{obj.ywbfb}}</td>{{/if}}
468   - {{if reason[10].checked==true}}<td>{{obj.qtbc}}</td><td>{{obj.qtlc}}</td><td>{{obj.qtbfb}}</td>{{/if}}
  471 + {{if reason[10].checked==true}}<td>{{obj.ljpmbc}}</td><td>{{obj.ljpmlc}}</td><td>{{obj.ljpmbfb}}</td>{{/if}}
  472 + {{if reason[11].checked==true}}<td>{{obj.qtbc}}</td><td>{{obj.qtlc}}</td><td>{{obj.qtbfb}}</td>{{/if}}
469 473 </tr>
470 474 {{/each}}
471 475 {{if list.length == 0}}
472 476 <tr>
473   - <td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
  477 + <td colspan="47"><h6 class="muted">没有找到相关数据</h6></td>
474 478 </tr>
475 479 {{/if}}
476 480 </tbody>
... ...
src/main/resources/static/pages/forms/mould/countByLine.xls
View file @69ffd8b
No preview for this file type
src/main/resources/static/pages/forms/mould/countByLines.xls
View file @69ffd8b
No preview for this file type
src/main/resources/static/pages/forms/mould/countMileageSum.xls
View file @69ffd8b
No preview for this file type
src/main/resources/static/pages/forms/mould/dispatchDailySum.xls
View file @69ffd8b
No preview for this file type
src/main/resources/static/pages/forms/mould/lbStatuAnaly.xls
View file @69ffd8b
No preview for this file type
src/main/resources/static/pages/forms/mould/scheduleDaily.xls
View file @69ffd8b
No preview for this file type
src/main/resources/static/pages/forms/mould/scheduleDaily_df.xls
View file @69ffd8b
No preview for this file type
src/main/resources/static/pages/forms/mould/scheduleDaily_m.xls
View file @69ffd8b
No preview for this file type
src/main/resources/static/pages/forms/mould/statisticsDaily_.xls
View file @69ffd8b
No preview for this file type
src/main/resources/static/pages/forms/mould/statisticsDaily_2.xls
View file @69ffd8b
No preview for this file type
src/main/resources/static/pages/forms/mould/statisticsDaily_4.xls
View file @69ffd8b
No preview for this file type
src/main/resources/static/pages/forms/statement/dispatchDailySum.html
  View file @69ffd8b
... ... @@ -72,7 +72,7 @@
72 72 <tr>
73 73 <td rowspan="3"><span >公司</span></td>
74 74 <td rowspan="3"><span >分公司</span></td>
75   - <td colspan="21">全日营运里程（公里）</td>
  75 + <td colspan="22">全日营运里程（公里）</td>
76 76 <td colspan="15">全日营运班次</td>
77 77 <td colspan="9">大间隔情况</td>
78 78 </tr>
... ... @@ -85,7 +85,7 @@
85 85 <td rowspan="2"><label>实际空</label><label>驶公里</label></td>
86 86 <td rowspan="2"><span>少驶班次</span></td>
87 87 <td rowspan="2"><span>少驶公里</span></td>
88   - <td colspan="11">少驶原因（公里）</td>
  88 + <td colspan="12">少驶原因（公里）</td>
89 89 <td colspan="2">临加公里</td>
90 90 <td colspan="3">计划班次</td>
91 91 <td colspan="3">实际班次</td>
... ... @@ -107,6 +107,7 @@
107 107 <td><span>客稀</span></td>
108 108 <td><span>气候</span></td>
109 109 <td><span>援外</span></td>
  110 + <td><span>路救抛锚</span></td>
110 111 <td><span>其他</span></td>
111 112 <td><span>营运</span></td>
112 113 <td><span>空驶</span></td>
... ... @@ -146,6 +147,7 @@
146 147 if (!$('body').hasClass('page-sidebar-closed'))
147 148 $('.menu-toggler.sidebar-toggler').click();
148 149 var d = new Date();
  150 + d.setTime(d.getTime() - 1*1000*60*60*24);
149 151 var year = d.getFullYear();
150 152 var month = d.getMonth() + 1;
151 153 var day = d.getDate();
... ... @@ -286,6 +288,7 @@
286 288 <td>{{obj.ssgl_kx}}</td>
287 289 <td>{{obj.ssgl_qh}}</td>
288 290 <td>{{obj.ssgl_yw}}</td>
  291 + <td>{{obj.ssgl_ljpm}}</td>
289 292 <td>{{obj.ssgl_other}}</td>
290 293 <td>{{obj.ljgl}}</td>
291 294 <td>{{obj.ljks}}</td>
... ... @@ -313,7 +316,7 @@
313 316 {{/each}}
314 317 {{if list.length == 0}}
315 318 <tr>
316   - <td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
  319 + <td colspan="45"><h6 class="muted">没有找到相关数据</h6></td>
317 320 </tr>
318 321 {{/if}}
319 322 </script>
320 323 \ No newline at end of file
... ...
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
  View file @69ffd8b
... ... @@ -42,6 +42,7 @@
42 42 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="7" checked="true"/>客稀
43 43 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="8" checked="true"/>气候
44 44 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="9" checked="true"/>援外
  45 + <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="9" checked="true"/>路救抛锚
45 46 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="10" checked="true"/>其他
46 47 </div>
47 48 <div style="margin-top: 5px"></div>
... ... @@ -254,7 +255,7 @@
254 255 g.checked = checked;
255 256 });
256 257 if(checked == true)
257   - lb = 33;
  258 + lb = 36;
258 259 else
259 260 lb = 0;
260 261 });
... ... @@ -508,7 +509,8 @@
508 509 {{if reason[7].checked == true}}<th colspan="3">客稀</th>{{/if}}
509 510 {{if reason[8].checked == true}}<th colspan="3">气候</th>{{/if}}
510 511 {{if reason[9].checked == true}}<th colspan="3">援外</th>{{/if}}
511   - {{if reason[10].checked == true}}<th colspan="3">其他</th>{{/if}}
  512 + {{if reason[10].checked == true}}<th colspan="3">路救抛锚</th>{{/if}}
  513 + {{if reason[11].checked == true}}<th colspan="3">其他</th>{{/if}}
512 514 </tr>
513 515 <tr>
514 516 <th class="hidden"></th>
... ... @@ -525,6 +527,7 @@
525 527 {{if reason[8].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
526 528 {{if reason[9].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
527 529 {{if reason[10].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
  530 + {{if reason[11].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
528 531 </tr>
529 532 </thead>
530 533 <tbody>
... ... @@ -552,12 +555,13 @@
552 555 {{if reason[7].checked==true}}<td>{{obj.kxbc}}</td><td>{{obj.kxlc}}</td><td>{{obj.kxbfb}}</td>{{/if}}
553 556 {{if reason[8].checked==true}}<td>{{obj.qhbc}}</td><td>{{obj.qhlc}}</td><td>{{obj.qhbfb}}</td>{{/if}}
554 557 {{if reason[9].checked==true}}<td>{{obj.wybc}}</td><td>{{obj.wylc}}</td><td>{{obj.wybfb}}</td>{{/if}}
555   - {{if reason[10].checked==true}}<td>{{obj.qtbc}}</td><td>{{obj.qtlc}}</td><td>{{obj.qtbfb}}</td>{{/if}}
  558 + {{if reason[10].checked==true}}<td>{{obj.ljpmbc}}</td><td>{{obj.ljpmlc}}</td><td>{{obj.ljpmbfb}}</td>{{/if}}
  559 + {{if reason[11].checked==true}}<td>{{obj.qtbc}}</td><td>{{obj.qtlc}}</td><td>{{obj.qtbfb}}</td>{{/if}}
556 560 </tr>
557 561 {{/each}}
558 562 {{if list.length == 0}}
559 563 <tr>
560   - <td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
  564 + <td colspan="47"><h6 class="muted">没有找到相关数据</h6></td>
561 565 </tr>
562 566 {{/if}}
563 567 </tbody>
... ...
src/main/resources/static/pages/forms/statement/scheduleDaily.html
  View file @69ffd8b
... ... @@ -66,11 +66,11 @@
66 66 <table class="table table-bordered table-hover table-checkable" id="forms">
67 67 <thead>
68 68 <tr>
69   - <th colspan="40"><label id="xlmc"></label>线路调度日报</th>
  69 + <th colspan="41"><label id="xlmc"></label>线路调度日报</th>
70 70 </tr>
71 71 <tr>
72 72 <td rowspan="3"><span>路线</span></td>
73   - <td colspan="16">全日营运里程（公里）</td>
  73 + <td colspan="17">全日营运里程（公里）</td>
74 74 <td colspan="15">全日营运班次</td>
75 75 <td colspan="9">大间隔情况</td>
76 76 </tr>
... ... @@ -79,7 +79,7 @@
79 79 <td rowspan="2"><span >实驶</span></td>
80 80 <td rowspan="2"><span>少驶公里</span></td>
81 81 <td rowspan="2"><span>少驶班次</span></td>
82   - <td colspan="11">少驶原因（公里）</td>
  82 + <td colspan="12">少驶原因（公里）</td>
83 83 <td rowspan="2"><span >临加公里</span></td>
84 84 <td colspan="3">计划班次</td>
85 85 <td colspan="3">实际班次</td>
... ... @@ -101,6 +101,7 @@
101 101 <td><span>客稀</span></td>
102 102 <td><span>气候</span></td>
103 103 <td><span>援外</span></td>
  104 + <td><span>路救抛锚</span></td>
104 105 <td><span>其他</span></td>
105 106 <td><span>全日</span></td>
106 107 <td><span>早高峰</span></td>
... ... @@ -542,6 +543,7 @@
542 543 <td>{{obj.ssgl_kx}}</td>
543 544 <td>{{obj.ssgl_qh}}</td>
544 545 <td>{{obj.ssgl_yw}}</td>
  546 + <td>{{obj.ssgl_ljpm}}</td>
545 547 <td>{{obj.ssgl_other}}</td>
546 548 <td>{{obj.ljgl}}</td>
547 549 <td>{{obj.jhbc}}</td>
... ... @@ -568,7 +570,7 @@
568 570 {{/each}}
569 571 {{if list.length == 0}}
570 572 <tr>
571   - <td colspan="40"><h6 class="muted">没有找到相关数据</h6></td>
  573 + <td colspan="41"><h6 class="muted">没有找到相关数据</h6></td>
572 574 </tr>
573 575 {{/if}}
574 576 </script>
... ...
src/main/resources/static/pages/forms/statement/scheduleDaily_df.html
  View file @69ffd8b
... ... @@ -66,11 +66,11 @@
66 66 <table class="table table-bordered table-hover table-checkable" id="forms">
67 67 <thead>
68 68 <tr>
69   - <th colspan="40"><label id="xlmc"></label>线路调度日报</th>
  69 + <th colspan="41"><label id="xlmc"></label>线路调度日报</th>
70 70 </tr>
71 71 <tr>
72 72 <td rowspan="3"><span>路线</span></td>
73   - <td colspan="16">全日营运里程（公里）</td>
  73 + <td colspan="17">全日营运里程（公里）</td>
74 74 <td colspan="15">全日营运班次</td>
75 75 <td colspan="9">大间隔情况</td>
76 76 </tr>
... ... @@ -79,7 +79,7 @@
79 79 <td rowspan="2"><span >实驶</span></td>
80 80 <td rowspan="2"><span>少驶公里</span></td>
81 81 <td rowspan="2"><span>少驶班次</span></td>
82   - <td colspan="11">少驶原因（公里）</td>
  82 + <td colspan="12">少驶原因（公里）</td>
83 83 <td rowspan="2"><span >临加公里</span></td>
84 84 <td colspan="3">计划班次</td>
85 85 <td colspan="3">实际班次</td>
... ... @@ -101,6 +101,7 @@
101 101 <td><span>客稀</span></td>
102 102 <td><span>气候</span></td>
103 103 <td><span>援外</span></td>
  104 + <td><span>路救抛锚</span></td>
104 105 <td><span>其他</span></td>
105 106 <td><span>全日</span></td>
106 107 <td><span>早高峰</span></td>
... ... @@ -568,6 +569,7 @@
568 569 <td>{{obj.ssgl_kx}}</td>
569 570 <td>{{obj.ssgl_qh}}</td>
570 571 <td>{{obj.ssgl_yw}}</td>
  572 + <td>{{obj.ssgl_ljpm}}</td>
571 573 <td>{{obj.ssgl_other}}</td>
572 574 <td>{{obj.ljgl}}</td>
573 575 <td>{{obj.jhbc}}</td>
... ... @@ -594,7 +596,7 @@
594 596 {{/each}}
595 597 {{if list.length == 0}}
596 598 <tr>
597   - <td colspan="40"><h6 class="muted">没有找到相关数据</h6></td>
  599 + <td colspan="41"><h6 class="muted">没有找到相关数据</h6></td>
598 600 </tr>
599 601 {{/if}}
600 602 </script>
... ...
src/main/resources/static/pages/forms/statement/statisticsDaily.html
  View file @69ffd8b
... ... @@ -86,7 +86,7 @@
86 86 <tr>
87 87 <td rowspan="3"><span >分公司</span></td>
88 88 <td rowspan="3"><span >路线名</span></td>
89   - <td colspan="21">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
  89 + <td colspan="22">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
90 90 <td colspan="15">全日营运班次</td>
91 91 <td colspan="9">大间隔情况</td>
92 92 </tr>
... ... @@ -100,7 +100,7 @@
100 100 <td rowspan="2"><label>实际空</label><label>驶公里</label></td>
101 101 <td rowspan="2"><span>少驶公里</span></td>
102 102 <td rowspan="2"><span>少驶班次</span></td>
103   - <td colspan="11">少驶原因（公里）</td>
  103 + <td colspan="12">少驶原因（公里）</td>
104 104 <td colspan="2">临加公里</td>
105 105 <td colspan="3">计划班次</td>
106 106 <td colspan="3">实际班次</td>
... ... @@ -112,16 +112,17 @@
112 112 <td rowspan="2">原因</td>
113 113 </tr>
114 114 <tr>
115   - <td><span >路阻</span></td>
  115 + <td><span>路阻</span></td>
116 116 <td><span>吊慢</span></td>
117   - <td><span >故障</span></td>
118   - <td><span >纠纷</span></td>
119   - <td><span >肇事</span></td>
  117 + <td><span>故障</span></td>
  118 + <td><span>纠纷</span></td>
  119 + <td><span>肇事</span></td>
120 120 <td><span>缺人</span></td>
121 121 <td><span>缺车</span></td>
122   - <td><span >客稀</span></td>
  122 + <td><span>客稀</span></td>
123 123 <td><span>气候</span></td>
124 124 <td><span>援外</span></td>
  125 + <td><span>路救抛锚</span></td>
125 126 <td><span>其他</span></td>
126 127 <td><span>营运</span></td>
127 128 <td><span>空驶</span></td>
... ... @@ -435,6 +436,7 @@
435 436 <td>{{obj.ssgl_kx}}</td>
436 437 <td>{{obj.ssgl_qh}}</td>
437 438 <td>{{obj.ssgl_yw}}</td>
  439 + <td>{{obj.ssgl_ljpm}}</td>
438 440 <td>{{obj.ssgl_other}}</td>
439 441 <td>{{obj.ljgl}}</td>
440 442 <td>{{obj.ljks}}</td>
... ... @@ -462,7 +464,7 @@
462 464 {{/each}}
463 465 {{if list.length == 0}}
464 466 <tr>
465   - <td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
  467 + <td colspan="45"><h6 class="muted">没有找到相关数据</h6></td>
466 468 </tr>
467 469 {{/if}}
468 470 </script>
469 471 \ No newline at end of file
... ...
src/main/resources/static/pages/forms/statement/statisticsDailyCalc2.html
  View file @69ffd8b
... ... @@ -81,12 +81,12 @@
81 81 <table class="table table-bordered table-hover table-checkable" id="forms">
82 82 <thead>
83 83 <tr>
84   - <th colspan="45"><label id="tjrq"></label> 线路统计日报</th>
  84 + <th colspan="46"><label id="tjrq"></label> 线路统计日报</th>
85 85 </tr>
86 86 <tr>
87 87 <td rowspan="3"><span >分公司</span></td>
88 88 <td rowspan="3"><span >路线名</span></td>
89   - <td colspan="21">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
  89 + <td colspan="22">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
90 90 <td colspan="15">全日营运班次</td>
91 91 <td colspan="9">大间隔情况</td>
92 92 </tr>
... ... @@ -100,7 +100,7 @@
100 100 <td rowspan="2"><label>实际空</label><label>驶公里</label></td>
101 101 <td rowspan="2"><span>少驶公里</span></td>
102 102 <td rowspan="2"><span>少驶班次</span></td>
103   - <td colspan="11">少驶原因（公里）</td>
  103 + <td colspan="12">少驶原因（公里）</td>
104 104 <td colspan="2">临加公里</td>
105 105 <td colspan="3">计划班次</td>
106 106 <td colspan="3">实际班次</td>
... ... @@ -112,16 +112,17 @@
112 112 <td rowspan="2">原因</td>
113 113 </tr>
114 114 <tr>
115   - <td><span >路阻</span></td>
  115 + <td><span>路阻</span></td>
116 116 <td><span>吊慢</span></td>
117   - <td><span >故障</span></td>
118   - <td><span >纠纷</span></td>
119   - <td><span >肇事</span></td>
  117 + <td><span>故障</span></td>
  118 + <td><span>纠纷</span></td>
  119 + <td><span>肇事</span></td>
120 120 <td><span>缺人</span></td>
121 121 <td><span>缺车</span></td>
122   - <td><span >客稀</span></td>
  122 + <td><span>客稀</span></td>
123 123 <td><span>气候</span></td>
124 124 <td><span>援外</span></td>
  125 + <td><span>路救抛锚</span></td>
125 126 <td><span>其他</span></td>
126 127 <td><span>营运</span></td>
127 128 <td><span>空驶</span></td>
... ... @@ -415,6 +416,7 @@
415 416 <td>{{obj.kxlc}}</td>
416 417 <td>{{obj.qhlc}}</td>
417 418 <td>{{obj.ywlc}}</td>
  419 + <td>{{obj.ljpmlc}}</td>
418 420 <td>{{obj.qtlc}}</td>
419 421 <td>{{obj.ljlc}}</td>
420 422 <td>{{obj.ljkslc}}</td>
... ... @@ -442,7 +444,7 @@
442 444 {{/each}}
443 445 {{if list.length == 0}}
444 446 <tr>
445   - <td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
  447 + <td colspan="46"><h6 class="muted">没有找到相关数据</h6></td>
446 448 </tr>
447 449 {{/if}}
448 450 </script>
449 451 \ No newline at end of file
... ...
src/main/resources/static/pages/oil/list_ph.html
  View file @69ffd8b
... ... @@ -363,7 +363,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
363 363 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
364 364 $get('/ylb/checkDate',par,function(status){
365 365 if(status=='2'){
366   - layer.msg('只能操作三天内数据.');
  366 + layer.msg('只能操作一天内数据.');
367 367 }else{
368 368 var i = layer.load(2);
369 369 $get('/ylb/checkYl', params, function () {
... ... @@ -388,7 +388,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
388 388 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
389 389 $get('/ylb/checkDate',par,function(status){
390 390 if(status=='2'){
391   - layer.msg('只能操作三天内数据.');
  391 + layer.msg('只能操作一天内数据.');
392 392 }else{
393 393 var i = layer.load(2);
394 394 $get('/ylb/outAndIn', params, function () {
... ... @@ -411,7 +411,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
411 411 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
412 412 $get('/ylb/checkDate',par,function(status){
413 413 if(status=='2'){
414   - layer.msg('只能操作三天内数据.');
  414 + layer.msg('只能操作一天内数据.');
415 415 }else{
416 416 var ylArray = [];
417 417 $('input.icheck').each(function(){
... ... @@ -478,7 +478,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
478 478 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
479 479 $get('/ylb/checkDate',par,function(status){
480 480 if(status=='2'){
481   - layer.msg('只能操作三天内数据.');
  481 + layer.msg('只能操作一天内数据.');
482 482 }else{
483 483 //拆分前先保存全部
484 484 var ylArray = [];
... ... @@ -649,7 +649,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
649 649 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
650 650 $get('/ylb/checkDate',par,function(status){
651 651 if(status=='2'){
652   - layer.msg('只能操作三天内数据.');
  652 + layer.msg('只能操作一天内数据.');
653 653 }else{
654 654 var i = layer.load(2);
655 655 $get('/ylb/obtain', params, function () {
... ... @@ -809,7 +809,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
809 809 $get('/ylb/checkDate',par,function(status){
810 810 var id = $(this).data('id');
811 811 if(status=='2'){
812   - layer.msg('只能操作三天内数据.');
  812 + layer.msg('只能操作一天内数据.');
813 813 }else{
814 814 var jsy=$('.in_carpark_jsy[data-id='+id+']', '#ll_oil_list').val();
815 815 $get('/ylb/updateJsy',{id:id,jsy:jsy}, function(result){
... ... @@ -949,7 +949,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
949 949 par["ssgsdm_like"] = $("#ylbListGsdmId").val();
950 950 $get('/ylb/checkDate',par,function(status){
951 951 if(status=='2'){
952   - layer.msg('只能操作三天内数据.');
  952 + layer.msg('只能操作一天内数据.');
953 953 }else{
954 954 var idArray = [];
955 955 var x=0;
... ...
src/main/resources/static/pages/report/countMileage/countLine/company/countLineMileage.html
  View file @69ffd8b
... ... @@ -69,7 +69,7 @@
69 69 <table class="table table-bordered table-hover table-checkable" id="forms">
70 70 <thead>
71 71 <tr>
72   - <th colspan="31"><label id="datetodate"></label>线路公里统计表</th>
  72 + <th colspan="32"><label id="datetodate"></label>线路公里统计表</th>
73 73 </tr>
74 74 <tr>
75 75 <td rowspan="2"><span>公司</span></td>
... ... @@ -82,7 +82,7 @@
82 82 <td colspan="2"><label>实际营</label><label>运公里</label></td>
83 83 <td colspan="7"><label>实际空</label><label>驶公里</label></td>
84 84 <td rowspan="2"><label>少驶营</label><label>运里程</label></td>
85   - <td colspan="11">少驶原因(公里)</td>
  85 + <td colspan="12">少驶原因(公里)</td>
86 86 <td colspan="3">临加公里</td>
87 87 </tr>
88 88 <tr>
... ... @@ -105,6 +105,7 @@
105 105 <td><span>客稀</span></td>
106 106 <td><span>气候</span></td>
107 107 <td><span>援外</span></td>
  108 + <td><span>路救抛锚</span></td>
108 109 <td><span>其他</span></td>
109 110 <td><label>临加营</label><label>运公里</label></td>
110 111 <td><label>临加进出</label><label>场空驶</label></td>
... ... @@ -339,6 +340,7 @@
339 340 <td>{{obj.ssgl_kx}}</td>
340 341 <td>{{obj.ssgl_qh}}</td>
341 342 <td>{{obj.ssgl_yw}}</td>
  343 + <td>{{obj.ssgl_ljpm}}</td>
342 344 <td>{{obj.ssgl_other}}</td>
343 345 <td>{{obj.ljyy}}</td>
344 346 <td>{{obj.ljjcc}}</td>
... ... @@ -347,7 +349,7 @@
347 349 {{/each}}
348 350 {{if list.length == 0}}
349 351 <tr>
350   - <td colspan="30"><h6 class="muted">没有找到相关数据</h6></td>
  352 + <td colspan="32"><h6 class="muted">没有找到相关数据</h6></td>
351 353 </tr>
352 354 {{/if}}
353 355 </script>
354 356 \ No newline at end of file
... ...
src/main/resources/static/pages/report/countMileage/countLine/countLineMileage.html
  View file @69ffd8b
... ... @@ -69,7 +69,7 @@
69 69 <table class="table table-bordered table-hover table-checkable" id="forms">
70 70 <thead>
71 71 <tr>
72   - <th colspan="30"><label id="datetodate"></label>线路公里统计表</th>
  72 + <th colspan="31"><label id="datetodate"></label>线路公里统计表</th>
73 73 </tr>
74 74 <tr>
75 75 <td rowspan="2"><span>公司</span></td>
... ... @@ -82,7 +82,7 @@
82 82 <td colspan="2"><label>实际营</label><label>运公里</label></td>
83 83 <td colspan="6"><label>实际空</label><label>驶公里</label></td>
84 84 <td rowspan="2"><label>少驶营</label><label>运里程</label></td>
85   - <td colspan="11">少驶原因(公里)</td>
  85 + <td colspan="12">少驶原因(公里)</td>
86 86 <td colspan="3">临加公里</td>
87 87 </tr>
88 88 <tr>
... ... @@ -104,6 +104,7 @@
104 104 <td><span>客稀</span></td>
105 105 <td><span>气候</span></td>
106 106 <td><span>援外</span></td>
  107 + <td><span>路救抛锚</span></td>
107 108 <td><span>其他</span></td>
108 109 <td><label>临加营</label><label>运公里</label></td>
109 110 <td><label>临加进出</label><label>场空驶</label></td>
... ... @@ -337,6 +338,7 @@
337 338 <td>{{obj.ssgl_kx}}</td>
338 339 <td>{{obj.ssgl_qh}}</td>
339 340 <td>{{obj.ssgl_yw}}</td>
  341 + <td>{{obj.ssgl_ljpm}}</td>
340 342 <td>{{obj.ssgl_other}}</td>
341 343 <td>{{obj.ljyy}}</td>
342 344 <td>{{obj.ljjcc}}</td>
... ... @@ -345,7 +347,7 @@
345 347 {{/each}}
346 348 {{if list.length == 0}}
347 349 <tr>
348   - <td colspan="30"><h6 class="muted">没有找到相关数据</h6></td>
  350 + <td colspan="31"><h6 class="muted">没有找到相关数据</h6></td>
349 351 </tr>
350 352 {{/if}}
351 353 </script>
352 354 \ No newline at end of file
... ...
src/main/resources/static/pages/report/countMileage/countLine/countMileageSum.html
  View file @69ffd8b
... ... @@ -66,7 +66,7 @@
66 66 <table class="table table-bordered table-hover table-checkable" id="forms">
67 67 <thead>
68 68 <tr>
69   - <th colspan="30"><label id="datetodate"></label> 审计公里汇总表</th>
  69 + <th colspan="31"><label id="datetodate"></label> 审计公里汇总表</th>
70 70 </tr>
71 71 <tr>
72 72 <td rowspan="2"><span>公司</span></td>
... ... @@ -78,7 +78,7 @@
78 78 <td colspan="2"><label>实际营</label><label>运公里</label></td>
79 79 <td colspan="6"><label>实际空</label><label>驶公里</label></td>
80 80 <td rowspan="2"><label>少驶营</label><label>运里程</label></td>
81   - <td colspan="11">少驶原因(公里)</td>
  81 + <td colspan="12">少驶原因(公里)</td>
82 82 <td colspan="3">临加公里</td>
83 83 </tr>
84 84 <tr>
... ... @@ -100,6 +100,7 @@
100 100 <td><span>客稀</span></td>
101 101 <td><span>气候</span></td>
102 102 <td><span>援外</span></td>
  103 + <td><span>路救抛锚</span></td>
103 104 <td><span>其他</span></td>
104 105 <td><label>临加营</label><label>运公里</label></td>
105 106 <td><label>临加进出</label><label>场空驶</label></td>
... ... @@ -135,6 +136,7 @@
135 136 });
136 137  
137 138 var d = new Date();
  139 + d.setTime(d.getTime() - 4*1000*60*60*24);
138 140 var year = d.getFullYear();
139 141 var month = d.getMonth() + 1;
140 142 var day = d.getDate();
... ... @@ -254,6 +256,7 @@
254 256 <td>{{obj.ssgl_kx}}</td>
255 257 <td>{{obj.ssgl_qh}}</td>
256 258 <td>{{obj.ssgl_yw}}</td>
  259 + <td>{{obj.ssgl_ljpm}}</td>
257 260 <td>{{obj.ssgl_other}}</td>
258 261 <td>{{obj.ljyy}}</td>
259 262 <td>{{obj.ljjcc}}</td>
... ... @@ -262,7 +265,7 @@
262 265 {{/each}}
263 266 {{if list.length == 0}}
264 267 <tr>
265   - <td colspan="30"><h6 class="muted">没有找到相关数据</h6></td>
  268 + <td colspan="31"><h6 class="muted">没有找到相关数据</h6></td>
266 269 </tr>
267 270 {{/if}}
268 271 </script>
269 272 \ No newline at end of file
... ...