Browse Source

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

ld_jiangxf 8 years ago
parent
commit
7bc2d5ba1d

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

@@ -89,11 +89,11 @@ public class GyhzttlfxCtl extends BaseWebCtl {
 						month = 12;
 					} else {
 						month = month - 1;
-						if (month < 10) {
-							temp = gyttlfxService.findOne(year + "-0" + month);
-						} else {
-							temp = gyttlfxService.findOne(year + "-" + month);
-						}
+					}
+					if (month < 10) {
+						temp = gyttlfxService.findOne(year + "-0" + month);
+					} else {
+						temp = gyttlfxService.findOne(year + "-" + month);
 					}
 					if (temp == null || entityList.get(i).getGK03010202000100020000000000() == 0) {
 						bl.add("0");
@@ -119,11 +119,11 @@ public class GyhzttlfxCtl extends BaseWebCtl {
 						month = 12;
 					} else {
 						month = month - 1;
-						if (month < 10) {
-							temp = gyttlfxService.findOne(year + "-0" + month);
-						} else {
-							temp = gyttlfxService.findOne(year + "-" + month);
-						}
+					}
+					if (month < 10) {
+						temp = gyttlfxService.findOne(year + "-0" + month);
+					} else {
+						temp = gyttlfxService.findOne(year + "-" + month);
 					}
 					if (temp == null || entityList.get(1).getGK03010202000100020000000000() == 0) {
 						bl.add("0");
@@ -215,11 +215,11 @@ public class GyhzttlfxCtl extends BaseWebCtl {
 						month = 12;
 					} else {
 						month = month - 1;
-						if (month < 10) {
-							temp = hzttlfxService.findOne(year + "-0" + month);
-						} else {
-							temp = hzttlfxService.findOne(year + "-" + month);
-						}
+					}
+					if (month < 10) {
+						temp = hzttlfxService.findOne(year + "-0" + month);
+					} else {
+						temp = hzttlfxService.findOne(year + "-" + month);
 					}
 					if (temp == null || hz == 0) {
 						bl.add("0");
@@ -247,11 +247,11 @@ public class GyhzttlfxCtl extends BaseWebCtl {
 						month = 12;
 					} else {
 						month = month - 1;
-						if (month < 10) {
-							temp = hzttlfxService.findOne(year + "-0" + month);
-						} else {
-							temp = hzttlfxService.findOne(year + "-" + month);
-						}
+					}
+					if (month < 10) {
+						temp = hzttlfxService.findOne(year + "-0" + month);
+					} else {
+						temp = hzttlfxService.findOne(year + "-" + month);
 					}
 					if (temp == null || hz == 0) {
 						bl.add("0");

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

@@ -94,11 +94,11 @@ public class HwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null || entityList.get(i).getGK03010202000000000000000000() == 0) {
 							bl.add("0");
@@ -125,11 +125,11 @@ public class HwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null) {
 							bl.add("0");
@@ -181,11 +181,11 @@ public class HwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null || entityList.get(i).getGK03010202000010000000000000() == 0) {
 							bl.add("0");
@@ -212,11 +212,11 @@ public class HwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null) {
 							bl.add("0");
@@ -268,11 +268,11 @@ public class HwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null || entityList.get(i).getGK03010202000020000000000000() == 0) {
 							bl.add("0");
@@ -299,11 +299,11 @@ public class HwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null) {
 							bl.add("0");

+ 31 - 30
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/ctl/WmhwttlfxCtl.java

@@ -93,11 +93,11 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null || entityList.get(i).getGK03010202000001000000000000() == 0) {
 							bl.add("0");
@@ -124,11 +124,11 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null) {
 							bl.add("0");
@@ -175,11 +175,11 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null || entityList.get(i).getGK03010202000021000000000000() == 0) {
 							bl.add("0");
@@ -206,11 +206,11 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null) {
 							bl.add("0");
@@ -257,11 +257,12 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+							
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null || entityList.get(i).getGK03010202000011000000000000() == 0) {
 							bl.add("0");
@@ -288,11 +289,11 @@ public class WmhwttlfxCtl extends BaseWebCtl {
 							month = 12;
 						} else {
 							month = month - 1;
-							if (month < 10) {
-								temp = hwttlfxService.findOne(year + "-0" + month);
-							} else {
-								temp = hwttlfxService.findOne(year + "-" + month);
-							}
+						}
+						if (month < 10) {
+							temp = hwttlfxService.findOne(year + "-0" + month);
+						} else {
+							temp = hwttlfxService.findOne(year + "-" + month);
 						}
 						if (temp == null) {
 							bl.add("0");