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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjdsmain.jsp

@@ -163,7 +163,7 @@
 									</a>
 								</c:if>
 								</c:if>
-							 <c:if test="${jsjdcbsjds.taskState =='Y'}">
+							 <c:if test="${jsjdcbsjds.taskState =='Y' && jsjdcbsjds.sftb == 'N'}">
 							 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdcbsjds.main.banli('${jsjdcbsjds.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjdsview.jsp

@@ -420,7 +420,7 @@
 						<a class="btn btn-default btn-sm" href="#" onclick="showYj()">
 							<i class="glyphicon glyphicon-check"></i> 意见
 						</a>
-					<c:if test="${record.flowstatus !='2' }">	            
+					<c:if test="${record.flowstatus !='2' && record.sftb == 'N' }">	            
 						<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdcbsjds.detail.saveTbzt('${record.id}')">
 												   <i class="glyphicon glyphicon-ok-sign"></i> 
 												    转报省级</a>		            
@@ -431,11 +431,11 @@
 							class="glyphicon glyphicon-ok-sign"></i> 同意
 						</a>
 					</c:if>
+				
 						<a class="btn btn-default btn-sm" href="#"
 							onclick="jsjdcbsjds.detail.audit('N','${record.id}')"> <i
 							class="glyphicon glyphicon-ban-circle"></i> 退回
 						</a>
-
 					</c:if>
 
 					<a class="btn btn-default btn-sm" href="#"

gkjsjy/trunk/src/com/xt/jygl/common/BaseWebCtl.java

@@ -3,49 +3,20 @@ package com.xt.jygl.common;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-import java.net.SocketTimeoutException;
 import java.net.URL;
-import java.net.URLEncoder;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
+
 import javax.servlet.http.HttpServletRequest;
 
 import net.sf.json.JsonConfig;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.ConnectTimeoutException;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.conn.ssl.X509HostnameVerifier;
-import org.apache.http.entity.ContentType;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.util.EntityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomBooleanEditor;
@@ -465,7 +436,7 @@ public class BaseWebCtl extends BaseCtl {
 			String str="";
 			// 判断省市区别
 			if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
-				str = GlobalData.SJYH_URL + GlobalData.CITY_CODE + "_";
+				str = GlobalData.SJYH_URL +GlobalData.DSJC + "_";
 			} else {
 				str = GlobalData.SJYH_URL + szd + "_";
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java

@@ -1620,7 +1620,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		entity.setSftb(Constants.YES);
 		jgsqdsService.save(entity);
 
-		String url = "/GK_OPERATION_JSJY_JGSQ_ONE_CP?condition=ID=" + id;
+		String url = "GK_OPERATION_JSJY_JGSQ_ONE_CP?condition=ID=" + id;
 
 		boolean flag = getTbStatus(url,null);
 		if (flag) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java

@@ -1192,8 +1192,8 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
 				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
-			//	list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
-			/*	Subquery<TaskInfoEntity> subquery = query.subquery(TaskInfoEntity.class);
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+				Subquery<TaskInfoEntity> subquery = query.subquery(TaskInfoEntity.class);
 				Root<TaskInfoEntity> dpRoot = subquery.from(TaskInfoEntity.class);
 				subquery.select(dpRoot);
 				List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
@@ -1203,7 +1203,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 				subQueryPredicates.add(cb.notLike(dpRoot.get("taskKey").as(String.class), "%cbsjsp%"));
 				subQueryPredicates.add(cb.notLike(dpRoot.get("taskKey").as(String.class), "%jgys2%"));
 				subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
-				list.add(cb.exists(subquery));*/
+				list.add(cb.exists(subquery));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java

@@ -1589,7 +1589,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		entity.setSftb(Constants.YES);
 		jsjdcbsjdsService.save(entity);
 
-		String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;
+		String url = "GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;
 
 		boolean flag = getTbStatus(url,null);
 		if (flag) {