潘钊 / bsth_control · Commits

Commit b5dba7cb2ff253a468021da626f458e4977d3167

Authored by 娄高锋
1 parent d86ebee3
build: skipped

百公里能耗从保留两位小数改成保留三位小数

Inline Side-by-side
Showing 5 changed files with 1087 additions and 1088 deletions
src/main/java/com/bsth/entity/oil/Dlb.java
  View file @b5dba7c
1 -package com.bsth.entity.oil;  
2 -  
3 -import java.text.DecimalFormat;  
4 -import java.util.Date;  
5 -  
6 -import javax.persistence.*;  
7 -  
8 -import org.springframework.format.annotation.DateTimeFormat;  
9 -  
10 -import com.bsth.data.BasicData;  
11 -  
12 -@Entity  
13 -@Table(name = "bsth_c_dlb")  
14 -public class Dlb {  
15 - @Id  
16 - @GeneratedValue(strategy = GenerationType.IDENTITY)  
17 - private Integer id;  
18 - @DateTimeFormat(pattern="yyyy-MM-dd")  
19 - private Date rq;  
20 - private String xlbm;  
21 - private String linename;  
22 - private String ssgsdm;  
23 - private String fgsdm;  
24 - private String nbbm;  
25 - private String jsy;  
26 - private Double czlc=0.0;  
27 - private Double jzlc=0.0;  
28 - //出站存电  
29 - private Double czcd=0.0;  
30 - //进站存电  
31 - private Double jzcd=0.0;  
32 - //充电量  
33 - private Double cdl;  
34 - private int sfkt;  
35 - private String jhsj;  
36 - //耗电  
37 - private Double hd=0.0;  
38 - private Double sh=0.0;  
39 - private String shyy;  
40 - private Double zlc=0.0;  
41 - private int yhlx;  
42 -  
43 - private Double ns=0.0;  
44 - private Double fyylc=0.0;  
45 - private Double jhzlc=0.0;  
46 - private Double jhfyylc=0.0;  
47 - private int jhzbc;  
48 - private int jhbc;  
49 - private int sjzbc;  
50 - private int sjbc;  
51 - private String edituser;  
52 - private Date edittime;  
53 - private Date createtime;  
54 - private Date updatetime;  
55 - private int nylx;  
56 - //进场顺序（根据最先出场和最后进场来关联车辆的存电量）  
57 - private int jcsx;  
58 -  
59 - private String jname;  
60 - @Transient  
61 - private String name;  
62 - @Transient  
63 - private String bglyh;  
64 -  
65 - @Transient  
66 - private String xlname;  
67 -  
68 - @Transient  
69 - private String gsname;  
70 -  
71 - @Transient  
72 - private String fgsname;  
73 -  
74 -  
75 -  
76 - private String lp;  
77 -  
78 - public Integer getId() {  
79 - return id;  
80 - }  
81 -  
82 - public void setId(Integer id) {  
83 - this.id = id;  
84 - }  
85 -  
86 - public Date getRq() {  
87 - return rq;  
88 - }  
89 -  
90 - public void setRq(Date rq) {  
91 - this.rq = rq;  
92 - }  
93 -  
94 - public String getXlbm() {  
95 - return xlbm;  
96 - }  
97 -  
98 - public void setXlbm(String xlbm) {  
99 - this.xlbm = xlbm;  
100 - }  
101 -  
102 - public String getLinename() {  
103 - return linename;  
104 - }  
105 -  
106 - public void setLinename(String linename) {  
107 - this.linename = linename;  
108 - }  
109 -  
110 - public String getSsgsdm() {  
111 - return ssgsdm;  
112 - }  
113 -  
114 - public void setSsgsdm(String ssgsdm) {  
115 - this.ssgsdm = ssgsdm;  
116 - }  
117 -  
118 - public String getFgsdm() {  
119 - return fgsdm;  
120 - }  
121 -  
122 - public void setFgsdm(String fgsdm) {  
123 - this.fgsdm = fgsdm;  
124 - }  
125 -  
126 - public String getNbbm() {  
127 - return nbbm;  
128 - }  
129 -  
130 - public void setNbbm(String nbbm) {  
131 - this.nbbm = nbbm;  
132 - }  
133 -  
134 - public String getJsy() {  
135 - return jsy;  
136 - }  
137 -  
138 - public void setJsy(String jsy) {  
139 - this.jsy = jsy;  
140 - }  
141 -  
142 - public Double getCzlc() {  
143 - return czlc;  
144 - }  
145 -  
146 - public void setCzlc(Double czlc) {  
147 - this.czlc = czlc;  
148 - }  
149 -  
150 - public Double getJzlc() {  
151 - return jzlc;  
152 - }  
153 -  
154 - public void setJzlc(Double jzlc) {  
155 - this.jzlc = jzlc;  
156 - }  
157 -  
158 - public Double getCzcd() {  
159 - return czcd;  
160 - }  
161 -  
162 - public void setCzcd(Double czcd) {  
163 - this.czcd = czcd;  
164 - }  
165 -  
166 - public Double getJzcd() {  
167 - return jzcd;  
168 - }  
169 -  
170 - public void setJzcd(Double jzcd) {  
171 - this.jzcd = jzcd;  
172 - }  
173 -  
174 - public Double getCdl() {  
175 - return cdl;  
176 - }  
177 -  
178 - public void setCdl(Double cdl) {  
179 - this.cdl = cdl;  
180 - }  
181 -  
182 - public int getSfkt() {  
183 - return sfkt;  
184 - }  
185 -  
186 - public void setSfkt(int sfkt) {  
187 - this.sfkt = sfkt;  
188 - }  
189 -  
190 - public String getJhsj() {  
191 - return jhsj;  
192 - }  
193 -  
194 - public void setJhsj(String jhsj) {  
195 - this.jhsj = jhsj;  
196 - }  
197 -  
198 - public Double getHd() {  
199 - return hd;  
200 - }  
201 -  
202 - public void setHd(Double hd) {  
203 - this.hd = hd;  
204 - }  
205 -  
206 - public Double getSh() {  
207 - return sh;  
208 - }  
209 -  
210 - public void setSh(Double sh) {  
211 - this.sh = sh;  
212 - }  
213 -  
214 - public String getShyy() {  
215 - return shyy;  
216 - }  
217 -  
218 - public void setShyy(String shyy) {  
219 - this.shyy = shyy;  
220 - }  
221 -  
222 - public Double getZlc() {  
223 - return zlc;  
224 - }  
225 -  
226 - public void setZlc(Double zlc) {  
227 - this.zlc = zlc;  
228 - }  
229 -  
230 - public int getYhlx() {  
231 - return yhlx;  
232 - }  
233 -  
234 - public void setYhlx(int yhlx) {  
235 - this.yhlx = yhlx;  
236 - }  
237 -  
238 - public Double getNs() {  
239 - return ns;  
240 - }  
241 -  
242 - public void setNs(Double ns) {  
243 - this.ns = ns;  
244 - }  
245 -  
246 - public Double getFyylc() {  
247 - return fyylc;  
248 - }  
249 -  
250 - public void setFyylc(Double fyylc) {  
251 - this.fyylc = fyylc;  
252 - }  
253 -  
254 - public Double getJhzlc() {  
255 - return jhzlc;  
256 - }  
257 -  
258 - public void setJhzlc(Double jhzlc) {  
259 - this.jhzlc = jhzlc;  
260 - }  
261 -  
262 - public Double getJhfyylc() {  
263 - return jhfyylc;  
264 - }  
265 -  
266 - public void setJhfyylc(Double jhfyylc) {  
267 - this.jhfyylc = jhfyylc;  
268 - }  
269 -  
270 - public int getJhzbc() {  
271 - return jhzbc;  
272 - }  
273 -  
274 - public void setJhzbc(int jhzbc) {  
275 - this.jhzbc = jhzbc;  
276 - }  
277 -  
278 - public int getJhbc() {  
279 - return jhbc;  
280 - }  
281 -  
282 - public void setJhbc(int jhbc) {  
283 - this.jhbc = jhbc;  
284 - }  
285 -  
286 - public int getSjzbc() {  
287 - return sjzbc;  
288 - }  
289 -  
290 - public void setSjzbc(int sjzbc) {  
291 - this.sjzbc = sjzbc;  
292 - }  
293 -  
294 - public int getSjbc() {  
295 - return sjbc;  
296 - }  
297 -  
298 - public void setSjbc(int sjbc) {  
299 - this.sjbc = sjbc;  
300 - }  
301 -  
302 - public String getEdituser() {  
303 - return edituser;  
304 - }  
305 -  
306 - public void setEdituser(String edituser) {  
307 - this.edituser = edituser;  
308 - }  
309 -  
310 - public Date getEdittime() {  
311 - return edittime;  
312 - }  
313 -  
314 - public void setEdittime(Date edittime) {  
315 - this.edittime = edittime;  
316 - }  
317 -  
318 - public Date getCreatetime() {  
319 - return createtime;  
320 - }  
321 -  
322 - public void setCreatetime(Date createtime) {  
323 - this.createtime = createtime;  
324 - }  
325 -  
326 - public int getNylx() {  
327 - return nylx;  
328 - }  
329 -  
330 - public void setNylx(int nylx) {  
331 - this.nylx = nylx;  
332 - }  
333 -  
334 - public int getJcsx() {  
335 - return jcsx;  
336 - }  
337 -  
338 - public void setJcsx(int jcsx) {  
339 - this.jcsx = jcsx;  
340 - }  
341 -  
342 - public String getBglyh() {  
343 - if(this.getZlc()==0){  
344 - return "0";  
345 - }else{  
346 - DecimalFormat df = new DecimalFormat("0.00");  
347 - return df.format(this.getHd()/this.getZlc()*100);  
348 - }  
349 - }  
350 -  
351 - public void setBglyh(String bglyh) {  
352 - this.bglyh = bglyh;  
353 - }  
354 -  
355 - public String getXlname() {  
356 - return BasicData.lineCodeAllNameMap.get(this.xlbm);  
357 - }  
358 -  
359 - public void setXlname(String xlname) {  
360 - this.xlname = xlname;  
361 - }  
362 -  
363 - public String getGsname() {  
364 - return BasicData.businessCodeNameMap.get(this.ssgsdm);  
365 - }  
366 -  
367 - public void setGsname(String gsname) {  
368 - this.gsname = gsname;  
369 - }  
370 -  
371 - public String getName() {  
372 - return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);  
373 - }  
374 -  
375 - public void setName(String name) {  
376 - this.name = name;  
377 - }  
378 -  
379 - public String getFgsname() {  
380 - return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);  
381 - }  
382 -  
383 - public void setFgsname(String fgsname) {  
384 - this.fgsname = fgsname;  
385 - }  
386 -  
387 - public Date getUpdatetime() {  
388 - return updatetime;  
389 - }  
390 -  
391 - public void setUpdatetime(Date updatetime) {  
392 - this.updatetime = updatetime;  
393 - }  
394 -  
395 - public String getLp() {  
396 - return lp;  
397 - }  
398 -  
399 - public void setLp(String lp) {  
400 - this.lp = lp;  
401 - }  
402 -  
403 - public String getJname() {  
404 - return jname;  
405 - }  
406 -  
407 - public void setJname(String jname) {  
408 - this.jname = jname;  
409 - }  
410 -  
411 -  
412 -  
413 -} 1 +package com.bsth.entity.oil;
  2 +
  3 +import java.text.DecimalFormat;
  4 +import java.util.Date;
  5 +
  6 +import javax.persistence.*;
  7 +
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import com.bsth.data.BasicData;
  11 +
  12 +@Entity
  13 +@Table(name = "bsth_c_dlb")
  14 +public class Dlb {
  15 + @Id
  16 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  17 + private Integer id;
  18 + @DateTimeFormat(pattern="yyyy-MM-dd")
  19 + private Date rq;
  20 + private String xlbm;
  21 + private String linename;
  22 + private String ssgsdm;
  23 + private String fgsdm;
  24 + private String nbbm;
  25 + private String jsy;
  26 + private Double czlc=0.0;
  27 + private Double jzlc=0.0;
  28 + //出站存电
  29 + private Double czcd=0.0;
  30 + //进站存电
  31 + private Double jzcd=0.0;
  32 + //充电量
  33 + private Double cdl;
  34 + private int sfkt;
  35 + private String jhsj;
  36 + //耗电
  37 + private Double hd=0.0;
  38 + private Double sh=0.0;
  39 + private String shyy;
  40 + private Double zlc=0.0;
  41 + private int yhlx;
  42 +
  43 + private Double ns=0.0;
  44 + private Double fyylc=0.0;
  45 + private Double jhzlc=0.0;
  46 + private Double jhfyylc=0.0;
  47 + private int jhzbc;
  48 + private int jhbc;
  49 + private int sjzbc;
  50 + private int sjbc;
  51 + private String edituser;
  52 + private Date edittime;
  53 + private Date createtime;
  54 + private Date updatetime;
  55 + private int nylx;
  56 + //进场顺序（根据最先出场和最后进场来关联车辆的存电量）
  57 + private int jcsx;
  58 +
  59 + private String jname;
  60 + @Transient
  61 + private String name;
  62 + @Transient
  63 + private String bglyh;
  64 +
  65 + @Transient
  66 + private String xlname;
  67 +
  68 + @Transient
  69 + private String gsname;
  70 +
  71 + @Transient
  72 + private String fgsname;
  73 +
  74 +
  75 +
  76 + private String lp;
  77 +
  78 + public Integer getId() {
  79 + return id;
  80 + }
  81 +
  82 + public void setId(Integer id) {
  83 + this.id = id;
  84 + }
  85 +
  86 + public Date getRq() {
  87 + return rq;
  88 + }
  89 +
  90 + public void setRq(Date rq) {
  91 + this.rq = rq;
  92 + }
  93 +
  94 + public String getXlbm() {
  95 + return xlbm;
  96 + }
  97 +
  98 + public void setXlbm(String xlbm) {
  99 + this.xlbm = xlbm;
  100 + }
  101 +
  102 + public String getLinename() {
  103 + return linename;
  104 + }
  105 +
  106 + public void setLinename(String linename) {
  107 + this.linename = linename;
  108 + }
  109 +
  110 + public String getSsgsdm() {
  111 + return ssgsdm;
  112 + }
  113 +
  114 + public void setSsgsdm(String ssgsdm) {
  115 + this.ssgsdm = ssgsdm;
  116 + }
  117 +
  118 + public String getFgsdm() {
  119 + return fgsdm;
  120 + }
  121 +
  122 + public void setFgsdm(String fgsdm) {
  123 + this.fgsdm = fgsdm;
  124 + }
  125 +
  126 + public String getNbbm() {
  127 + return nbbm;
  128 + }
  129 +
  130 + public void setNbbm(String nbbm) {
  131 + this.nbbm = nbbm;
  132 + }
  133 +
  134 + public String getJsy() {
  135 + return jsy;
  136 + }
  137 +
  138 + public void setJsy(String jsy) {
  139 + this.jsy = jsy;
  140 + }
  141 +
  142 + public Double getCzlc() {
  143 + return czlc;
  144 + }
  145 +
  146 + public void setCzlc(Double czlc) {
  147 + this.czlc = czlc;
  148 + }
  149 +
  150 + public Double getJzlc() {
  151 + return jzlc;
  152 + }
  153 +
  154 + public void setJzlc(Double jzlc) {
  155 + this.jzlc = jzlc;
  156 + }
  157 +
  158 + public Double getCzcd() {
  159 + return czcd;
  160 + }
  161 +
  162 + public void setCzcd(Double czcd) {
  163 + this.czcd = czcd;
  164 + }
  165 +
  166 + public Double getJzcd() {
  167 + return jzcd;
  168 + }
  169 +
  170 + public void setJzcd(Double jzcd) {
  171 + this.jzcd = jzcd;
  172 + }
  173 +
  174 + public Double getCdl() {
  175 + return cdl;
  176 + }
  177 +
  178 + public void setCdl(Double cdl) {
  179 + this.cdl = cdl;
  180 + }
  181 +
  182 + public int getSfkt() {
  183 + return sfkt;
  184 + }
  185 +
  186 + public void setSfkt(int sfkt) {
  187 + this.sfkt = sfkt;
  188 + }
  189 +
  190 + public String getJhsj() {
  191 + return jhsj;
  192 + }
  193 +
  194 + public void setJhsj(String jhsj) {
  195 + this.jhsj = jhsj;
  196 + }
  197 +
  198 + public Double getHd() {
  199 + return hd;
  200 + }
  201 +
  202 + public void setHd(Double hd) {
  203 + this.hd = hd;
  204 + }
  205 +
  206 + public Double getSh() {
  207 + return sh;
  208 + }
  209 +
  210 + public void setSh(Double sh) {
  211 + this.sh = sh;
  212 + }
  213 +
  214 + public String getShyy() {
  215 + return shyy;
  216 + }
  217 +
  218 + public void setShyy(String shyy) {
  219 + this.shyy = shyy;
  220 + }
  221 +
  222 + public Double getZlc() {
  223 + return zlc;
  224 + }
  225 +
  226 + public void setZlc(Double zlc) {
  227 + this.zlc = zlc;
  228 + }
  229 +
  230 + public int getYhlx() {
  231 + return yhlx;
  232 + }
  233 +
  234 + public void setYhlx(int yhlx) {
  235 + this.yhlx = yhlx;
  236 + }
  237 +
  238 + public Double getNs() {
  239 + return ns;
  240 + }
  241 +
  242 + public void setNs(Double ns) {
  243 + this.ns = ns;
  244 + }
  245 +
  246 + public Double getFyylc() {
  247 + return fyylc;
  248 + }
  249 +
  250 + public void setFyylc(Double fyylc) {
  251 + this.fyylc = fyylc;
  252 + }
  253 +
  254 + public Double getJhzlc() {
  255 + return jhzlc;
  256 + }
  257 +
  258 + public void setJhzlc(Double jhzlc) {
  259 + this.jhzlc = jhzlc;
  260 + }
  261 +
  262 + public Double getJhfyylc() {
  263 + return jhfyylc;
  264 + }
  265 +
  266 + public void setJhfyylc(Double jhfyylc) {
  267 + this.jhfyylc = jhfyylc;
  268 + }
  269 +
  270 + public int getJhzbc() {
  271 + return jhzbc;
  272 + }
  273 +
  274 + public void setJhzbc(int jhzbc) {
  275 + this.jhzbc = jhzbc;
  276 + }
  277 +
  278 + public int getJhbc() {
  279 + return jhbc;
  280 + }
  281 +
  282 + public void setJhbc(int jhbc) {
  283 + this.jhbc = jhbc;
  284 + }
  285 +
  286 + public int getSjzbc() {
  287 + return sjzbc;
  288 + }
  289 +
  290 + public void setSjzbc(int sjzbc) {
  291 + this.sjzbc = sjzbc;
  292 + }
  293 +
  294 + public int getSjbc() {
  295 + return sjbc;
  296 + }
  297 +
  298 + public void setSjbc(int sjbc) {
  299 + this.sjbc = sjbc;
  300 + }
  301 +
  302 + public String getEdituser() {
  303 + return edituser;
  304 + }
  305 +
  306 + public void setEdituser(String edituser) {
  307 + this.edituser = edituser;
  308 + }
  309 +
  310 + public Date getEdittime() {
  311 + return edittime;
  312 + }
  313 +
  314 + public void setEdittime(Date edittime) {
  315 + this.edittime = edittime;
  316 + }
  317 +
  318 + public Date getCreatetime() {
  319 + return createtime;
  320 + }
  321 +
  322 + public void setCreatetime(Date createtime) {
  323 + this.createtime = createtime;
  324 + }
  325 +
  326 + public int getNylx() {
  327 + return nylx;
  328 + }
  329 +
  330 + public void setNylx(int nylx) {
  331 + this.nylx = nylx;
  332 + }
  333 +
  334 + public int getJcsx() {
  335 + return jcsx;
  336 + }
  337 +
  338 + public void setJcsx(int jcsx) {
  339 + this.jcsx = jcsx;
  340 + }
  341 +
  342 + public String getBglyh() {
  343 + if(this.getZlc()==0){
  344 + return "0";
  345 + }else{
  346 + DecimalFormat df = new DecimalFormat("0.000");
  347 + return df.format(this.getHd()/this.getZlc()*100);
  348 + }
  349 + }
  350 +
  351 + public void setBglyh(String bglyh) {
  352 + this.bglyh = bglyh;
  353 + }
  354 +
  355 + public String getXlname() {
  356 + return BasicData.lineCodeAllNameMap.get(this.xlbm);
  357 + }
  358 +
  359 + public void setXlname(String xlname) {
  360 + this.xlname = xlname;
  361 + }
  362 +
  363 + public String getGsname() {
  364 + return BasicData.businessCodeNameMap.get(this.ssgsdm);
  365 + }
  366 +
  367 + public void setGsname(String gsname) {
  368 + this.gsname = gsname;
  369 + }
  370 +
  371 + public String getName() {
  372 + return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);
  373 + }
  374 +
  375 + public void setName(String name) {
  376 + this.name = name;
  377 + }
  378 +
  379 + public String getFgsname() {
  380 + return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
  381 + }
  382 +
  383 + public void setFgsname(String fgsname) {
  384 + this.fgsname = fgsname;
  385 + }
  386 +
  387 + public Date getUpdatetime() {
  388 + return updatetime;
  389 + }
  390 +
  391 + public void setUpdatetime(Date updatetime) {
  392 + this.updatetime = updatetime;
  393 + }
  394 +
  395 + public String getLp() {
  396 + return lp;
  397 + }
  398 +
  399 + public void setLp(String lp) {
  400 + this.lp = lp;
  401 + }
  402 +
  403 + public String getJname() {
  404 + return jname;
  405 + }
  406 +
  407 + public void setJname(String jname) {
  408 + this.jname = jname;
  409 + }
  410 +
  411 +
  412 +
  413 +}
