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

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

@@ -72,7 +72,7 @@ public class GyhzttlfxCtl extends BaseWebCtl {
 				} else {
 					temp = gyttlfxService.findOne(year + "-" + month);
 				}
-				if (temp == null || e.getGK03010202000100020000000000() == 0) {
+				if (temp == null || e.getGK03010202000100020000000000() == 0 || temp.getGK03010202000100020000000000() == 0) {
 					bl.add("0");
 				} else {
 					bl.add("" + (int) ((e.getGK03010202000100020000000000() - temp.getGK03010202000100020000000000()) / temp.getGK03010202000100020000000000() * 100));
@@ -125,7 +125,7 @@ public class GyhzttlfxCtl extends BaseWebCtl {
 					} else {
 						temp = gyttlfxService.findOne(year + "-" + month);
 					}
-					if (temp == null || entityList.get(1).getGK03010202000100020000000000() == 0) {
+					if (temp == null || entityList.get(1).getGK03010202000100020000000000() == 0 || temp.getGK03010202000100020000000000() == 0) {
 						bl.add("0");
 					} else {
 						bl.add("" + (int) ((entityList.get(i).getGK03010202000100020000000000() - temp.getGK03010202000100020000000000()) / temp.getGK03010202000100020000000000() * 100));
@@ -133,7 +133,7 @@ public class GyhzttlfxCtl extends BaseWebCtl {
 				} else {
 					if (entityList.get(i - 1).getGK03010202000100020000000000() == 0 && entityList.get(i).getGK03010202000100020000000000() != 0) {
 						bl.add("100");
-					} else if (entityList.get(i).getGK03010202000100020000000000() == 0) {
+					} else if (entityList.get(i).getGK03010202000100020000000000() == 0 || entityList.get(i - 1).getGK03010202000100020000000000() == 0) {
 						bl.add("0");
 					} else {
 						bl.add("" + (int) ((entityList.get(i).getGK03010202000100020000000000() - entityList.get(i - 1).getGK03010202000100020000000000()) / entityList.get(i - 1).getGK03010202000100020000000000() * 100));
@@ -197,7 +197,7 @@ public class GyhzttlfxCtl extends BaseWebCtl {
 					temp = hzttlfxService.findOne(year + "-" + month);
 				}
 				double hz = e.getGK03010202000200020000000000() - e.getGK03010202000200020000000000();
-				if (temp == null || hz == 0) {
+				if (temp == null || hz == 0 || (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000() == 0)) {
 					bl.add("0");
 				} else {
 					bl.add("" + (int) ((hz - (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000())) / (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000()) * 100));
@@ -227,10 +227,10 @@ public class GyhzttlfxCtl extends BaseWebCtl {
 						bl.add("" + (int) ((hz - (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000())) / hz * 100));
 					}
 				} else {
-					if (hz == 0) {
+					double hzqn = entityList.get(i - 1).getGK03010202000200020000000000() - entityList.get(i - 1).getGK03010202000200020000000000();
+					if (hz == 0 || hzqn == 0) {
 						bl.add("0");
 					} else {
-						double hzqn = entityList.get(i - 1).getGK03010202000200020000000000() - entityList.get(i - 1).getGK03010202000200020000000000();
 						bl.add("" + (int) ((hz - hzqn) / hzqn * 100));
 					}
 				}
@@ -253,7 +253,7 @@ public class GyhzttlfxCtl extends BaseWebCtl {
 					} else {
 						temp = hzttlfxService.findOne(year + "-" + month);
 					}
-					if (temp == null || hz == 0) {
+					if (temp == null || hz == 0 || (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000() == 0)) {
 						bl.add("0");
 					} else {
 						bl.add("" + (int) ((hz - (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000())) / (temp.getGK03010202000200020000000000() - temp.getGK03010202000200020000000000()) * 100));

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

@@ -76,7 +76,7 @@ public class HwttlfxCtl extends BaseWebCtl {
 					} else {
 						temp = hwttlfxService.findOne(year + "-" + month);
 					}
-					if (temp == null || e.getGK03010202000000000000000000() == 0) {
+					if (temp == null || e.getGK03010202000000000000000000() == 0 || temp.getGK03010202000000000000000000() == 0) {
 						bl.add("0");
 					} else {
 						bl.add("" + (int) ((e.getGK03010202000000000000000000() - temp.getGK03010202000000000000000000()) / temp.getGK03010202000000000000000000() * 100));
@@ -139,7 +139,7 @@ public class HwttlfxCtl extends BaseWebCtl {
 					} else {
 						if (entityList.get(i - 1).getGK03010202000000000000000000() == 0 && entityList.get(i).getGK03010202000000000000000000() != 0) {
 							bl.add("100");
-						} else if (entityList.get(i).getGK03010202000000000000000000() == 0) {
+						} else if (entityList.get(i).getGK03010202000000000000000000() == 0 || entityList.get(i - 1).getGK03010202000000000000000000() == 0) {
 							bl.add("0");
 						} else {
 							bl.add("" + (int) ((entityList.get(i).getGK03010202000000000000000000() - entityList.get(i - 1).getGK03010202000000000000000000()) / entityList.get(i - 1).getGK03010202000000000000000000() * 100));
@@ -163,7 +163,7 @@ public class HwttlfxCtl extends BaseWebCtl {
 					} else {
 						temp = hwttlfxService.findOne(year + "-" + month);
 					}
-					if (temp == null || e.getGK03010202000010000000000000() == 0) {
+					if (temp == null || e.getGK03010202000010000000000000() == 0 || temp.getGK03010202000010000000000000() == 0) {
 						bl.add("0");
 					} else {
 						bl.add("" + (int) ((e.getGK03010202000010000000000000() - temp.getGK03010202000010000000000000()) / temp.getGK03010202000010000000000000() * 100));
@@ -218,7 +218,7 @@ public class HwttlfxCtl extends BaseWebCtl {
 						} else {
 							temp = hwttlfxService.findOne(year + "-" + month);
 						}
-						if (temp == null) {
+						if (temp == null || temp.getGK03010202000010000000000000() == 0) {
 							bl.add("0");
 						} else {
 							bl.add("" + (int) ((entityList.get(i).getGK03010202000010000000000000() - temp.getGK03010202000010000000000000()) / temp.getGK03010202000010000000000000() * 100));
@@ -226,7 +226,7 @@ public class HwttlfxCtl extends BaseWebCtl {
 					} else {
 						if (entityList.get(i).getGK03010202000010000000000000() != 0 && entityList.get(i - 1).getGK03010202000010000000000000() == 0) {
 							bl.add("100");
-						} else if (entityList.get(i).getGK03010202000010000000000000() == 0) {
+						} else if (entityList.get(i).getGK03010202000010000000000000() == 0 || entityList.get(i - 1).getGK03010202000010000000000000() == 0) {
 							bl.add("0");
 						} else {
 							bl.add("" + (int) ((entityList.get(i).getGK03010202000010000000000000() - entityList.get(i - 1).getGK03010202000010000000000000()) / entityList.get(i - 1).getGK03010202000010000000000000() * 100));
@@ -250,7 +250,7 @@ public class HwttlfxCtl extends BaseWebCtl {
 					} else {
 						temp = hwttlfxService.findOne(year + "-" + month);
 					}
-					if (temp == null || e.getGK03010202000020000000000000() == 0) {
+					if (temp == null || e.getGK03010202000020000000000000() == 0 || temp.getGK03010202000020000000000000() == 0) {
 						bl.add("0");
 					} else {
 						bl.add("" + (int) ((e.getGK03010202000020000000000000() - temp.getGK03010202000020000000000000()) / temp.getGK03010202000020000000000000() * 100));
@@ -305,7 +305,7 @@ public class HwttlfxCtl extends BaseWebCtl {
 						} else {
 							temp = hwttlfxService.findOne(year + "-" + month);
 						}
-						if (temp == null) {
+						if (temp == null || temp.getGK03010202000020000000000000() == 0) {
 							bl.add("0");
 						} else {
 							bl.add("" + (int) ((entityList.get(i).getGK03010202000020000000000000() - temp.getGK03010202000020000000000000()) / temp.getGK03010202000020000000000000() * 100));
@@ -313,7 +313,7 @@ public class HwttlfxCtl extends BaseWebCtl {
 					} else {
 						if (entityList.get(i).getGK03010202000020000000000000() != 0 && entityList.get(i - 1).getGK03010202000020000000000000() == 0) {
 							bl.add("100");
-						} else if (entityList.get(i).getGK03010202000020000000000000() == 0) {
+						} else if (entityList.get(i).getGK03010202000020000000000000() == 0 || entityList.get(i - 1).getGK03010202000020000000000000() == 0) {
 							bl.add("0");
 						} else {
 							bl.add("" + (int) ((entityList.get(i).getGK03010202000020000000000000() - entityList.get(i - 1).getGK03010202000020000000000000()) / entityList.get(i - 1).getGK03010202000020000000000000() * 100));

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

@@ -75,7 +75,7 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 					} else {
 						temp = hwttlfxService.findOne(year + "-" + month);
 					}
-					if (temp == null || e.getGK03010202000001000000000000() == 0) {
+					if (temp == null || e.getGK03010202000001000000000000() == 0 || temp.getGK03010202000001000000000000() == 0) {
 						bl.add("0");
 					} else {
 						bl.add("" + (int) ((e.getGK03010202000001000000000000() - temp.getGK03010202000001000000000000()) / temp.getGK03010202000001000000000000() * 100));
@@ -130,7 +130,7 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 						} else {
 							temp = hwttlfxService.findOne(year + "-" + month);
 						}
-						if (temp == null) {
+						if (temp == null || temp.getGK03010202000001000000000000() == 0) {
 							bl.add("0");
 						} else {
 							bl.add("" + (int) ((entityList.get(i).getGK03010202000001000000000000() - temp.getGK03010202000001000000000000()) / temp.getGK03010202000001000000000000() * 100));
@@ -138,7 +138,7 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 					} else {
 						if (entityList.get(i - 1).getGK03010202000001000000000000() == 0 && entityList.get(i).getGK03010202000001000000000000() != 0) {
 							bl.add("100");
-						} else if (entityList.get(i).getGK03010202000001000000000000() == 0) {
+						} else if (entityList.get(i).getGK03010202000001000000000000() == 0 || entityList.get(i - 1).getGK03010202000001000000000000() == 0) {
 							bl.add("0");
 						} else {
 							bl.add("" + (int) ((entityList.get(i).getGK03010202000001000000000000() - entityList.get(i - 1).getGK03010202000001000000000000()) / entityList.get(i - 1).getGK03010202000001000000000000() * 100));
@@ -156,8 +156,13 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 					date = e.gettj_month().split("-");
 					year = Integer.parseInt(date[0]) - 1;
 					month = Integer.parseInt(date[1]);
-					FlhwttlhjEntity temp = hwttlfxService.findOne(year + "-" + month);
-					if (temp == null || e.getGK03010202000021000000000000() == 0) {
+					FlhwttlhjEntity temp = null;
+					if(month < 10){
+						temp = hwttlfxService.findOne(year + "-0" + month);
+					}else{
+						temp = hwttlfxService.findOne(year + "-" + month);
+					}
+					if (temp == null || e.getGK03010202000021000000000000() == 0 || temp.getGK03010202000021000000000000() == 0) {
 						bl.add("0");
 					} else {
 						bl.add("" + (int) ((e.getGK03010202000021000000000000() - temp.getGK03010202000021000000000000()) / temp.getGK03010202000021000000000000() * 100));
@@ -212,7 +217,7 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 						} else {
 							temp = hwttlfxService.findOne(year + "-" + month);
 						}
-						if (temp == null) {
+						if (temp == null || temp.getGK03010202000021000000000000() == 0) {
 							bl.add("0");
 						} else {
 							bl.add("" + (int) ((entityList.get(i).getGK03010202000021000000000000() - temp.getGK03010202000021000000000000()) / temp.getGK03010202000021000000000000() * 100));
@@ -220,7 +225,7 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 					} else {
 						if (entityList.get(i - 1).getGK03010202000021000000000000() == 0 && entityList.get(i).getGK03010202000021000000000000() != 0) {
 							bl.add("100");
-						} else if (entityList.get(i).getGK03010202000021000000000000() == 0) {
+						} else if (entityList.get(i).getGK03010202000021000000000000() == 0 || entityList.get(i - 1).getGK03010202000021000000000000() == 0) {
 							bl.add("0");
 						} else {
 							bl.add("" + (int) ((entityList.get(i).getGK03010202000021000000000000() - entityList.get(i - 1).getGK03010202000021000000000000()) / entityList.get(i - 1).getGK03010202000021000000000000() * 100));
@@ -238,8 +243,13 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 					date = e.gettj_month().split("-");
 					year = Integer.parseInt(date[0]) - 1;
 					month = Integer.parseInt(date[1]);
-					FlhwttlhjEntity temp = hwttlfxService.findOne(year + "-" + month);
-					if (temp == null || e.getGK03010202000011000000000000() == 0) {
+					FlhwttlhjEntity temp = null;
+					if(month < 10){
+						temp = hwttlfxService.findOne(year + "-0" + month);
+					}else{
+						temp = hwttlfxService.findOne(year + "-" + month);
+					}
+					if (temp == null || e.getGK03010202000011000000000000() == 0 || temp.getGK03010202000011000000000000() == 0) {
 						bl.add("0");
 					} else {
 						bl.add("" + (int) ((e.getGK03010202000011000000000000() - temp.getGK03010202000011000000000000()) / temp.getGK03010202000011000000000000() * 100));
@@ -257,7 +267,6 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							
 						}
 						if (month < 10) {
 							temp = hwttlfxService.findOne(year + "-0" + month);
@@ -295,7 +304,7 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 						} else {
 							temp = hwttlfxService.findOne(year + "-" + month);
 						}
-						if (temp == null) {
+						if (temp == null || temp.getGK03010202000011000000000000() == 0) {
 							bl.add("0");
 						} else {
 							bl.add("" + (int) ((entityList.get(i).getGK03010202000011000000000000() - temp.getGK03010202000011000000000000()) / temp.getGK03010202000011000000000000() * 100));
@@ -303,7 +312,7 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 					} else {
 						if (entityList.get(i - 1).getGK03010202000011000000000000() == 0 && entityList.get(i).getGK03010202000011000000000000() != 0) {
 							bl.add("100");
-						} else if (entityList.get(i).getGK03010202000011000000000000() == 0) {
+						} else if (entityList.get(i).getGK03010202000011000000000000() == 0 || entityList.get(i - 1).getGK03010202000011000000000000() == 0) {
 							bl.add("0");
 						} else {
 							bl.add("" + (int) ((entityList.get(i).getGK03010202000011000000000000() - entityList.get(i - 1).getGK03010202000011000000000000()) / entityList.get(i - 1).getGK03010202000011000000000000() * 100));