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

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

@@ -427,7 +427,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid11" id="delid11" value="${fjList11.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid11">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc11">${fjList11.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('11')"><span id="fjmc11">${fjList11.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw11">${recordfj11.fbdw }</span>
@@ -500,7 +500,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid21" id="delid21" value="${fjList21.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid21">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc21">${fjList21.fjmc}</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('21')"><span id="fjmc21">${fjList21.fjmc}</span></a>
 					</td>
 					<td>
 								<span id="fbdw21">${recordfj21.fbdw }</span>
@@ -574,7 +574,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid31" id="delid31" value="${fjList31.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid31">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc31">${fjList31.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('31')"><span id="fjmc31">${fjList31.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw31">${recordfj31.fbdw }</span>
@@ -607,7 +607,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid32" id="delid32" value="${fjList32.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid32">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc32">${fjList32.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('32')"><span id="fjmc32">${fjList32.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw32">${recordfj32.fbdw }</span>
@@ -639,7 +639,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid33" id="delid33" value="${fjList33.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid33">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc33">${fjList33.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('33')"><span id="fjmc33">${fjList33.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw33">${recordfj33.fbdw }</span>
@@ -661,76 +661,76 @@
 					</c:if>	   
 					 <c:if test="${ record.flowstatus > 0  }">         
 					<tr>
-										<td>4</td>
-										<td>审查会议纪要</td>
-										<td><input type="hidden" class="form-control"
-											name="delid34" id="delid34" value="${fjList34.fjid }">
-											<input type="hidden" class="form-control" id="fjzdid34">
-											<a class='main_title' href="#"
-											onclick="jsjdgl.detail.download()"><span id="fjmc34">${fjList34.fjmc }</span></a>
-										</td>
-										<td><span id="fbdw34">${recordfj34.fbdw }</span></td>
-										<td><span id="wjh34">${recordfj34.wjh }</span></td>
-										<td><span id="fbsj34">${recordfj34.fbsj }</span></td>
-									
-									</tr>
-									<tr>
-										<td>5</td>
-										<td>专家审查意见</td>
-										<td><input type="hidden" class="form-control"
-											name="delid35" id="delid35" value="${fjList35.fjid }">
-											<input type="hidden" class="form-control" id="fjzdid35">
-											<a class='main_title' href="#"
-											onclick="jsjdgl.detail.download()"><span id="fjmc35">${fjList35.fjmc }</span></a>
-										</td>
-										<td><span id="fbdw35">${recordfj35.fbdw }</span></td>
-										<td><span id="wjh35">${recordfj35.wjh }</span></td>
-										<td><span id="fbsj35">${recordfj35.fbsj }</span></td>
-										
-									</tr>
-									<tr>
-										<td>6</td>
-										<td>对审查意见的答复</td>
-										<td><input type="hidden" class="form-control"
-											name="delid36" id="delid36" value="${fjList36.fjid }">
-											<input type="hidden" class="form-control" id="fjzdid36">
-											<a class='main_title' href="#"
-											onclick="jsjdgl.detail.download()"><span id="fjmc36">${fjList36.fjmc }</span></a>
-										</td>
-										<td><span id="fbdw36">${recordfj36.fbdw }</span></td>
-										<td><span id="wjh36">${recordfj36.wjh }</span></td>
-										<td><span id="fbsj36">${recordfj36.fbsj }</span></td>
-										
-									</tr>
-									<tr>
-										<td>7</td>
-										<td>第三方审查咨询报告 （ 可选 ）</td>
-										<td><input type="hidden" class="form-control"
-											name="delid37" id="delid37" value="${fjList37.fjid }">
-											<input type="hidden" class="form-control" id="fjzdid37">
-											<a class='main_title' href="#"
-											onclick="jsjdgl.detail.download()"><span id="fjmc37">${fjList37.fjmc }</span></a>
-										</td>
-										<td><span id="fbdw37">${recordfj37.fbdw }</span></td>
-										<td><span id="wjh37">${recordfj37.wjh }</span></td>
-										<td><span id="fbsj37">${recordfj37.fbsj }</span></td>
-										
-									</tr>
-									<tr>
-										<td>8</td>
-										<td>初步设计文件报批稿</td>
-										<td><input type="hidden" class="form-control"
-											name="delid38" id="delid38" value="${fjList38.fjid }">
-											<input type="hidden" class="form-control" id="fjzdid38">
-											<a class='main_title' href="#"
-											onclick="jsjdgl.detail.download()"><span id="fjmc38">${fjList38.fjmc }</span></a>
-										</td>
-										<td><span id="fbdw38">${recordfj38.fbdw }</span></td>
-										<td><span id="wjh38">${recordfj38.wjh }</span></td>
-										<td><span id="fbsj38">${recordfj38.fbsj }</span></td>
-										
-									</tr>
-									</c:if>
+					<td>4</td>
+					<td>审查会议纪要</td>
+					<td><input type="hidden" class="form-control"
+						name="delid34" id="delid34" value="${fjList34.fjid }">
+						<input type="hidden" class="form-control" id="fjzdid34">
+						<a class='main_title' href="#"
+						onclick="jsjdgl.detail.download('34')"><span id="fjmc34">${fjList34.fjmc }</span></a>
+					</td>
+					<td><span id="fbdw34">${recordfj34.fbdw }</span></td>
+					<td><span id="wjh34">${recordfj34.wjh }</span></td>
+					<td><span id="fbsj34">${recordfj34.fbsj }</span></td>
+				
+				</tr>
+				<tr>
+					<td>5</td>
+					<td>专家审查意见</td>
+					<td><input type="hidden" class="form-control"
+						name="delid35" id="delid35" value="${fjList35.fjid }">
+						<input type="hidden" class="form-control" id="fjzdid35">
+						<a class='main_title' href="#"
+						onclick="jsjdgl.detail.download('35')"><span id="fjmc35">${fjList35.fjmc }</span></a>
+					</td>
+					<td><span id="fbdw35">${recordfj35.fbdw }</span></td>
+					<td><span id="wjh35">${recordfj35.wjh }</span></td>
+					<td><span id="fbsj35">${recordfj35.fbsj }</span></td>
+					
+				</tr>
+				<tr>
+					<td>6</td>
+					<td>对审查意见的答复</td>
+					<td><input type="hidden" class="form-control"
+						name="delid36" id="delid36" value="${fjList36.fjid }">
+						<input type="hidden" class="form-control" id="fjzdid36">
+						<a class='main_title' href="#"
+						onclick="jsjdgl.detail.download('36')"><span id="fjmc36">${fjList36.fjmc }</span></a>
+					</td>
+					<td><span id="fbdw36">${recordfj36.fbdw }</span></td>
+					<td><span id="wjh36">${recordfj36.wjh }</span></td>
+					<td><span id="fbsj36">${recordfj36.fbsj }</span></td>
+					
+				</tr>
+				<tr>
+					<td>7</td>
+					<td>第三方审查咨询报告 （ 可选 ）</td>
+					<td><input type="hidden" class="form-control"
+						name="delid37" id="delid37" value="${fjList37.fjid }">
+						<input type="hidden" class="form-control" id="fjzdid37">
+						<a class='main_title' href="#"
+						onclick="jsjdgl.detail.download('37')"><span id="fjmc37">${fjList37.fjmc }</span></a>
+					</td>
+					<td><span id="fbdw37">${recordfj37.fbdw }</span></td>
+					<td><span id="wjh37">${recordfj37.wjh }</span></td>
+					<td><span id="fbsj37">${recordfj37.fbsj }</span></td>
+					
+				</tr>
+				<tr>
+					<td>8</td>
+					<td>初步设计文件报批稿</td>
+					<td><input type="hidden" class="form-control"
+						name="delid38" id="delid38" value="${fjList38.fjid }">
+						<input type="hidden" class="form-control" id="fjzdid38">
+						<a class='main_title' href="#"
+						onclick="jsjdgl.detail.download('38')"><span id="fjmc38">${fjList38.fjmc }</span></a>
+					</td>
+					<td><span id="fbdw38">${recordfj38.fbdw }</span></td>
+					<td><span id="wjh38">${recordfj38.wjh }</span></td>
+					<td><span id="fbsj38">${recordfj38.fbsj }</span></td>
+					
+				</tr>
+				</c:if>
 				<c:forEach items="${fjvolist3}" var="qtfj" varStatus="status">
 						<tr height="40px">
 							<td>${status.index+3}</td>
@@ -783,7 +783,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid41" id="delid41" value="${fjList41.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid41">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc41">${fjList41.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('41')"><span id="fjmc41">${fjList41.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw41">${recordfj41.fbdw }</span>
@@ -815,7 +815,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid42" id="delid42" value="${fjList42.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid42">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc42">${fjList42.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download(42')"><span id="fjmc42">${fjList42.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw42">${recordfj42.fbdw }</span>
@@ -889,7 +889,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid51" id="delid51" value="${fjList51.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid51">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc51">${fjList51.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('51')"><span id="fjmc51">${fjList51.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw51">${recordfj51.fbdw }</span>
@@ -922,7 +922,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid52" id="delid52" value="${fjList52.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid52">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc52">${fjList52.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('52')"><span id="fjmc52">${fjList52.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw52">${recordfj52.fbdw }</span>
@@ -955,7 +955,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid53" id="delid53" value="${fjList53.fjid }">  
 					            <input type="hidden" class="form-control" id="fjzdid53">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc53">${fjList53.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('53')"><span id="fjmc53">${fjList53.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw53">${recordfj53.fbdw }</span>
@@ -988,7 +988,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid54" id="delid54" value="${fjList54.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid54">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc54">${fjList54.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('54')"><span id="fjmc54">${fjList54.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw54">${recordfj54.fbdw }</span>
@@ -1021,7 +1021,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid55" id="delid55" value="${fjList55.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid55">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc55">${fjList55.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('55')"><span id="fjmc55">${fjList55.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw55">${recordfj55.fbdw }</span>
@@ -1054,7 +1054,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid56" id="delid56" value="${fjList56.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid56">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc56">${fjList56.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('56')"><span id="fjmc56">${fjList56.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw56">${recordfj56.fbdw }</span>
@@ -1144,7 +1144,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid61" id="delid61" value="${fjList61.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid61">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc61">${fjList61.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('61')"><span id="fjmc61">${fjList61.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw61">${recordfj61.fbdw }</span>
@@ -1177,7 +1177,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid62" id="delid62" value="${fjList62.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid62">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc62">${fjList62.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('62')"><span id="fjmc62">${fjList62.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw62">${recordfj62.fbdw }</span>
@@ -1251,7 +1251,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid71" id="delid71" value="${fjList71.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid71">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc71">${fjList71.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('71')"><span id="fjmc71">${fjList71.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw71">${recordfj71.fbdw }</span>
@@ -1284,7 +1284,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid72" id="delid72" value="${fjList72.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid72">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc72">${fjList72.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('72')"><span id="fjmc72">${fjList72.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw72">${recordfj72.fbdw }</span>
@@ -1358,7 +1358,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid81" id="delid81" value="${fjList81.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid81">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc81">${fjList81.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('81')"><span id="fjmc81">${fjList81.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw81">${recordfj81.fbdw }</span>
@@ -1391,7 +1391,7 @@
 					<td>
 					            <input type="hidden" class="form-control" name="delid82" id="delid82" value="${fjList82.fjid }">
 					            <input type="hidden" class="form-control" id="fjzdid82">
-					            <a class='main_title' href="#" onclick="jsjdgl.detail.download()"><span id="fjmc82">${fjList82.fjmc }</span></a>
+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('82')"><span id="fjmc82">${fjList82.fjmc }</span></a>
 					</td>
 					<td>
 								<span id="fbdw82">${recordfj82.fbdw }</span>
@@ -1413,6 +1413,47 @@
 					 </c:if>	           
 					
 				</tr>
+				<tr>
+				 <c:if test="${ record.flowstatus > 0  }">
+				<tr>
+					<td>3</td>
+					<td>竣工验收鉴定书</td>
+					<td><input type="hidden" class="form-control"
+						name="delid83" id="delid83" value="${fjList83.fjid }">
+						<input type="hidden" class="form-control" id="fjzdid83">
+						<a class='main_title' href="#"
+						onclick="jsjdgl.detail.download('83')"><span id="fjmc83">${fjList83.fjmc }</span></a>
+					</td>
+					<td><span id="fbdw83">${recordfj83.fbdw }</span></td>
+					<td><span id="wjh83">${recordfj83.wjh }</span></td>
+					<td><span id="fbsj83">${recordfj83.fbsj }</span></td>
+				</tr>
+					<td>4</td>
+					<td>专家审查意见</td>
+					<td><input type="hidden" class="form-control"
+						name="delid84" id="delid84" value="${fjList84.fjid }">
+						<input type="hidden" class="form-control" id="fjzdid84">
+						<a class='main_title' href="#"
+						onclick="jsjdgl.detail.download('84')"><span id="fjmc84">${fjList84.fjmc }</span></a>
+					</td>
+					<td><span id="fbdw84">${recordfj84.fbdw }</span></td>
+					<td><span id="wjh84">${recordfj84.wjh }</span></td>
+					<td><span id="fbsj84">${recordfj84.fbsj }</span></td>
+				</tr>
+				<tr>
+					<td>5</td>
+					<td>对验收意见的答复</td>
+					<td><input type="hidden" class="form-control"
+						name="delid85" id="delid85" value="${fjList85.fjid }">
+						<input type="hidden" class="form-control" id="fjzdid85">
+						<a class='main_title' href="#"
+						onclick="jsjdgl.detail.download('85')"><span id="fjmc85">${fjList85.fjmc }</span></a>
+					</td>
+					<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>
+				</c:if>
 				<c:forEach items="${fjvolist8}" var="qtfj" varStatus="status">
 						<tr height="40px">
 							<td>${status.index+3}</td>
@@ -1569,12 +1610,12 @@
                     </c:if>
                     <c:if test="${sfjyr=='' }">
 					<c:if test="${flag=='audit' }">
-					<c:if test="${spflag !='3' && spflag != '6' || record.flowstatus == 2}">
+					<c:if test="${spflag !='3' && spflag != '8' || record.flowstatus == 2 || record.flowstatus == 4}">
 					<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 test="${ (spflag =='3' || spflag == '6') && record.flowstatus != 2 }">
+				 <c:if test="${ (spflag =='3' || spflag == '8') && (record.flowstatus != 2 && record.flowstatus != 4)}">
 					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveTbzt('${record.id}')">
 							   <i class="glyphicon glyphicon-ok-sign"></i> 
 							    转报</a>

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdgl/jsjdgldetail.js

@@ -187,17 +187,10 @@ jsjdgl.detail.save=function(){
     }); 
 }
 	 
-jsjdgl.detail.download= function(){
-	xiazaibz=$("#xiazaibz").val();
-	if(xiazaibz==null){
-	var i=$("#flag").val();
-	var dldid=$("#delid"+i).val();
-	location.href=$.app+"/accessory/download?id="+dldid;	
-	}else{
-	var i=$("#xiazaibz").val();
-	var dldid=$("#delid"+i).val();
+jsjdgl.detail.download= function(scflag){
+	var dldid=$("#delid"+scflag).val();
 	location.href=$.app+"/accessory/download?id="+dldid;	
-	}
+	
 }	
 
 	

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

@@ -1,5 +1,6 @@
 package com.xt.jygl.gkjsgl.jsjdgl.ctl;
 
+import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.URLDecoder;
@@ -38,7 +39,10 @@ import com.xt.jygl.accessory.entity.AccessoryEntity;
 import com.xt.jygl.accessory.service.AccessoryService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.common.Utils;
+import com.xt.jygl.ftp.Ftp;
+import com.xt.jygl.ftp.FtpUtil;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xt.jygl.gkjsgl.jsjdgl.entity.JsjdfjEntity;
@@ -340,6 +344,10 @@ public class JsjdglCtl extends BaseWebCtl {
 		entity.setSftb(Constants.YES);
 		xmxxglService.save(entity);
 		String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;
+		if(entity.getFlowstatus().equals("2")){
+			url="/GK_OPERATION_JSJY_JGSQ_ONE_CP?condition=ID=" + id;
+		}
+		
 		boolean flag = getTbStatus(url);
 		if (flag) {
 			entity.setFlowstatus("0");
@@ -572,12 +580,37 @@ public class JsjdglCtl extends BaseWebCtl {
 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
 		for (int i = 0; i < accessoryList.size(); i++) {
 			if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {
+				AccessoryEntity acc = accessoryList.get(i);
 				String s = accessoryList.get(i).getRemark().substring(0, 2);
 				String accid = accessoryList.get(i).getId();
 				JsjdfjVo fjnamevo = new JsjdfjVo();
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+					try {
+						Ftp f = getftp();
+						// 本地目录
+						String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
+						File newfile = new File(localBaseDir);
+						// 如果文件夹不存在则创建
+						if (!newfile.exists() && !newfile.isDirectory()) {
+							newfile.mkdirs();
+						}
+						// 远程目录
+						String remoteBaseDir = acc.getFilepath();
+						// 下载ftp文件
+						boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
+						if (downflag) {
+							System.out.println("ok");
+							acc.setFjbz("1");
+							accessoryService.save(acc);
+						}
+
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				}
 				model.addAttribute("fjList" + s, fjnamevo);
 				model.addAttribute("xiazaibz", s);
 			}
@@ -731,12 +764,37 @@ public class JsjdglCtl extends BaseWebCtl {
 		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");
 		for (int i = 0; i < accessoryList.size(); i++) {
 			if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {
+				AccessoryEntity acc = accessoryList.get(i);
 				String s = accessoryList.get(i).getRemark().substring(0, 2);
 				String accid = accessoryList.get(i).getId();
 				JsjdfjVo fjnamevo = new JsjdfjVo();
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+					try {
+						Ftp f = getftp();
+						// 本地目录
+						String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
+						File newfile = new File(localBaseDir);
+						// 如果文件夹不存在则创建
+						if (!newfile.exists() && !newfile.isDirectory()) {
+							newfile.mkdirs();
+						}
+						// 远程目录
+						String remoteBaseDir = acc.getFilepath();
+						// 下载ftp文件
+						boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
+						if (downflag) {
+							System.out.println("ok");
+							acc.setFjbz("1");
+							accessoryService.save(acc);
+						}
+
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				}
 				model.addAttribute("fjList" + s, fjnamevo);
 				model.addAttribute("xiazaibz", s);
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/vo/XmxxglfbVo.java

@@ -58,7 +58,25 @@ public class XmxxglfbVo extends BaseVo {
 	private String sylxzw;/* 水域类型中文 */
 	private Date jcsj; /* 建成时间 */
 	private String flowstatus;
+	private String sftb;
+	private String tbzt;
 	
+	public String getSftb() {
+		return sftb;
+	}
+
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+
+	public String getTbzt() {
+		return tbzt;
+	}
+
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+
 	public String getFlowstatus() {
 		return flowstatus;
 	}