src/main/java/com/bsth/entity/oil/Lsylb.java
  View file @b5dba7c
1 -package com.bsth.entity.oil;  
2 -  
3 -import java.text.DecimalFormat;  
4 -import java.util.Date;  
5 -  
6 -import javax.persistence.*;  
7 -  
8 -import org.springframework.format.annotation.DateTimeFormat;  
9 -  
10 -import com.bsth.data.BasicData;  
11 -  
12 -@Entity  
13 -@Table(name = "bsth_ls_ylb")  
14 -public class Lsylb {  
15 - @Id  
16 - @GeneratedValue(strategy = GenerationType.IDENTITY)  
17 - private Integer id;  
18 - @DateTimeFormat(pattern="yyyy-MM-dd")  
19 - private Date rq;  
20 - private String xlbm;  
21 - private String ssgsdm;  
22 - private String fgsdm;  
23 - private String nbbm;  
24 - private String jsy;  
25 - private Double czlc=0.0;  
26 - private Double jzlc=0.0;  
27 - private Double czyl=0.0;  
28 - private Double jzyl=0.0;  
29 - private Double jzl=0.0;  
30 - private int sfkt;  
31 - private String jhsj;  
32 - private Double yh=0.0;  
33 - private Double sh=0.0;  
34 - private String shyy;  
35 - private Double zlc=0.0;  
36 - private int yhlx;  
37 - private String rylx="0";  
38 - private Double ns=0.0;  
39 - private Double fyylc=0.0;  
40 - private Double jhzlc=0.0;  
41 - private Double jhfyylc=0.0;  
42 - private int jhzbc;  
43 - private int jhbc;  
44 - private int sjzbc;  
45 - private int sjbc;  
46 - private String edituser;  
47 - private Date edittime;  
48 - private Date createtime;  
49 -  
50 - private int nylx;  
51 -  
52 - @Transient  
53 - private String bglyh;  
54 -  
55 - @Transient  
56 - private String xlname;  
57 -  
58 - @Transient  
59 - private String gsname;  
60 -  
61 - @Transient  
62 - private String fgsname;  
63 -  
64 - @Transient  
65 - private String name;  
66 -  
67 - public Integer getId() {  
68 - return id;  
69 - }  
70 -  
71 - public void setId(Integer id) {  
72 - this.id = id;  
73 - }  
74 - public Date getRq() {  
75 - return rq;  
76 - }  
77 -  
78 - public void setRq(Date rq) {  
79 - this.rq = rq;  
80 - }  
81 -  
82 - public String getXlbm() {  
83 - return xlbm;  
84 - }  
85 -  
86 - public void setXlbm(String xlbm) {  
87 - this.xlbm = xlbm;  
88 - }  
89 - public String getSsgsdm() {  
90 - return ssgsdm;  
91 - }  
92 - public void setSsgsdm(String ssgsdm) {  
93 - this.ssgsdm = ssgsdm;  
94 - }  
95 - public String getFgsdm() {  
96 - return fgsdm;  
97 - }  
98 - public void setFgsdm(String fgsdm) {  
99 - this.fgsdm = fgsdm;  
100 - }  
101 - public String getNbbm() {  
102 - return nbbm;  
103 - }  
104 - public void setNbbm(String nbbm) {  
105 - this.nbbm = nbbm;  
106 - }  
107 - public String getJsy() {  
108 - return jsy;  
109 - }  
110 - public void setJsy(String jsy) {  
111 - this.jsy = jsy;  
112 - }  
113 - public Double getCzlc() {  
114 - return czlc;  
115 - }  
116 - public void setCzlc(Double czlc) {  
117 - this.czlc = czlc;  
118 - }  
119 - public Double getJzlc() {  
120 - return jzlc;  
121 - }  
122 - public void setJzlc(Double jzlc) {  
123 - this.jzlc = jzlc;  
124 - }  
125 - public Double getCzyl() {  
126 - return czyl;  
127 - }  
128 - public void setCzyl(Double czyl) {  
129 - this.czyl = czyl;  
130 - }  
131 - public Double getJzyl() {  
132 - return jzyl;  
133 - }  
134 - public void setJzyl(Double jzyl) {  
135 - this.jzyl = jzyl;  
136 - }  
137 - public Double getJzl() {  
138 - return jzl;  
139 - }  
140 - public void setJzl(Double jzl) {  
141 - this.jzl = jzl;  
142 - }  
143 - public int getSfkt() {  
144 - return sfkt;  
145 - }  
146 - public void setSfkt(int sfkt) {  
147 - this.sfkt = sfkt;  
148 - }  
149 - public String getJhsj() {  
150 - return jhsj;  
151 - }  
152 - public void setJhsj(String jhsj) {  
153 - this.jhsj = jhsj;  
154 - }  
155 - public Double getYh() {  
156 - return yh;  
157 - }  
158 - public void setYh(Double yh) {  
159 - this.yh = yh;  
160 - }  
161 - public Double getSh() {  
162 - return sh;  
163 - }  
164 - public void setSh(Double sh) {  
165 - this.sh = sh;  
166 - }  
167 - public String getShyy() {  
168 - return shyy;  
169 - }  
170 - public void setShyy(String shyy) {  
171 - this.shyy = shyy;  
172 - }  
173 - public Double getZlc() {  
174 - return zlc;  
175 - }  
176 - public void setZlc(Double zlc) {  
177 - this.zlc = zlc;  
178 - }  
179 - public int getYhlx() {  
180 - return yhlx;  
181 - }  
182 - public void setYhlx(int yhlx) {  
183 - this.yhlx = yhlx;  
184 - }  
185 - public String getRylx() {  
186 - return rylx;  
187 - }  
188 - public void setRylx(String rylx) {  
189 - this.rylx = rylx;  
190 - }  
191 - public Double getNs() {  
192 - return ns;  
193 - }  
194 - public void setNs(Double ns) {  
195 - this.ns = ns;  
196 - }  
197 - public Double getFyylc() {  
198 - return fyylc;  
199 - }  
200 - public void setFyylc(Double fyylc) {  
201 - this.fyylc = fyylc;  
202 - }  
203 - public Double getJhzlc() {  
204 - return jhzlc;  
205 - }  
206 - public void setJhzlc(Double jhzlc) {  
207 - this.jhzlc = jhzlc;  
208 - }  
209 - public Double getJhfyylc() {  
210 - return jhfyylc;  
211 - }  
212 - public void setJhfyylc(Double jhfyylc) {  
213 - this.jhfyylc = jhfyylc;  
214 - }  
215 - public int getJhzbc() {  
216 - return jhzbc;  
217 - }  
218 - public void setJhzbc(int jhzbc) {  
219 - this.jhzbc = jhzbc;  
220 - }  
221 - public int getJhbc() {  
222 - return jhbc;  
223 - }  
224 - public void setJhbc(int jhbc) {  
225 - this.jhbc = jhbc;  
226 - }  
227 - public int getSjzbc() {  
228 - return sjzbc;  
229 - }  
230 - public void setSjzbc(int sjzbc) {  
231 - this.sjzbc = sjzbc;  
232 - }  
233 - public int getSjbc() {  
234 - return sjbc;  
235 - }  
236 - public void setSjbc(int sjbc) {  
237 - this.sjbc = sjbc;  
238 - }  
239 - public String getEdituser() {  
240 - return edituser;  
241 - }  
242 - public void setEdituser(String edituser) {  
243 - this.edituser = edituser;  
244 - }  
245 - public Date getEdittime() {  
246 - return edittime;  
247 - }  
248 - public void setEdittime(Date edittime) {  
249 - this.edittime = edittime;  
250 - }  
251 - public Date getCreatetime() {  
252 - return createtime;  
253 - }  
254 - public void setCreatetime(Date createtime) {  
255 - this.createtime = createtime;  
256 - }  
257 - public int getNylx() {  
258 - return nylx;  
259 - }  
260 - public void setNylx(int nylx) {  
261 - this.nylx = nylx;  
262 - }  
263 -  
264 - public String getBglyh() {  
265 - if(this.getZlc()==0){  
266 - return "0";  
267 - }else{  
268 - DecimalFormat df = new DecimalFormat("0.00");  
269 - return df.format(this.getYh()/this.getZlc()*100);  
270 - }  
271 - }  
272 -  
273 - public void setBglyh(String bglyh) {  
274 - this.bglyh = bglyh;  
275 - }  
276 -  
277 - public String getXlname() {  
278 - return BasicData.lineCode2NameMap.get(this.xlbm);  
279 - }  
280 -  
281 - public void setXlname(String xlname) {  
282 - this.xlname = xlname;  
283 - }  
284 -  
285 - public String getGsname() {  
286 - return BasicData.businessCodeNameMap.get(this.ssgsdm);  
287 - }  
288 -  
289 - public void setGsname(String gsname) {  
290 - this.gsname = gsname;  
291 - }  
292 -  
293 -  
294 - public String getFgsname() {  
295 - return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);  
296 - }  
297 -  
298 - public void setFgsname(String fgsname) {  
299 - this.fgsname = fgsname;  
300 - }  
301 -  
302 - public String getName() {  
303 - return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);  
304 - }  
305 -  
306 - public void setName(String name) {  
307 - this.name = name;  
308 - }  
309 -  
310 -  
311 -} 1 +package com.bsth.entity.oil;
  2 +
  3 +import java.text.DecimalFormat;
  4 +import java.util.Date;
  5 +
  6 +import javax.persistence.*;
  7 +
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import com.bsth.data.BasicData;
  11 +
  12 +@Entity
  13 +@Table(name = "bsth_ls_ylb")
  14 +public class Lsylb {
  15 + @Id
  16 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  17 + private Integer id;
  18 + @DateTimeFormat(pattern="yyyy-MM-dd")
  19 + private Date rq;
  20 + private String xlbm;
  21 + private String ssgsdm;
  22 + private String fgsdm;
  23 + private String nbbm;
  24 + private String jsy;
  25 + private Double czlc=0.0;
  26 + private Double jzlc=0.0;
  27 + private Double czyl=0.0;
  28 + private Double jzyl=0.0;
  29 + private Double jzl=0.0;
  30 + private int sfkt;
  31 + private String jhsj;
  32 + private Double yh=0.0;
  33 + private Double sh=0.0;
  34 + private String shyy;
  35 + private Double zlc=0.0;
  36 + private int yhlx;
  37 + private String rylx="0";
  38 + private Double ns=0.0;
  39 + private Double fyylc=0.0;
  40 + private Double jhzlc=0.0;
  41 + private Double jhfyylc=0.0;
  42 + private int jhzbc;
  43 + private int jhbc;
  44 + private int sjzbc;
  45 + private int sjbc;
  46 + private String edituser;
  47 + private Date edittime;
  48 + private Date createtime;
  49 +
  50 + private int nylx;
  51 +
  52 + @Transient
  53 + private String bglyh;
  54 +
  55 + @Transient
  56 + private String xlname;
  57 +
  58 + @Transient
  59 + private String gsname;
  60 +
  61 + @Transient
  62 + private String fgsname;
  63 +
  64 + @Transient
  65 + private String name;
  66 +
  67 + public Integer getId() {
  68 + return id;
  69 + }
  70 +
  71 + public void setId(Integer id) {
  72 + this.id = id;
  73 + }
  74 + public Date getRq() {
  75 + return rq;
  76 + }
  77 +
  78 + public void setRq(Date rq) {
  79 + this.rq = rq;
  80 + }
  81 +
  82 + public String getXlbm() {
  83 + return xlbm;
  84 + }
  85 +
  86 + public void setXlbm(String xlbm) {
  87 + this.xlbm = xlbm;
  88 + }
  89 + public String getSsgsdm() {
  90 + return ssgsdm;
  91 + }
  92 + public void setSsgsdm(String ssgsdm) {
  93 + this.ssgsdm = ssgsdm;
  94 + }
  95 + public String getFgsdm() {
  96 + return fgsdm;
  97 + }
  98 + public void setFgsdm(String fgsdm) {
  99 + this.fgsdm = fgsdm;
  100 + }
  101 + public String getNbbm() {
  102 + return nbbm;
  103 + }
  104 + public void setNbbm(String nbbm) {
  105 + this.nbbm = nbbm;
  106 + }
  107 + public String getJsy() {
  108 + return jsy;
  109 + }
  110 + public void setJsy(String jsy) {
  111 + this.jsy = jsy;
  112 + }
  113 + public Double getCzlc() {
  114 + return czlc;
  115 + }
  116 + public void setCzlc(Double czlc) {
  117 + this.czlc = czlc;
  118 + }
  119 + public Double getJzlc() {
  120 + return jzlc;
  121 + }
  122 + public void setJzlc(Double jzlc) {
  123 + this.jzlc = jzlc;
  124 + }
  125 + public Double getCzyl() {
  126 + return czyl;
  127 + }
  128 + public void setCzyl(Double czyl) {
  129 + this.czyl = czyl;
  130 + }
  131 + public Double getJzyl() {
  132 + return jzyl;
  133 + }
  134 + public void setJzyl(Double jzyl) {
  135 + this.jzyl = jzyl;
  136 + }
  137 + public Double getJzl() {
  138 + return jzl;
  139 + }
  140 + public void setJzl(Double jzl) {
  141 + this.jzl = jzl;
  142 + }
  143 + public int getSfkt() {
  144 + return sfkt;
  145 + }
  146 + public void setSfkt(int sfkt) {
  147 + this.sfkt = sfkt;
  148 + }
  149 + public String getJhsj() {
  150 + return jhsj;
  151 + }
  152 + public void setJhsj(String jhsj) {
  153 + this.jhsj = jhsj;
  154 + }
  155 + public Double getYh() {
  156 + return yh;
  157 + }
  158 + public void setYh(Double yh) {
  159 + this.yh = yh;
  160 + }
  161 + public Double getSh() {
  162 + return sh;
  163 + }
  164 + public void setSh(Double sh) {
  165 + this.sh = sh;
  166 + }
  167 + public String getShyy() {
  168 + return shyy;
  169 + }
  170 + public void setShyy(String shyy) {
  171 + this.shyy = shyy;
  172 + }
  173 + public Double getZlc() {
  174 + return zlc;
  175 + }
  176 + public void setZlc(Double zlc) {
  177 + this.zlc = zlc;
  178 + }
  179 + public int getYhlx() {
  180 + return yhlx;
  181 + }
  182 + public void setYhlx(int yhlx) {
  183 + this.yhlx = yhlx;
  184 + }
  185 + public String getRylx() {
  186 + return rylx;
  187 + }
  188 + public void setRylx(String rylx) {
  189 + this.rylx = rylx;
  190 + }
  191 + public Double getNs() {
  192 + return ns;
  193 + }
  194 + public void setNs(Double ns) {
  195 + this.ns = ns;
  196 + }
  197 + public Double getFyylc() {
  198 + return fyylc;
  199 + }
  200 + public void setFyylc(Double fyylc) {
  201 + this.fyylc = fyylc;
  202 + }
  203 + public Double getJhzlc() {
  204 + return jhzlc;
  205 + }
  206 + public void setJhzlc(Double jhzlc) {
  207 + this.jhzlc = jhzlc;
  208 + }
  209 + public Double getJhfyylc() {
  210 + return jhfyylc;
  211 + }
  212 + public void setJhfyylc(Double jhfyylc) {
  213 + this.jhfyylc = jhfyylc;
  214 + }
  215 + public int getJhzbc() {
  216 + return jhzbc;
  217 + }
  218 + public void setJhzbc(int jhzbc) {
  219 + this.jhzbc = jhzbc;
  220 + }
  221 + public int getJhbc() {
  222 + return jhbc;
  223 + }
  224 + public void setJhbc(int jhbc) {
  225 + this.jhbc = jhbc;
  226 + }
  227 + public int getSjzbc() {
  228 + return sjzbc;
  229 + }
  230 + public void setSjzbc(int sjzbc) {
  231 + this.sjzbc = sjzbc;
  232 + }
  233 + public int getSjbc() {
  234 + return sjbc;
  235 + }
  236 + public void setSjbc(int sjbc) {
  237 + this.sjbc = sjbc;
  238 + }
  239 + public String getEdituser() {
  240 + return edituser;
  241 + }
  242 + public void setEdituser(String edituser) {
  243 + this.edituser = edituser;
  244 + }
  245 + public Date getEdittime() {
  246 + return edittime;
  247 + }
  248 + public void setEdittime(Date edittime) {
  249 + this.edittime = edittime;
  250 + }
  251 + public Date getCreatetime() {
  252 + return createtime;
  253 + }
  254 + public void setCreatetime(Date createtime) {
  255 + this.createtime = createtime;
  256 + }
  257 + public int getNylx() {
  258 + return nylx;
  259 + }
  260 + public void setNylx(int nylx) {
  261 + this.nylx = nylx;
  262 + }
  263 +
  264 + public String getBglyh() {
  265 + if(this.getZlc()==0){
  266 + return "0";
  267 + }else{
  268 + DecimalFormat df = new DecimalFormat("0.000");
  269 + return df.format(this.getYh()/this.getZlc()*100);
  270 + }
  271 + }
  272 +
  273 + public void setBglyh(String bglyh) {
  274 + this.bglyh = bglyh;
  275 + }
  276 +
  277 + public String getXlname() {
  278 + return BasicData.lineCode2NameMap.get(this.xlbm);
  279 + }
  280 +
  281 + public void setXlname(String xlname) {
  282 + this.xlname = xlname;
  283 + }
  284 +
  285 + public String getGsname() {
  286 + return BasicData.businessCodeNameMap.get(this.ssgsdm);
  287 + }
  288 +
  289 + public void setGsname(String gsname) {
  290 + this.gsname = gsname;
  291 + }
  292 +
  293 +
  294 + public String getFgsname() {
  295 + return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
  296 + }
  297 +
  298 + public void setFgsname(String fgsname) {
  299 + this.fgsname = fgsname;
  300 + }
  301 +
  302 + public String getName() {
  303 + return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);
  304 + }
  305 +
  306 + public void setName(String name) {
  307 + this.name = name;
  308 + }
  309 +
  310 +
  311 +}
