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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledit.jsp

@@ -60,7 +60,7 @@
 				fjgt(jsjdgl.detail.fjid31,'scbt31','tjbt31');
 				jsjdgl.detail.fjid32='${fjList32.fjid }';
 				fjgt(jsjdgl.detail.fjid32,'scbt32','tjbt32');
-				jsjdgl.detail.fjid33='${fjList33.fjid }';
+				/* jsjdgl.detail.fjid33='${fjList33.fjid }';
 				fjgt(jsjdgl.detail.fjid33,'scbt33','tjbt33');
 				jsjdgl.detail.fjid34='${fjList34.fjid }';
 				fjgt(jsjdgl.detail.fjid34,'scbt34','tjbt34');
@@ -71,7 +71,7 @@
 				jsjdgl.detail.fjid37='${fjList37.fjid }';
 				fjgt(jsjdgl.detail.fjid37,'scbt37','tjbt37');
 				jsjdgl.detail.fjid38='${fjList38.fjid }';
-				fjgt(jsjdgl.detail.fjid38,'scbt38','tjbt38');
+				fjgt(jsjdgl.detail.fjid38,'scbt38','tjbt38'); */
 			}else if(opflag== 4){
 				$("#sgtsjspli").addClass("active");
 				$("#sgtsjsp").addClass("tab-pane fade in active");
@@ -145,12 +145,12 @@
 				fjgt(jsjdgl.detail.fjid81,'scbt81','tjbt81');
 				jsjdgl.detail.fjid82='${fjList82.fjid }';
 				fjgt(jsjdgl.detail.fjid82,'scbt82','tjbt82');
-				jsjdgl.detail.fjid83='${fjList83.fjid }';
+				/* jsjdgl.detail.fjid83='${fjList83.fjid }';
 				fjgt(jsjdgl.detail.fjid83,'scbt83','tjbt83');
 				jsjdgl.detail.fjid84='${fjList84.fjid }';
 				fjgt(jsjdgl.detail.fjid84,'scbt84','tjbt84');
 				jsjdgl.detail.fjid85='${fjList85.fjid }';
-				fjgt(jsjdgl.detail.fjid85,'scbt85','tjbt85');
+				fjgt(jsjdgl.detail.fjid85,'scbt85','tjbt85'); */
 			}else {
 				$("#axlyspli").addClass("active");
 				$("#axlysp").addClass("tab-pane fade in active");
@@ -601,18 +601,16 @@
 						<th width="10%">批文单位</th>
 						<th width="10%">文号</th>
 						<th width="10%">批文时间</th>
-						<c:if test="${record.flowstatus == '' || record.flowstatus == null }">
-						<c:if test="${spflag==3 || opflag == 3}">
+						<c:if test="${spflag!=3 && opflag == 3 }">
 						<th width="15%">操作</th>
 						</c:if>
-						</c:if>
 					</tr>
 				<tr height="40px">
 				    <td>
 								1
 					</td>
 					 <td>
-								港口建设项目初步设计审批申请文件
+								初步设计文件
 					</td>
 					<td>
 					            <input type="hidden" class="form-control" name="delid31" id="delid31" value="${fjList31.fjid }">
@@ -628,7 +626,6 @@
 					<td>
 								<span id="fbsj31">${recordfj31.fbsj }</span>
 					</td>
-					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">
 					<c:if test="${spflag!=3 && opflag == 3 }">
 					<td>
 					<a id="tjbt31" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('31')">
@@ -636,10 +633,6 @@
 					<a id="scbt31" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('31')">
 							           删除</a>
 					</td> 
-					 </c:if>	           
-					<c:if test="${spflag==3  && opflag == 3 }">
-					<td></td>
-					</c:if>  
 					</c:if>   
 				</tr>
 				
@@ -648,7 +641,7 @@
 								2
 					</td>
 					 <td>
-								港口建设项目初步设计文件
+								初步设计批复文件
 					</td>
 					<td>
 					            <input type="hidden" class="form-control" name="delid32" id="delid32" value="${fjList32.fjid }">
@@ -664,7 +657,6 @@
 					<td>
 								<span id="fbsj32">${recordfj32.fbsj }</span>
 					</td>
-					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">
 					<c:if test="${spflag!=3  && opflag == 3 }">
 					<td>
 					<a id="tjbt32" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('32')">
@@ -673,12 +665,9 @@
 							           删除</a>
 					</td> 
 					</c:if>	           
-					<c:if test="${spflag==3  && opflag == 3 }">
-					<td></td>
-					</c:if> 
-					</c:if>    
+					
 				</tr>
-				<tr height="40px">
+			<%-- 	<tr height="40px">
 				    <td>
 								3
 					</td>
@@ -841,7 +830,7 @@
 					<td></td>
 					</c:if> 
 					</c:if>           
-				</tr>
+				</tr> --%>
 				<c:forEach items="${fjvolist3}" var="qtfj" varStatus="status">
 						<tr height="40px">
 						<c:if test="${ record.flowstatus > 0  }">
@@ -1460,18 +1449,16 @@
 						<th width="10%">批文单位</th>
 						<th width="10%">文号</th>
 						<th width="10%">批文时间</th>
-						<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">
-						<c:if test="${spflag==8 || opflag == 8  }">
+						<c:if test="${spflag!=8 && opflag == 8  }">
 						<th width="15%">操作</th>
 						</c:if>
-						</c:if>
 					</tr>
 				<tr height="40px">
 				    <td>
 								1
 					</td>
 					 <td>
-								港口建设项目竣工验收申请文件
+								竣工资料汇编
 					</td>
 					<td>
 					            <input type="hidden" class="form-control" name="delid81" id="delid81" value="${fjList81.fjid }">
@@ -1487,7 +1474,6 @@
 					<td>
 								<span id="fbsj81">${recordfj81.fbsj }</span>
 					</td>
-					<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">
 					<c:if test="${spflag!=8 && opflag == 8 }">
 					<td>
 					<a id="tjbt81" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('81')">
@@ -1496,10 +1482,6 @@
 							           删除</a>
 					</td> 
 					 </c:if>	           
-					 <c:if test="${spflag==8 && opflag == 8 }">
-					 <Td></Td>
-					 </c:if>	
-					 </c:if>
 				</tr>
 				
 				<tr height="40px">
@@ -1507,7 +1489,7 @@
 								2
 					</td>
 					 <td>
-								港口建设项目竣工验收材料
+								竣工验收证书(多个，新码头，老码头改造)
 					</td>
 					<td>
 					            <input type="hidden" class="form-control" name="delid82" id="delid82" value="${fjList82.fjid }">
@@ -1523,8 +1505,7 @@
 					<td>
 								<span id="fbsj82">${recordfj82.fbsj }</span>
 					</td>
-					<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">
-					<c:if test="${spflag!=8 && opflag == 8 }">
+						<c:if test="${spflag!=8 && opflag == 8 }">
 					<td>
 					<a id="tjbt82" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('82')">
 							           添加</a>
@@ -1532,13 +1513,10 @@
 							           删除</a>
 					</td> 
 					 </c:if>	           
-					 <c:if test="${spflag==8 && opflag == 8 }">
-					 <Td></Td>
-					 </c:if>	
-					 </c:if>
+					
 				</tr>
 				
-				<tr>
+				<%-- <tr>
 					<td>3</td>
 					<td>竣工验收鉴定书</td>
 					<td><input type="hidden" class="form-control"
@@ -1615,7 +1593,7 @@
 					 <Td></Td>
 					 </c:if>	    
 					 </c:if>
-				</tr>
+				</tr> --%>
 				
 				<c:forEach items="${fjvolist8}" var="qtfj" varStatus="status">
 						<tr height="40px">
@@ -1766,7 +1744,7 @@
 	<div class="theme-popover-mask" id="theme-popover-mask"></div>
 </form>
 
-					<div  id="buttons">
+					<%-- <div  id="buttons">
 					<c:if test="${sfjyr==1 }">
                     <a class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.qtfj()">
 							            其他附件</a>
@@ -1850,6 +1828,34 @@
 					     <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>	            		            		            		            
+          			</div> --%>
+          			<div  id="buttons">
+					<c:if test="${sfjyr==1 }">
+                    <a class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.qtfj()">
+							            其他附件</a>
+                    </c:if>
+                    <c:if test="${sfjyr=='' }">
+					<c:if test="${flag=='audit' }">
+					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
+							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							            同意</a>
+					</c:if>	
+					</c:if>
+					<c:if test="${sfjyr==1 }">
+					<c:if test="${flag=='audit' }">
+					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
+							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							            提交</a>
+					</c:if>	
+					</c:if>
+					<c:if test="${sfjyr!=1 }">	            
+					<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
+					</c:if>
+							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.back()">
+							   <i class="glyphicon glyphicon-arrow-left"></i> 
+							            返回</a>
           			</div>
 			</div>
 		</div>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglview.jsp

@@ -439,7 +439,7 @@
 								1
 					</td>
 					<td>
-								港口建设项目初步设计审批申请文件
+								初步设计文件
 					</td>
 					<td>
 					            <input type="hidden" class="form-control" id="delid31" value="${fjList31.fjid }">
@@ -461,7 +461,7 @@
 								2
 					</td>
 					 <td>
-								港口建设项目初步设计文件
+								初步设计批复文件
 					</td>
 					<td>
 					            <input type="hidden" class="form-control" id="delid32" value="${fjList32.fjid }">
@@ -477,7 +477,7 @@
 								${recordfj32.fbsj }
 					</td>
 				</tr>
-				<tr height="40px">
+				<%-- <tr height="40px">
 				    <td>
 								3
 					</td>
@@ -569,7 +569,7 @@
 										<td><span id="fbsj38">${recordfj38.fbsj }</span></td>
 										
 									</tr>
-									
+									 --%>
 				 <c:forEach items="${fjvolist3}" var="qtfj" varStatus="status">
 						<tr height="40px">
 							<td>${status.index+9 }</td>
@@ -1021,7 +1021,7 @@
 								1
 					</td>
 					 <td>
-								港口建设项目竣工验收申请文件
+								竣工资料汇编
 					</td>
 					<td>
 					            <input type="hidden" class="form-control" name="delid81" id="delid81" value="${fjList81.fjid }">
@@ -1047,7 +1047,7 @@
 								2
 					</td>
 					 <td>
-								港口建设项目竣工验收材料
+								竣工验收证书(多个，新码头，老码头改造)
 					</td>
 					<td>
 					            <input type="hidden" class="form-control" name="delid82" id="delid82" value="${fjList82.fjid }">
@@ -1067,8 +1067,8 @@
 					        
 					
 				</tr>
-				<tr>
-				<tr>
+				
+			<%-- 	<tr>
 					<td>3</td>
 					<td>竣工验收鉴定书</td>
 					<td><input type="hidden" class="form-control"
@@ -1081,6 +1081,7 @@
 					<td><span id="wjh83">${recordfj83.wjh }</span></td>
 					<td><span id="fbsj83">${recordfj83.fbsj }</span></td>
 				</tr>
+				<tr>
 					<td>4</td>
 					<td>专家审查意见</td>
 					<td><input type="hidden" class="form-control"
@@ -1105,7 +1106,7 @@
 					<td><span id="fbdw85">${recordfj85.fbdw }</span></td>
 					<td><span id="wjh85">${recordfj85.wjh }</span></td>
 					<td><span id="fbsj85">${recordfj85.fbsj }</span></td>
-				</tr>
+				</tr> --%>
 				<c:forEach items="${fjvolist8}" var="qtfj" varStatus="status">
 						<tr height="40px">
 							<td>${status.index+3 }</td>

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

@@ -459,10 +459,16 @@ public class BaseWebCtl extends BaseCtl {
 		}
 	}
 
