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

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/IDcttltjWebService.java

@@ -8,5 +8,5 @@ import javax.jws.WebService;
 public interface IDcttltjWebService {
 	@WebMethod(operationName = "findDcttltj", action = "http://service.web.jsjty.com/findDcttltj")
 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")
-	public String findDcttltj(String startDate, String endDate, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dydlid, String dedlid);
+	public String findDcttltj(String startDate, String endDate, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dydlid, String dedlid,String qyxzid, String fwlxid);
 }

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/impl/DcttltjWebService.java

@@ -34,7 +34,7 @@ public class DcttltjWebService extends BaseWebCtl implements IDcttltjWebService
 	 */
 
 	@Override
-	public String findDcttltj(String startDateStr, String endDateStr, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dydlid, String dedlid){ 
+	public String findDcttltj(String startDateStr, String endDateStr, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dydlid, String dedlid, String qyxzid, String fwlxid){ 
 		if (!this.checkUser()){
 			return BaseWebCtl.NOLOGIN;
 		}
@@ -63,7 +63,7 @@ public class DcttltjWebService extends BaseWebCtl implements IDcttltjWebService
 			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();
@@ -75,7 +75,7 @@ public class DcttltjWebService extends BaseWebCtl implements IDcttltjWebService
 			}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();
@@ -88,7 +88,7 @@ public class DcttltjWebService extends BaseWebCtl implements IDcttltjWebService
 		}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;
@@ -103,10 +103,10 @@ public class DcttltjWebService extends BaseWebCtl implements IDcttltjWebService
 		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];