src/main/java/com/bsth/entity/oil/Ylb.java
  View file @b5dba7c
1 -package com.bsth.entity.oil;  
2 -  
3 -import java.text.DecimalFormat;  
4 -import java.util.Date;  
5 -  
6 -import javax.persistence.*;  
7 -  
8 -import org.springframework.format.annotation.DateTimeFormat;  
9 -  
10 -import com.bsth.data.BasicData;  
11 -  
12 -@Entity  
13 -@Table(name = "bsth_c_ylb")  
14 -public class Ylb {  
15 - @Id  
16 - @GeneratedValue(strategy = GenerationType.IDENTITY)  
17 - private Integer id;  
18 - @DateTimeFormat(pattern="yyyy-MM-dd")  
19 - private Date rq;  
20 - private String xlbm;  
21 - private String linename;  
22 - private String ssgsdm;  
23 - private String fgsdm;  
24 - private String nbbm;  
25 - private String jsy;  
26 - private String jname;  
27 - private Double czlc=0.0;  
28 - private Double jzlc=0.0;  
29 - private Double czyl=0.0;  
30 - private Double jzyl=0.0;  
31 - private Double jzl=0.0;  
32 - private int sfkt;  
33 - private String jhsj;  
34 - private Double yh=0.0;  
35 - private Double sh=0.0;  
36 - private String shyy;  
37 - private Double zlc=0.0;  
38 - private int yhlx;  
39 - private String rylx="0";  
40 - private Double ns=0.0;  
41 - private Double fyylc=0.0;  
42 - private Double jhzlc=0.0;  
43 - private Double jhfyylc=0.0;  
44 - private int jhzbc;  
45 - private int jhbc;  
46 - private int sjzbc;  
47 - private int sjbc;  
48 - private String edituser;  
49 - private Date edittime;  
50 - private Date updatetime;  
51 - private Date createtime;  
52 -  
53 - private int nylx;  
54 - //进场顺序（根据最先出场和最后进场来关联车辆的存油量）  
55 - private int jcsx;  
56 -  
57 - private String lp;  
58 - @Transient  
59 - private String bglyh;  
60 -  
61 - @Transient  
62 - private String xlname;  
63 -  
64 - @Transient  
65 - private String gsname;  
66 -  
67 - @Transient  
68 - private String fgsname;  
69 -  
70 - @Transient  
71 - private String name;  
72 -  
73 - public Integer getId() {  
74 - return id;  
75 - }  
76 -  
77 - public void setId(Integer id) {  
78 - this.id = id;  
79 - }  
80 - public Date getRq() {  
81 - return rq;  
82 - }  
83 -  
84 - public void setRq(Date rq) {  
85 - this.rq = rq;  
86 - }  
87 -  
88 - public String getXlbm() {  
89 - return xlbm;  
90 - }  
91 -  
92 - public void setXlbm(String xlbm) {  
93 - this.xlbm = xlbm;  
94 - }  
95 -  
96 - public String getLinename() {  
97 - return linename;  
98 - }  
99 -  
100 - public void setLinename(String linename) {  
101 - this.linename = linename;  
102 - }  
103 -  
104 - public String getSsgsdm() {  
105 - return ssgsdm;  
106 - }  
107 - public void setSsgsdm(String ssgsdm) {  
108 - this.ssgsdm = ssgsdm;  
109 - }  
110 - public String getFgsdm() {  
111 - return fgsdm;  
112 - }  
113 - public void setFgsdm(String fgsdm) {  
114 - this.fgsdm = fgsdm;  
115 - }  
116 - public String getNbbm() {  
117 - return nbbm;  
118 - }  
119 - public void setNbbm(String nbbm) {  
120 - this.nbbm = nbbm;  
121 - }  
122 - public String getJsy() {  
123 - return jsy;  
124 - }  
125 - public void setJsy(String jsy) {  
126 - this.jsy = jsy;  
127 - }  
128 - public Double getCzlc() {  
129 - return czlc;  
130 - }  
131 - public void setCzlc(Double czlc) {  
132 - this.czlc = czlc;  
133 - }  
134 - public Double getJzlc() {  
135 - return jzlc;  
136 - }  
137 - public void setJzlc(Double jzlc) {  
138 - this.jzlc = jzlc;  
139 - }  
140 - public Double getCzyl() {  
141 - return czyl;  
142 - }  
143 - public void setCzyl(Double czyl) {  
144 - this.czyl = czyl;  
145 - }  
146 - public Double getJzyl() {  
147 - return jzyl;  
148 - }  
149 - public void setJzyl(Double jzyl) {  
150 - this.jzyl = jzyl;  
151 - }  
152 - public Double getJzl() {  
153 - return jzl;  
154 - }  
155 - public void setJzl(Double jzl) {  
156 - this.jzl = jzl;  
157 - }  
158 - public int getSfkt() {  
159 - return sfkt;  
160 - }  
161 - public void setSfkt(int sfkt) {  
162 - this.sfkt = sfkt;  
163 - }  
164 - public String getJhsj() {  
165 - return jhsj;  
166 - }  
167 - public void setJhsj(String jhsj) {  
168 - this.jhsj = jhsj;  
169 - }  
170 - public Double getYh() {  
171 - return yh;  
172 - }  
173 - public void setYh(Double yh) {  
174 - this.yh = yh;  
175 - }  
176 - public Double getSh() {  
177 - return sh;  
178 - }  
179 - public void setSh(Double sh) {  
180 - this.sh = sh;  
181 - }  
182 - public String getShyy() {  
183 - return shyy;  
184 - }  
185 - public void setShyy(String shyy) {  
186 - this.shyy = shyy;  
187 - }  
188 - public Double getZlc() {  
189 - return zlc;  
190 - }  
191 - public void setZlc(Double zlc) {  
192 - this.zlc = zlc;  
193 - }  
194 - public int getYhlx() {  
195 - return yhlx;  
196 - }  
197 - public void setYhlx(int yhlx) {  
198 - this.yhlx = yhlx;  
199 - }  
200 - public String getRylx() {  
201 - return rylx;  
202 - }  
203 - public void setRylx(String rylx) {  
204 - this.rylx = rylx;  
205 - }  
206 - public Double getNs() {  
207 - return ns;  
208 - }  
209 - public void setNs(Double ns) {  
210 - this.ns = ns;  
211 - }  
212 - public Double getFyylc() {  
213 - return fyylc;  
214 - }  
215 - public void setFyylc(Double fyylc) {  
216 - this.fyylc = fyylc;  
217 - }  
218 - public Double getJhzlc() {  
219 - return jhzlc;  
220 - }  
221 - public void setJhzlc(Double jhzlc) {  
222 - this.jhzlc = jhzlc;  
223 - }  
224 - public Double getJhfyylc() {  
225 - return jhfyylc;  
226 - }  
227 - public void setJhfyylc(Double jhfyylc) {  
228 - this.jhfyylc = jhfyylc;  
229 - }  
230 - public int getJhzbc() {  
231 - return jhzbc;  
232 - }  
233 - public void setJhzbc(int jhzbc) {  
234 - this.jhzbc = jhzbc;  
235 - }  
236 - public int getJhbc() {  
237 - return jhbc;  
238 - }  
239 - public void setJhbc(int jhbc) {  
240 - this.jhbc = jhbc;  
241 - }  
242 - public int getSjzbc() {  
243 - return sjzbc;  
244 - }  
245 - public void setSjzbc(int sjzbc) {  
246 - this.sjzbc = sjzbc;  
247 - }  
248 - public int getSjbc() {  
249 - return sjbc;  
250 - }  
251 - public void setSjbc(int sjbc) {  
252 - this.sjbc = sjbc;  
253 - }  
254 - public String getEdituser() {  
255 - return edituser;  
256 - }  
257 - public void setEdituser(String edituser) {  
258 - this.edituser = edituser;  
259 - }  
260 - public Date getEdittime() {  
261 - return edittime;  
262 - }  
263 - public void setEdittime(Date edittime) {  
264 - this.edittime = edittime;  
265 - }  
266 - public Date getCreatetime() {  
267 - return createtime;  
268 - }  
269 - public void setCreatetime(Date createtime) {  
270 - this.createtime = createtime;  
271 - }  
272 - public int getNylx() {  
273 - return nylx;  
274 - }  
275 - public void setNylx(int nylx) {  
276 - this.nylx = nylx;  
277 - }  
278 -  
279 - public int getJcsx(){  
280 - return jcsx;  
281 - }  
282 -  
283 - public void setJcsx(int jcsx){  
284 - this.jcsx=jcsx;  
285 - }  
286 -  
287 - public String getBglyh() {  
288 - if(this.getZlc()==0){  
289 - return "0";  
290 - }else{  
291 - DecimalFormat df = new DecimalFormat("0.00");  
292 - return df.format(this.getYh()/this.getZlc()*100);  
293 - }  
294 - }  
295 -  
296 - public void setBglyh(String bglyh) {  
297 - this.bglyh = bglyh;  
298 - }  
299 -  
300 - public String getXlname() {  
301 - return BasicData.lineCodeAllNameMap.get(this.xlbm);  
302 - }  
303 -  
304 - public void setXlname(String xlname) {  
305 - this.xlname = xlname;  
306 - }  
307 -  
308 - public String getGsname() {  
309 - return BasicData.businessCodeNameMap.get(this.ssgsdm);  
310 - }  
311 -  
312 - public void setGsname(String gsname) {  
313 - this.gsname = gsname;  
314 - }  
315 -  
316 -  
317 - public String getFgsname() {  
318 - return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);  
319 - }  
320 -  
321 - public void setFgsname(String fgsname) {  
322 - this.fgsname = fgsname;  
323 - }  
324 -  
325 - public String getName() {  
326 - return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);  
327 - }  
328 -  
329 - public void setName(String name) {  
330 - this.name = name;  
331 - }  
332 -  
333 -  
334 - public Date getUpdatetime() {  
335 - return updatetime;  
336 - }  
337 -  
338 - public void setUpdatetime(Date updatetime) {  
339 - this.updatetime = updatetime;  
340 - }  
341 -  
342 - public String getLp() {  
343 - return lp;  
344 - }  
345 -  
346 - public void setLp(String lp) {  
347 - this.lp = lp;  
348 - }  
349 -  
350 - public String getJname() {  
351 - return jname;  
352 - }  
353 -  
354 - public void setJname(String jname) {  
355 - this.jname = jname;  
356 - }  
357 -  
358 -  
359 -} 1 +package com.bsth.entity.oil;
  2 +
  3 +import java.text.DecimalFormat;
  4 +import java.util.Date;
  5 +
  6 +import javax.persistence.*;
  7 +
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import com.bsth.data.BasicData;
  11 +
  12 +@Entity
  13 +@Table(name = "bsth_c_ylb")
  14 +public class Ylb {
  15 + @Id
  16 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  17 + private Integer id;
  18 + @DateTimeFormat(pattern="yyyy-MM-dd")
  19 + private Date rq;
  20 + private String xlbm;
  21 + private String linename;
  22 + private String ssgsdm;
  23 + private String fgsdm;
  24 + private String nbbm;
  25 + private String jsy;
  26 + private String jname;
  27 + private Double czlc=0.0;
  28 + private Double jzlc=0.0;
  29 + private Double czyl=0.0;
  30 + private Double jzyl=0.0;
  31 + private Double jzl=0.0;
  32 + private int sfkt;
  33 + private String jhsj;
  34 + private Double yh=0.0;
  35 + private Double sh=0.0;
  36 + private String shyy;
  37 + private Double zlc=0.0;
  38 + private int yhlx;
  39 + private String rylx="0";
  40 + private Double ns=0.0;
  41 + private Double fyylc=0.0;
  42 + private Double jhzlc=0.0;
  43 + private Double jhfyylc=0.0;
  44 + private int jhzbc;
  45 + private int jhbc;
  46 + private int sjzbc;
  47 + private int sjbc;
  48 + private String edituser;
  49 + private Date edittime;
  50 + private Date updatetime;
  51 + private Date createtime;
  52 +
  53 + private int nylx;
  54 + //进场顺序（根据最先出场和最后进场来关联车辆的存油量）
  55 + private int jcsx;
  56 +
  57 + private String lp;
  58 + @Transient
  59 + private String bglyh;
  60 +
  61 + @Transient
  62 + private String xlname;
  63 +
  64 + @Transient
  65 + private String gsname;
  66 +
  67 + @Transient
  68 + private String fgsname;
  69 +
  70 + @Transient
  71 + private String name;
  72 +
  73 + public Integer getId() {
  74 + return id;
  75 + }
  76 +
  77 + public void setId(Integer id) {
  78 + this.id = id;
  79 + }
  80 + public Date getRq() {
  81 + return rq;
  82 + }
  83 +
  84 + public void setRq(Date rq) {
  85 + this.rq = rq;
  86 + }
  87 +
  88 + public String getXlbm() {
  89 + return xlbm;
  90 + }
  91 +
  92 + public void setXlbm(String xlbm) {
  93 + this.xlbm = xlbm;
  94 + }
  95 +
  96 + public String getLinename() {
  97 + return linename;
  98 + }
  99 +
  100 + public void setLinename(String linename) {
  101 + this.linename = linename;
  102 + }
  103 +
  104 + public String getSsgsdm() {
  105 + return ssgsdm;
  106 + }
  107 + public void setSsgsdm(String ssgsdm) {
  108 + this.ssgsdm = ssgsdm;
  109 + }
  110 + public String getFgsdm() {
  111 + return fgsdm;
  112 + }
  113 + public void setFgsdm(String fgsdm) {
  114 + this.fgsdm = fgsdm;
  115 + }
  116 + public String getNbbm() {
  117 + return nbbm;
  118 + }
  119 + public void setNbbm(String nbbm) {
  120 + this.nbbm = nbbm;
  121 + }
  122 + public String getJsy() {
  123 + return jsy;
  124 + }
  125 + public void setJsy(String jsy) {
  126 + this.jsy = jsy;
  127 + }
  128 + public Double getCzlc() {
  129 + return czlc;
  130 + }
  131 + public void setCzlc(Double czlc) {
  132 + this.czlc = czlc;
  133 + }
  134 + public Double getJzlc() {
  135 + return jzlc;
  136 + }
  137 + public void setJzlc(Double jzlc) {
  138 + this.jzlc = jzlc;
  139 + }
  140 + public Double getCzyl() {
  141 + return czyl;
  142 + }
  143 + public void setCzyl(Double czyl) {
  144 + this.czyl = czyl;
  145 + }
  146 + public Double getJzyl() {
  147 + return jzyl;
  148 + }
  149 + public void setJzyl(Double jzyl) {
  150 + this.jzyl = jzyl;
  151 + }
  152 + public Double getJzl() {
  153 + return jzl;
  154 + }
  155 + public void setJzl(Double jzl) {
  156 + this.jzl = jzl;
  157 + }
  158 + public int getSfkt() {
  159 + return sfkt;
  160 + }
  161 + public void setSfkt(int sfkt) {
  162 + this.sfkt = sfkt;
  163 + }
  164 + public String getJhsj() {
  165 + return jhsj;
  166 + }
  167 + public void setJhsj(String jhsj) {
  168 + this.jhsj = jhsj;
  169 + }
  170 + public Double getYh() {
  171 + return yh;
  172 + }
  173 + public void setYh(Double yh) {
  174 + this.yh = yh;
  175 + }
  176 + public Double getSh() {
  177 + return sh;
  178 + }
  179 + public void setSh(Double sh) {
  180 + this.sh = sh;
  181 + }
  182 + public String getShyy() {
  183 + return shyy;
  184 + }
  185 + public void setShyy(String shyy) {
  186 + this.shyy = shyy;
  187 + }
  188 + public Double getZlc() {
  189 + return zlc;
  190 + }
  191 + public void setZlc(Double zlc) {
  192 + this.zlc = zlc;
  193 + }
  194 + public int getYhlx() {
  195 + return yhlx;
  196 + }
  197 + public void setYhlx(int yhlx) {
  198 + this.yhlx = yhlx;
  199 + }
  200 + public String getRylx() {
  201 + return rylx;
  202 + }
  203 + public void setRylx(String rylx) {
  204 + this.rylx = rylx;
  205 + }
  206 + public Double getNs() {
  207 + return ns;
  208 + }
  209 + public void setNs(Double ns) {
  210 + this.ns = ns;
  211 + }
  212 + public Double getFyylc() {
  213 + return fyylc;
  214 + }
  215 + public void setFyylc(Double fyylc) {
  216 + this.fyylc = fyylc;
  217 + }
  218 + public Double getJhzlc() {
  219 + return jhzlc;
  220 + }
  221 + public void setJhzlc(Double jhzlc) {
  222 + this.jhzlc = jhzlc;
  223 + }
  224 + public Double getJhfyylc() {
  225 + return jhfyylc;
  226 + }
  227 + public void setJhfyylc(Double jhfyylc) {
  228 + this.jhfyylc = jhfyylc;
  229 + }
  230 + public int getJhzbc() {
  231 + return jhzbc;
  232 + }
  233 + public void setJhzbc(int jhzbc) {
  234 + this.jhzbc = jhzbc;
  235 + }
  236 + public int getJhbc() {
  237 + return jhbc;
  238 + }
  239 + public void setJhbc(int jhbc) {
  240 + this.jhbc = jhbc;
  241 + }
  242 + public int getSjzbc() {
  243 + return sjzbc;
  244 + }
  245 + public void setSjzbc(int sjzbc) {
  246 + this.sjzbc = sjzbc;
  247 + }
  248 + public int getSjbc() {
  249 + return sjbc;
  250 + }
  251 + public void setSjbc(int sjbc) {
  252 + this.sjbc = sjbc;
  253 + }
  254 + public String getEdituser() {
  255 + return edituser;
  256 + }
  257 + public void setEdituser(String edituser) {
  258 + this.edituser = edituser;
  259 + }
  260 + public Date getEdittime() {
  261 + return edittime;
  262 + }
  263 + public void setEdittime(Date edittime) {
  264 + this.edittime = edittime;
  265 + }
  266 + public Date getCreatetime() {
  267 + return createtime;
  268 + }
  269 + public void setCreatetime(Date createtime) {
  270 + this.createtime = createtime;
  271 + }
  272 + public int getNylx() {
  273 + return nylx;
  274 + }
  275 + public void setNylx(int nylx) {
  276 + this.nylx = nylx;
  277 + }
  278 +
  279 + public int getJcsx(){
  280 + return jcsx;
  281 + }
  282 +
  283 + public void setJcsx(int jcsx){
  284 + this.jcsx=jcsx;
  285 + }
  286 +
  287 + public String getBglyh() {
  288 + if(this.getZlc()==0){
  289 + return "0";
  290 + }else{
  291 + DecimalFormat df = new DecimalFormat("0.000");
  292 + return df.format(this.getYh()/this.getZlc()*100);
  293 + }
  294 + }
  295 +
  296 + public void setBglyh(String bglyh) {
  297 + this.bglyh = bglyh;
  298 + }
  299 +
  300 + public String getXlname() {
  301 + return BasicData.lineCodeAllNameMap.get(this.xlbm);
  302 + }
  303 +
  304 + public void setXlname(String xlname) {
  305 + this.xlname = xlname;
  306 + }
  307 +
  308 + public String getGsname() {
  309 + return BasicData.businessCodeNameMap.get(this.ssgsdm);
  310 + }
  311 +
  312 + public void setGsname(String gsname) {
  313 + this.gsname = gsname;
  314 + }
  315 +
  316 +
  317 + public String getFgsname() {
  318 + return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
  319 + }
  320 +
  321 + public void setFgsname(String fgsname) {
  322 + this.fgsname = fgsname;
  323 + }
  324 +
  325 + public String getName() {
  326 + return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);
  327 + }
  328 +
  329 + public void setName(String name) {
  330 + this.name = name;
  331 + }
  332 +
  333 +
  334 + public Date getUpdatetime() {
  335 + return updatetime;
  336 + }
  337 +
  338 + public void setUpdatetime(Date updatetime) {
  339 + this.updatetime = updatetime;
  340 + }
  341 +
  342 + public String getLp() {
  343 + return lp;
  344 + }
  345 +
  346 + public void setLp(String lp) {
  347 + this.lp = lp;
  348 + }
  349 +
  350 + public String getJname() {
  351 + return jname;
  352 + }
  353 +
  354 + public void setJname(String jname) {
  355 + this.jname = jname;
  356 + }
  357 +
  358 +
  359 +}
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
  View file @b5dba7c
