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

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/dcttltj/ctl/DcttltjCtl.java

@@ -62,7 +62,7 @@ public class DcttltjCtl extends BaseWebCtl {
 			if(StringUtils.isNotEmpty(szgqid)||StringUtils.isNotEmpty(szgkid)){
 				List<Object> dcttltjlist = dcsbService.tongjicityValue(startDate == null ? sdf.format(beginTime) : sdf.format(startDate), 
 						endDate == null ? sdf.format(endTime) : sdf.format(endDate),
-								nwmid == null ? "" : nwmid,dydlid == null ? "" : dydlid,szdid==null?"":szdid,szgkid==null?"":szgkid,szgqid==null?"":szgqid,jcgid==null?"":jcgid,dedlid==null?"":dedlid,qyxzid==null?"":qyxzid,fwlxid==null?"":fwlxid);
+								dydlid == null ? "" : dydlid,nwmid == null ? "" : nwmid,szdid==null?"":szdid,szgkid==null?"":szgkid,szgqid==null?"":szgqid,jcgid==null?"":jcgid,dedlid==null?"":dedlid,qyxzid==null?"":qyxzid,fwlxid==null?"":fwlxid);
 				for (Object entity : dcttltjlist) {
 					Object[] e = (Object[]) entity;
 					DcttltjVo vo = new DcttltjVo();
@@ -74,7 +74,7 @@ public class DcttltjCtl extends BaseWebCtl {
 			}else{
 			List<Object> dcttltjlist = dcsbService.tongjiproValue(startDate == null ? sdf.format(beginTime) : sdf.format(startDate), 
 					endDate == null ? sdf.format(endTime) : sdf.format(endDate),
-							nwmid == null ? "" : nwmid,dydlid == null ? "" : dydlid,szdid==null?"":szdid,szgkid==null?"":szgkid,szgqid==null?"":szgqid,jcgid==null?"":jcgid,dedlid==null?"":dedlid,qyxzid==null?"":qyxzid,fwlxid==null?"":fwlxid);
+							dydlid == null ? "" : dydlid,nwmid == null ? "" : nwmid,szdid==null?"":szdid,szgkid==null?"":szgkid,szgqid==null?"":szgqid,jcgid==null?"":jcgid,dedlid==null?"":dedlid,qyxzid==null?"":qyxzid,fwlxid==null?"":fwlxid);
 			for (Object entity : dcttltjlist) {
 				Object[] e = (Object[]) entity;
 				DcttltjVo vo = new DcttltjVo();
@@ -87,7 +87,7 @@ public class DcttltjCtl extends BaseWebCtl {
 		}else{
 			List<Object> dcttltjlist = dcsbService.tongjicityValue(startDate == null ? sdf.format(beginTime) : sdf.format(startDate), 
 					endDate == null ? sdf.format(endTime) : sdf.format(endDate),
-							nwmid == null ? "" : nwmid,dydlid == null ? "" : dydlid,szdid==null?"":szdid,szgkid==null?"":szgkid,szgqid==null?"":szgqid,jcgid==null?"":jcgid,dedlid==null?"":dedlid,qyxzid==null?"":qyxzid,fwlxid==null?"":fwlxid);
+							dydlid == null ? "" : dydlid,nwmid == null ? "" : nwmid,szdid==null?"":szdid,szgkid==null?"":szgkid,szgqid==null?"":szgqid,jcgid==null?"":jcgid,dedlid==null?"":dedlid,qyxzid==null?"":qyxzid,fwlxid==null?"":fwlxid);
 			
 			for (Object entity : dcttltjlist) {
 				Object[] e = (Object[]) entity;