git-svn-id: https://192.168.57.71/svn/jsgkj@1352 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hzttltj/hzttltj.jsp

@@ -45,8 +45,6 @@
 	            categories: eval(name)
 	        }],
 	        yAxis: [{ // Primary yAxis
-	        	min:-20,
-	        	max:50,
 	            labels: {
 	                formatter: function() {
 	                    return this.value +'%';
@@ -65,7 +63,6 @@
 
 	        }, { // Secondary yAxis
 	        	min:0,
-	        	max:100,
 	            gridLineWidth: 0,
 	            title: {
 	                text: '吞吐量',
@@ -83,8 +80,6 @@
 	            }
 
 	        }, { // Tertiary yAxis
-	        	min:-20,
-	        	max:50,
 	            gridLineWidth: 0,
 	            title: {
 	                text: '环比增长率',
@@ -105,15 +100,6 @@
 	        tooltip: {
 	            shared: true
 	        },
-	        legend: {
-	            layout: 'vertical',
-	            align: 'left',
-	            x: 120,
-	            verticalAlign: 'top',
-	            y: 80,
-	            floating: true,
-	            backgroundColor: '#FFFFFF'
-	        },
 	        series: [{
 	            name: '吞吐量',
 	            color: '#4572A7',

gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hzttltj/jzxttltj.jsp

@@ -48,8 +48,6 @@
 	            categories: eval(name)
 	        }],
 	        yAxis: [{ // Primary yAxis
-	        	min:-20,
-	        	max:50,
 	            labels: {
 	                formatter: function() {
 	                    return this.value +'%';
@@ -79,7 +77,6 @@
 
 	        }, { // Secondary yAxis
 	        	min:0,
-	        	max:100,
 	            gridLineWidth: 0,
 	            title: {
 	                text: '吞吐量',
@@ -89,7 +86,7 @@
 	            },
 	            labels: {
 	                formatter: function() {
-	                    return this.value +' 万吨';
+	                    return this.value +' 吨';
 	                },
 	                style: {
 	                    color: '#4572A7'
@@ -97,8 +94,6 @@
 	            }
 
 	        }, { // Tertiary yAxis
-	        	min:-20,
-	        	max:50,
 	            gridLineWidth: 0,
 	            title: {
 	                text: '环比增长率',
@@ -119,15 +114,6 @@
 	        tooltip: {
 	            shared: true
 	        },
-	        legend: {
-	            layout: 'vertical',
-	            align: 'left',
-	            x: 120,
-	            verticalAlign: 'top',
-	            y: 80,
-	            floating: true,
-	            backgroundColor: '#FFFFFF'
-	        },
 	        series: [{
 	            name: '吞吐量',
 	            color: '#4572A7',

gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hzttltj/jzxxltj.jsp

@@ -44,9 +44,6 @@
 	            categories: eval(name)
 	        }],
 	        yAxis: [{ // Secondary yAxis
-	        	min:0,
-	        	max:100,
-	            gridLineWidth: 0,
 	            title: {
 	                text: '箱数',
 	                style: {
@@ -63,9 +60,6 @@
 	            }
 
 	        }, { // Tertiary yAxis
-	        	min:0,
-	        	max:500,
-	            gridLineWidth: 0,
 	            title: {
 	                text: '空箱占比率',
 	                style: {

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/ctl/HzttltjCtl.java

@@ -167,7 +167,7 @@ public class HzttltjCtl extends BaseWebCtl {
 						if (hbhzttl != null) {
 							c = (BigDecimal) hbhzttl[id];
 							BigDecimal b4 = a.subtract(c);
-							b4 = b4.divide(a, 0, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));
+							b4 = b4.divide(c, 4, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));
 							vo.setHb(b4.toString());
 
 						} else {
@@ -178,7 +178,7 @@ public class HzttltjCtl extends BaseWebCtl {
 						if (tbhzttl != null) {
 							b = (BigDecimal) tbhzttl[id];
 							BigDecimal b3 = a.subtract(b);
-							b3=b3.divide(a, 0, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));
+							b3=b3.divide(b, 4, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));
 							vo.setTb(b3.toString());
 						} else {
 							vo.setTb("0");

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/ctl/JzxttltjCtl.java

@@ -71,15 +71,20 @@ public class JzxttltjCtl extends BaseWebCtl {
 					BigDecimal c = new BigDecimal(0.0000);
 					HzttlVo vo = new HzttlVo();
 					vo.setTjmonth(month);
-					vo.setTtl(e[id].toString());
-					a = (BigDecimal) e[id];
+					if(e[id] != null && !"".equals(e[id])){
+						vo.setTtl(e[id].toString());
+						a = (BigDecimal) e[id];
+					}else{
+						vo.setTtl("0");
+					}
+					
 					if (a.compareTo(new BigDecimal(0)) > 0) {
 						// 环比
 						Object[] hbhzttl = (Object[]) jzxttltjService.findBytjmonth(ymonth);
 						if (hbhzttl != null) {
 							c = (BigDecimal) hbhzttl[id];
 							BigDecimal b4 = a.subtract(c);
-							b4 = b4.divide(a, 0, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));
+							b4 = b4.divide(c, 4, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));
 							vo.setHb(b4.toString());
 
 						} else {
@@ -90,7 +95,7 @@ public class JzxttltjCtl extends BaseWebCtl {
 						if (tbhzttl != null) {
 							b = (BigDecimal) tbhzttl[id];
 							BigDecimal b3 = a.subtract(b);
-							b3=b3.divide(a, 0, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));
+							b3=b3.divide(b, 4, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));
 							vo.setTb(b3.toString());
 						} else {
 							vo.setTb("0");

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/ctl/JzxxltjCtl.java

@@ -69,7 +69,7 @@ public class JzxxltjCtl extends BaseWebCtl {
 					vo.setZxxl(d.toString());
 
 					if (a.compareTo(new BigDecimal(0)) > 0) {
-						c = b.divide(a, 0, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));
+						c = b.divide(a, 4, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));
 						vo.setZbl(c.toString());
 					} else {
 						vo.setZbl("0");

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/dao/HzttlDao.java

@@ -10,10 +10,10 @@ import com.xtframe.sec.common.SecRepository;
 public interface HzttlDao extends SecRepository<HzttlEntity, String> {
 
 	
-	@Query(value = "select * from  GK_SHARE_JSJY_GY_FHLTTL where tj_month = ?1", nativeQuery = true)
+	@Query(value = "select * from  GK_SHARE_JSJY_HJ_FHLTTL_MV where tj_month = ?1", nativeQuery = true)
 	Object findBytjmonth(String tjmonth);
 	
 	
-	@Query(value = "select * from  GK_SHARE_JSJY_GY_FHLTTL where tj_month >= ?1 and tj_month <= ?2", nativeQuery = true)
+	@Query(value = "select * from  GK_SHARE_JSJY_HJ_FHLTTL_MV where tj_month >= ?1 and tj_month <= ?2 order by tj_month", nativeQuery = true)
 	List<Object> findBytjmonth(String smonth,String emonth);
 }

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/dao/JzxttltjDao.java

@@ -10,10 +10,10 @@ import com.xtframe.sec.common.SecRepository;
 public interface JzxttltjDao extends SecRepository<JzxttlhjEntity, String> {
 
 	
-	@Query(value = "select * from  GK_SHARE_JSJY_HJ_JZXTTL where tj_month = ?1", nativeQuery = true)
+	@Query(value = "select * from  GK_SHARE_JSJY_HJ_JZXTTL_V where tj_month = ?1", nativeQuery = true)
 	Object findBytjmonth(String tjmonth);
 	
 	
-	@Query(value = "select * from  GK_SHARE_JSJY_HJ_JZXTTL where tj_month >= ?1 and tj_month <= ?2", nativeQuery = true)
+	@Query(value = "select * from  GK_SHARE_JSJY_HJ_JZXTTL_V where tj_month >= ?1 and tj_month <= ?2 order by tj_month", nativeQuery = true)
 	List<Object> findBytjmonth(String smonth,String emonth);
 }