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

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

@@ -48,7 +48,7 @@ public class DcttltjCtl extends BaseWebCtl {
 	 * @return
 	 */
 	@RequestMapping(value = "/main")
-	public String main(Model model, Date startDate, Date endDate, String menuid,String nwmid,String szdid,String szgkid,String szgqid,String jcgid,String dydlid,String dedlid) {
+	public String main(Model model, Date startDate, Date endDate, String menuid,String nwmid,String szdid,String szgkid,String szgqid,String jcgid,String dydlid,String dedlid,String qyxzid,String fwlxid) {
 		Calendar cal = Calendar.getInstance();
 		cal.set(GregorianCalendar.DAY_OF_MONTH, 1);
 		Date beginTime = cal.getTime();
@@ -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);
+								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);
 				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);
+							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);
 			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);
+							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);
 			
 			for (Object entity : dcttltjlist) {
 				Object[] e = (Object[]) entity;
@@ -102,10 +102,10 @@ public class DcttltjCtl extends BaseWebCtl {
 		List<DcttltjVo> voList = new ArrayList<DcttltjVo>();
 		List<Object> listtb = dcsbService.dcsbtjbg(startDate == null ? sdf.format(beginTime) : sdf.format(startDate), 
 				endDate == null ? sdf.format(endTime) : sdf.format(endDate), dydlid == null ? "" : dydlid, nwmid == null ? "" : nwmid
-						, szdid==null?"":szdid, szgkid==null ?"":szgkid, szgqid== null ?"":szgqid, jcgid==null?"":jcgid);
+						, szdid==null?"":szdid, szgkid==null ?"":szgkid, szgqid== null ?"":szgqid, jcgid==null?"":jcgid,qyxzid==null?"":qyxzid,fwlxid==null?"":fwlxid);
 		List<Object> listtb2 = dcsbService.dcsbtjbg2(startDate == null ? sdf.format(beginTime) : sdf.format(startDate), 
 				endDate == null ? sdf.format(endTime) : sdf.format(endDate), dedlid == null ? "" : dedlid, nwmid == null ? "" : nwmid
-						, szdid==null?"":szdid, szgkid==null ?"":szgkid, szgqid== null ?"":szgqid, jcgid==null?"":jcgid);
+						, szdid==null?"":szdid, szgkid==null ?"":szgkid, szgqid== null ?"":szgqid, jcgid==null?"":jcgid,qyxzid==null?"":qyxzid,fwlxid==null?"":fwlxid);
 		/*for(int i=0;i<listtb2.size();i++){
 			Object[] e=(Object[]) listtb2.get(i);
 			e[0] = "        "+e[0];
@@ -190,7 +190,8 @@ public class DcttltjCtl extends BaseWebCtl {
 		model.addAttribute("queryTime1", startDate == null ? sdfMonth.format(endTime) : sdfMonth.format(startDate));
 		model.addAttribute("queryTime2", endDate == null ? "" : sdfMonth.format(endDate));
 		model.addAttribute("menuid", menuid);
+		model.addAttribute("qyxzid", qyxzid == null ? "" : (qyxzid));
+		model.addAttribute("fwlxid", fwlxid == null ? "" : (fwlxid));
 		return "/gkyxtjyfx/dcttltj/dcttltj";
 	}
-	
 }