@@ -2657,7 +2657,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer @@ -2657,7 +2657,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
2657 c.setBglyh(c.getBglyh()/c.getTs()); 2657 c.setBglyh(c.getBglyh()/c.getTs());
2658 // 把列合计的数添加到最后一个 2658 // 把列合计的数添加到最后一个
2659 cList.add(c); 2659 cList.add(c);
2660 - // DecimalFormat df = new DecimalFormat("0.00");//格式化小数  
2661 for (CalcWaybillDetail c1:cList) { 2660 for (CalcWaybillDetail c1:cList) {
2662 if(StringUtils.isEmpty(c1.getXl())) { 2661 if(StringUtils.isEmpty(c1.getXl())) {
2663 listStr.add(""); 2662 listStr.add("");
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @b5dba7c
@@ -4371,9 +4371,9 @@ public class ReportServiceImpl implements ReportService{ @@ -4371,9 +4371,9 @@ public class ReportServiceImpl implements ReportService{
4371 m.put("linename", arg0.getString("linename")); 4371 m.put("linename", arg0.getString("linename"));
4372 m.put("jname", arg0.getString("jname")); 4372 m.put("jname", arg0.getString("jname"));
4373 if(arg0.getDouble("zlc")==0){ 4373 if(arg0.getDouble("zlc")==0){
4374 - m.put("bglyh", "0.00"); 4374 + m.put("bglyh", "0.000");
4375 }else{ 4375 }else{
4376 - DecimalFormat df = new DecimalFormat("0.00"); 4376 + DecimalFormat df = new DecimalFormat("0.000");
4377 m.put("bglyh", df.format(arg0.getDouble("yh")/arg0.getDouble("zlc")*100)); 4377 m.put("bglyh", df.format(arg0.getDouble("yh")/arg0.getDouble("zlc")*100));
4378 } 4378 }
4379 m.put("gsName", BasicData.businessCodeNameMap.get(arg0.getString("ssgsdm"))); 4379 m.put("gsName", BasicData.businessCodeNameMap.get(arg0.getString("ssgsdm")));
@@ -4427,9 +4427,9 @@ public class ReportServiceImpl implements ReportService{ @@ -4427,9 +4427,9 @@ public class ReportServiceImpl implements ReportService{
4427 m.put("rylx", ""); 4427 m.put("rylx", "");
4428 m.put("ns", "0"); 4428 m.put("ns", "0");
4429 if(arg0.getDouble("zlc")==0){ 4429 if(arg0.getDouble("zlc")==0){
4430 - m.put("bglyh", "0.00"); 4430 + m.put("bglyh", "0.000");
4431 }else{ 4431 }else{
4432 - DecimalFormat df = new DecimalFormat("0.00"); 4432 + DecimalFormat df = new DecimalFormat("0.000");
4433 m.put("bglyh", df.format(arg0.getDouble("hd")/arg0.getDouble("zlc")*100)); 4433 m.put("bglyh", df.format(arg0.getDouble("hd")/arg0.getDouble("zlc")*100));
4434 } 4434 }
4435 m.put("gsName", BasicData.businessCodeNameMap.get(arg0.getString("ssgsdm"))); 4435 m.put("gsName", BasicData.businessCodeNameMap.get(arg0.getString("ssgsdm")));