-	public boolean getTbStatus(String uStr) {
+	public boolean getTbStatus(String uStr ,String szd) {
 		boolean flag = false;
 		try {
-			String str = GlobalData.SJYH_URL + GlobalData.CITY_CODE + "_";
+			String str="";
+			// 判断省市区别
+			if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+				str = GlobalData.SJYH_URL + GlobalData.CITY_CODE + "_";
+			} else {
+				str = GlobalData.SJYH_URL + szd + "_";
+			}
 			URL url = new URL(str + uStr);
 			HttpURLConnection con = (HttpURLConnection) url.openConnection();
 			con.connect();

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

@@ -1215,7 +1215,7 @@ public class JgsqCtl extends BaseWebCtl {
 				// 如果是省级审核通过或不通过后同步到市级
 				try {
 					String url = "GK_OPERATION_JSJY_JGSQ_ONE_PC?condition=ID=" + entity.getId();
-					boolean tbflag = getTbStatus(url);
+					boolean tbflag = getTbStatus(url,entity.getSzd().getId());
 					if (tbflag) {
 						entity.setTbzt("Y");
 						jgsqService.save(entity);

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

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

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

@@ -1106,7 +1106,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 					}
 
 					String url = "GK_OPERATION_JSJY_JSJDBG_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid;
-					boolean tbflag = getTbStatus(url);
+					boolean tbflag = getTbStatus(url,entity.getSzd().getId());
 					if (tbflag) {
 						entity.setTbzt("Y");
 						jsjdbgService.save(entity);

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

@@ -1249,7 +1249,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 
 		String url = "GK_OPERATION_JSJY_JSJDBG_ONE_CP?condition=ID=" + id + ";FJID=1";
 
-		boolean flag = getTbStatus(url);
+		boolean flag = getTbStatus(url,null);
 		if (flag) {
 			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);

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

@@ -1293,7 +1293,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				// 如果是省级审核通过或不通过后同步到市级
 				try {
 					String url = "GK_OPERATION_JSJY_JSJDCBSJ_ONE_PC?condition=ID=" + entity.getId();
-					boolean tbflag = getTbStatus(url);
+					boolean tbflag = getTbStatus(url,entity.getSzd().getId());
 					if (tbflag) {
 						entity.setTbzt("Y");
 						jsjdcbsjService.save(entity);

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

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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -362,7 +362,7 @@ public class JsjdglCtl extends BaseWebCtl {
 			url = "GK_OPERATION_JSJY_JGSQ_ONE_CP?condition=ID=" + id;
 		}
 
-		boolean flag = getTbStatus(url);
+		boolean flag = getTbStatus(url,null);
 		if (flag) {
 			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);
@@ -1430,19 +1430,19 @@ public class JsjdglCtl extends BaseWebCtl {
 			if ("3".equals(opflag)) {
 				if (StringUtils.isEmpty(delid31)) {
 					wr.setSuccess(false);
-					wr.setMessage("港口建设项目初步设计审批申请文件!");
+					wr.setMessage("请上传初步设计文件!");
 					return wr;
 				}
 				if (StringUtils.isEmpty(delid32)) {
 					wr.setSuccess(false);
-					wr.setMessage("请上传港口建设项目初步设计文件!");
+					wr.setMessage("初步设计批复文件!");
 					return wr;
 				}
-				if (StringUtils.isEmpty(delid33)) {
+				/*if (StringUtils.isEmpty(delid33)) {
 					wr.setSuccess(false);
 					wr.setMessage("请上传港口建设项目批准或者核准、备案文件!");
 					return wr;
-				}
+				}*/
 			}
 			if ("4".equals(opflag)) {
 				if (StringUtils.isEmpty(delid41)) {
@@ -1505,17 +1505,17 @@ public class JsjdglCtl extends BaseWebCtl {
 			if ("8".equals(opflag)) {
 				if (StringUtils.isEmpty(delid81)) {
 					wr.setSuccess(false);
-					wr.setMessage("请上传港口建设项目竣工验收申请文件!");
+					wr.setMessage("请上传竣工资料汇编!");
 					return wr;
 				}
 				if (StringUtils.isEmpty(delid82)) {
 					wr.setSuccess(false);
-					wr.setMessage("请上传港口建设项目竣工验收材料!");
+					wr.setMessage("请上传竣工验收证书(多个，新码头，老码头改造)!");
 					return wr;
 				}
 			}
 		} else {
-			if (flag) {
+			/*if (flag) {
 				if ("3".equals(spflag)) {
 					if (StringUtils.isEmpty(delid34)) {
 						wr.setSuccess(false);
@@ -1536,7 +1536,7 @@ public class JsjdglCtl extends BaseWebCtl {
 					}
 				}
 			}
-
+*/
 		}
 		XmxxglEntity xmxxgl = null;
 		try {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -442,7 +442,7 @@ public class LhbgCtl extends BaseWebCtl {
 		lhbgService.save(entity);
 		String url = "GK_OPERATION_JSJY_LHBG_ONE_CP?condition=ID=" + id + ";FJID=" + fjid;
 
-		boolean flag = getTbStatus(url);
+		boolean flag = getTbStatus(url,null);
 		if (flag) {
 			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);
@@ -657,7 +657,7 @@ public class LhbgCtl extends BaseWebCtl {
 						fjid = fjid.substring(0, fjid.length() - 1);
 					}
 					String url = "GK_OPERATION_JSJY_LHBG_ONE_PC?condition=ID=" + entity.getId()+";FJID="+fjid;
-					boolean tbflag = getTbStatus(url);
+					boolean tbflag = getTbStatus(url,entity.getSzd().getId());
 					if (tbflag) {
 						entity.setTbzt("Y");
 						lhbgService.save(entity);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -587,7 +587,7 @@ public class LhsqCtl extends BaseWebCtl {
 		lhsqService.save(entity);
 		String url = "GK_OPERATION_JSJY_LHSQ_ONE_CP?condition=ID=" + id + ";FJID=" + fjid;
 
-		boolean flag = getTbStatus(url);
+		boolean flag = getTbStatus(url,null);
 		if (flag) {
 			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);
@@ -751,7 +751,7 @@ public class LhsqCtl extends BaseWebCtl {
 					}
 
 					String url = "GK_OPERATION_JSJY_LHSQ_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid;
-					boolean tbflag = getTbStatus(url);
+					boolean tbflag = getTbStatus(url,entity.getSzd().getId());
 					if (tbflag) {
 						entity.setTbzt("Y");
 						lhsqService.save(entity);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -654,7 +654,7 @@ public class LhyxCtl extends BaseWebCtl {
 					}
 
 					String url = "GK_OPERATION_JSJY_LHYX_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid;
-					boolean tbflag = getTbStatus(url);
+					boolean tbflag = getTbStatus(url,entity.getSzd().getId());
 					if (tbflag) {
 						entity.setTbzt("Y");
 						lhyxService.save(entity);
@@ -693,7 +693,7 @@ public class LhyxCtl extends BaseWebCtl {
 		lhyxService.save(entity);
 		String url = "GK_OPERATION_JSJY_LHYX_ONE_CP?condition=ID=" + id + ";FJID=" + fjid;
 
-		boolean flag = getTbStatus(url);
+		boolean flag = getTbStatus(url,null);
 		if (flag) {
 			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);