油，电导出 0 去掉小数点

廖磊
1 parent 27c32c2e
Showing 5 changed files with 20 additions and 20 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/entity/oil/Dlb.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/resources/static/pages/forms/mould/list.xls
@@ -148,12 +148,12 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
-			m.put("cdl", y.getCdl());
-			m.put("czcd", y.getCzcd()+"%");
-			m.put("jzcd", y.getJzcd()+"%");
-			m.put("czlc", y.getCzlc());
-			m.put("jzlc", y.getJzlc());
-			m.put("hd", y.getHd());
+			m.put("cdl", y.getCdl()<=0?"0":y.getCdl());
+			m.put("czcd", y.getCzcd()<=0?"0":y.getCzcd()+"%");
+			m.put("jzcd", y.getJzcd()<=0?"0":y.getJzcd()+"%");
+			m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
+			m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
+			m.put("hd", y.getHd()<=0?"0":y.getHd());
 			String shyy ="无";
 			if(y.getShyy()!=null){
 				 if(shyy.equals("1")){shyy="票务用油";}
@@ -166,10 +166,10 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 				 else if(shyy.equals("8")){shyy="车间(小修)";}
 				 else{shyy ="无";}
 			}
-			m.put("ns", y.getNs());
+			m.put("ns", y.getNs()<=0?"0":y.getNs());
 			m.put("shyy", shyy);
-			m.put("sh", y.getSh());
-			m.put("zlc", y.getZlc());
+			m.put("sh", y.getSh()<=0?"0":y.getSh());
+			m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
 			m.put("rdlx", "");
 			m.put("bglyh", y.getBglyh());
 			resList.add(m);
@@ -236,19 +236,19 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		List<Map<String, Object>>  resList = new ArrayList<Map<String, Object>>();
 		for (Ylb y : ylb) {
 			Map<String, Object> m = new HashMap<String, Object>();
-			m.put("rq", y.getRq());
+			m.put("rq", sdfMonth.format(y.getRq()));
 			m.put("gsname",y.getGsname() );
 			m.put("fgsname", y.getFgsname());
 			m.put("xlname", y.getXlname()==null?"":y.getXlname());
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
-			m.put("jzl", y.getJzl());
-			m.put("czlc", y.getCzlc());
-			m.put("jzlc", y.getJzlc());
-			m.put("czyl", y.getCzyl());
-			m.put("jzyl", y.getJzyl());
-			m.put("yh", y.getYh());
+			m.put("jzl", y.getJzl()<=0?"0":y.getJzl());
+			m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
+			m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
+			m.put("czyl", y.getCzyl()<=0?"0":y.getCzyl());
+			m.put("jzyl", y.getJzyl()<=0?"0":y.getJzyl());
+			m.put("yh", y.getYh()<=0?"0":y.getYh());
 			String rylx="";
 			if(y.getRylx()!=null){
 				if(y.getRylx().equals("0")){rylx="0号柴油";}
@@ -270,8 +270,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 				 else{shyy ="无";}
 			}
 			m.put("shyy", shyy);
-			m.put("sh", y.getSh());
-			m.put("zlc", y.getZlc());
+			m.put("sh", y.getSh()<=0?"0":y.getSh());
+			m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
 			m.put("bglyh", y.getBglyh());
 			resList.add(m);
 		}
@@ -332,7 +332,7 @@ public class Dlb {
 	public String getBglyh() {
 		if(this.getZlc()==0){
-			return "0.00";
+			return "0";
 		}else{
 			DecimalFormat df = new DecimalFormat("0.00");
 			return df.format(this.getHd()/this.getZlc()*100);
@@ -278,7 +278,7 @@ public class Ylb {
 	public String getBglyh() {
 		if(this.getZlc()==0){
-			return "0.00";
+			return "0";
 		}else{
 			DecimalFormat df = new DecimalFormat("0.00");
 			return df.format(this.getYh()/this.getZlc()*100);