潘钊 / bsth_control · Commits

Commit 952886fcb354a8ad1d989982b81f069fd3b2f0b9

Authored by 廖磊
1 parent 27c32c2e

油，电导出 0 去掉小数点

Inline Side-by-side
Showing 5 changed files with 20 additions and 20 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
  View file @952886f
... ... @@ -148,12 +148,12 @@ public class DlbController extends BaseController<Dlb, Integer>{
148 148 m.put("nbbm", y.getNbbm());
149 149 m.put("jsy", y.getJsy());
150 150 m.put("name", y.getName());
151   - m.put("cdl", y.getCdl());
152   - m.put("czcd", y.getCzcd()+"%");
153   - m.put("jzcd", y.getJzcd()+"%");
154   - m.put("czlc", y.getCzlc());
155   - m.put("jzlc", y.getJzlc());
156   - m.put("hd", y.getHd());
  151 + m.put("cdl", y.getCdl()<=0?"0":y.getCdl());
  152 + m.put("czcd", y.getCzcd()<=0?"0":y.getCzcd()+"%");
  153 + m.put("jzcd", y.getJzcd()<=0?"0":y.getJzcd()+"%");
  154 + m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
  155 + m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
  156 + m.put("hd", y.getHd()<=0?"0":y.getHd());
157 157 String shyy ="无";
158 158 if(y.getShyy()!=null){
159 159 if(shyy.equals("1")){shyy="票务用油";}
... ... @@ -166,10 +166,10 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
166 166 else if(shyy.equals("8")){shyy="车间(小修)";}
167 167 else{shyy ="无";}
168 168 }
169   - m.put("ns", y.getNs());
  169 + m.put("ns", y.getNs()<=0?"0":y.getNs());
170 170 m.put("shyy", shyy);
171   - m.put("sh", y.getSh());
172   - m.put("zlc", y.getZlc());
  171 + m.put("sh", y.getSh()<=0?"0":y.getSh());
  172 + m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
173 173 m.put("rdlx", "");
174 174 m.put("bglyh", y.getBglyh());
175 175 resList.add(m);
... ...
src/main/java/com/bsth/controller/oil/YlbController.java
  View file @952886f
... ... @@ -236,19 +236,19 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
236 236 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
237 237 for (Ylb y : ylb) {
238 238 Map<String, Object> m = new HashMap<String, Object>();
239   - m.put("rq", y.getRq());
  239 + m.put("rq", sdfMonth.format(y.getRq()));
240 240 m.put("gsname",y.getGsname() );
241 241 m.put("fgsname", y.getFgsname());
242 242 m.put("xlname", y.getXlname()==null?"":y.getXlname());
243 243 m.put("nbbm", y.getNbbm());
244 244 m.put("jsy", y.getJsy());
245 245 m.put("name", y.getName());
246   - m.put("jzl", y.getJzl());
247   - m.put("czlc", y.getCzlc());
248   - m.put("jzlc", y.getJzlc());
249   - m.put("czyl", y.getCzyl());
250   - m.put("jzyl", y.getJzyl());
251   - m.put("yh", y.getYh());
  246 + m.put("jzl", y.getJzl()<=0?"0":y.getJzl());
  247 + m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
  248 + m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
  249 + m.put("czyl", y.getCzyl()<=0?"0":y.getCzyl());
  250 + m.put("jzyl", y.getJzyl()<=0?"0":y.getJzyl());
  251 + m.put("yh", y.getYh()<=0?"0":y.getYh());
252 252 String rylx="";
253 253 if(y.getRylx()!=null){
254 254 if(y.getRylx().equals("0")){rylx="0号柴油";}
... ... @@ -270,8 +270,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
270 270 else{shyy ="无";}
271 271 }
272 272 m.put("shyy", shyy);
273   - m.put("sh", y.getSh());
274   - m.put("zlc", y.getZlc());
  273 + m.put("sh", y.getSh()<=0?"0":y.getSh());
  274 + m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
275 275 m.put("bglyh", y.getBglyh());
276 276 resList.add(m);
277 277 }
... ...
src/main/java/com/bsth/entity/oil/Dlb.java
  View file @952886f
... ... @@ -332,7 +332,7 @@ public class Dlb {
332 332  
333 333 public String getBglyh() {
334 334 if(this.getZlc()==0){
335   - return "0.00";
  335 + return "0";
336 336 }else{
337 337 DecimalFormat df = new DecimalFormat("0.00");
338 338 return df.format(this.getHd()/this.getZlc()*100);
... ...
src/main/java/com/bsth/entity/oil/Ylb.java
  View file @952886f
... ... @@ -278,7 +278,7 @@ public class Ylb {
278 278  
279 279 public String getBglyh() {
280 280 if(this.getZlc()==0){
281   - return "0.00";
  281 + return "0";
282 282 }else{
283 283 DecimalFormat df = new DecimalFormat("0.00");
284 284 return df.format(this.getYh()/this.getZlc()*100);
... ...
src/main/resources/static/pages/forms/mould/list.xls
View file @952886f
No preview for this file type