Prechádzať zdrojové kódy

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

ld_xuhx 8 rokov pred
rodič
commit
8106aac163

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtj.jsp

@@ -92,6 +92,7 @@
 					    <thead>
 						    <tr>
 						    	<th width="5%">序号</th>
+						    		<th width="10%">港口</th>
 				    			<th width="20%">本月完成量</th>
 				        		<th width="20%">本年累计量</th>
 								<th width="20%">同比增长数(%)</th>
@@ -102,6 +103,7 @@
 					    <c:forEach items="${list}" var="list" varStatus="status">
 						    <tr >
 						    	<td >${status.count }</td>
+						    	<td >${list.szgkzw }</td>
 								<td >${list.bywcl }</td>
 						        <td >${list.bnljl }</td>
 								<td >${list.tbzzs }</td>

+ 27 - 27
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjAdd.jsp

@@ -61,43 +61,43 @@
                        	<a class="btn btn-default btn-sm" href="#" onclick="hxhbtj.detail.stat()">
 					   		<i class="glyphicon glyphicon-search"></i>统计</a>
 			   		</div>
-	 				<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱吞吐量完成情况</h2>
+	 				<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱吞吐量完成情况</font></h2>
 					<table class="apply" cellpadding="0" cellspacing="0">
 						<tr>
 							<th colspan="2">本月完成量:&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="bywcl" name="bywcl">
+								<input type="text" class="form-control" id="bywcl" name="bywcl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
 							</td>
 							<th colspan="2">本年累计量:&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="bnljl" name="bnljl">
+								<input type="text" class="form-control" id="bnljl" name="bnljl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
 							</td>
 							<th colspan="2">同比增长数(%):&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="tbzzs" name="tbzzs">
+								<input type="text" class="form-control" id="tbzzs" name="tbzzs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
 							</td>
 						</tr>
 						<tr>
 							<th rowspan="2">其中:</th>
 							<th>外贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="wmjzxttl" name="wmjzxttl"></td>
+							<td><input type="text" class="form-control" id="wmjzxttl" name="wmjzxttl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 							<th rowspan="2">其中:</th>
 							<th>外贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="nwmjzxttl" name="nwmjzxttl"></td>
+							<td><input type="text" class="form-control" id="nwmjzxttl" name="nwmjzxttl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 							<th rowspan="2">其中:</th>
 							<th>外贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="wmtbzzs" name="wmtbzzs"></td>
+							<td><input type="text" class="form-control" id="wmtbzzs" name="wmtbzzs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 						<tr>
 							<th>内贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="nmjzxttl" name="nmjzxttl"></td>
+							<td><input type="text" class="form-control" id="nmjzxttl" name="nmjzxttl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 							<th>内贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="nnmjzxttl" name="nnmjzxttl"></td>
+							<td><input type="text" class="form-control" id="nnmjzxttl" name="nnmjzxttl" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 							<th>内贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="nmtbzzs" name="nmtbzzs"></td>
+							<td><input type="text" class="form-control" id="nmtbzzs" name="nmtbzzs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 					</table>
-					<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱航线航班开辟情况</h2>
+					<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱航线航班开辟情况</font></h2>
 					<table class="apply">
 						<tr>
 							<th></th>
@@ -108,31 +108,31 @@
 						</tr>
 						<tr>
 							<th>远洋航线</th>
-							<td><input type="text" class="form-control" id="yyhxts" name="yyhxts"></td>
-							<td><input type="text" class="form-control" id="yyhxhbs" name="yyhxhbs"></td>
-							<td><input type="text" class="form-control" id="yyxkphxs" name="yyxkphxs"></td>
-							<td><input type="text" class="form-control" id="yytkhxs" name="yytkhxs"></td>
+							<td><input type="text" class="form-control" id="yyhxts" name="yyhxts" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="yyhxhbs" name="yyhxhbs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="yyxkphxs" name="yyxkphxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="yytkhxs" name="yytkhxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 						<tr>
 						<th>近洋航线</th>
-							<td><input type="text" class="form-control" id="jyhxts" name="jyhxts"></td>
-							<td><input type="text" class="form-control" id="jyhxhbs" name="jyhxhbs"></td>
-							<td><input type="text" class="form-control" id="jyxkphxs" name="jyxkphxs"></td>
-							<td><input type="text" class="form-control" id="jytkhxs" name="jytkhxs"></td>
+							<td><input type="text" class="form-control" id="jyhxts" name="jyhxts" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="jyhxhbs" name="jyhxhbs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="jyxkphxs" name="jyxkphxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="jytkhxs" name="jytkhxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 						<tr>
 							<th>外贸内支线</th>
-							<td><input type="text" class="form-control" id="nzxts" name="nzxts"></td>
-							<td><input type="text" class="form-control" id="nzxhbs" name="nzxhbs"></td>
-							<td><input type="text" class="form-control" id="nzxxkphxs" name="nzxxkphxs"></td>
-							<td><input type="text" class="form-control" id="nzxtkhxs" name="nzxtkhxs"></td>
+							<td><input type="text" class="form-control" id="nzxts" name="nzxts" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nzxhbs" name="nzxhbs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nzxxkphxs" name="nzxxkphxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nzxtkhxs" name="nzxtkhxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 						<tr>
 							<th>内贸航线</th>
-							<td><input type="text" class="form-control" id="nmhxts" name="nmhxts"></td>
-							<td><input type="text" class="form-control" id="nmhxhbs" name="nmhxhbs"></td>
-							<td><input type="text" class="form-control" id="nmxkphxs" name="nmxkphxs"></td>
-							<td><input type="text" class="form-control" id="nmtkhxs" name="nmtkhxs"></td>
+							<td><input type="text" class="form-control" id="nmhxts" name="nmhxts" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmhxhbs" name="nmhxhbs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmxkphxs" name="nmxkphxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmtkhxs" name="nmtkhxs" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 						<tr>
 							<th>填表人:</th>

+ 29 - 29
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjEdit.jsp

@@ -56,43 +56,43 @@
 							</td>
 						</tr>
 	                </table>
-	 				<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱吞吐量完成情况</h2>
+	 				<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱吞吐量完成情况</font></h2>
 					<table class="apply" cellpadding="0" cellspacing="0">
 						<tr>
 							<th colspan="2">本月完成量:&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="bywcl" name="bywcl" value="${record.bywcl }">
+								<input type="text" class="form-control" id="bywcl" name="bywcl" value="${record.bywcl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
 							</td>
 							<th colspan="2">本年累计量:&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="bnljl" name="bnljl" value="${record.bnljl }">
+								<input type="text" class="form-control" id="bnljl" name="bnljl" value="${record.bnljl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
 							</td>
 							<th colspan="2">同比增长数(%):&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" id="tbzzs" name="tbzzs" value="${record.tbzzs }">
+								<input type="text" class="form-control" id="tbzzs" name="tbzzs" value="${record.tbzzs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
 							</td>
 						</tr>
 						<tr>
 							<th rowspan="2">其中:</th>
 							<th>外贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="wmjzxttl" name="wmjzxttl" value="${record.wmjzxttl }"></td>
+							<td><input type="text" class="form-control" id="wmjzxttl" name="wmjzxttl" value="${record.wmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 							<th rowspan="2">其中:</th>
 							<th>外贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="nwmjzxttl" name="nwmjzxttl" value="${record.nwmjzxttl }"></td>
+							<td><input type="text" class="form-control" id="nwmjzxttl" name="nwmjzxttl" value="${record.nwmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 							<th rowspan="2">其中:</th>
 							<th>外贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="wmtbzzs" name="wmtbzzs" value="${record.wmtbzzs }"></td>
+							<td><input type="text" class="form-control" id="wmtbzzs" name="wmtbzzs" value="${record.wmtbzzs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 						<tr>
 							<th>内贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="nmjzxttl" name="nmjzxttl" value="${record.nmjzxttl }"></td>
+							<td><input type="text" class="form-control" id="nmjzxttl" name="nmjzxttl" value="${record.nmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 							<th>内贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="nnmjzxttl" name="nnmjzxttl" value="${record.nnmjzxttl }"></td>
+							<td><input type="text" class="form-control" id="nnmjzxttl" name="nnmjzxttl" value="${record.nnmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 							<th>内贸:&nbsp;</th>
-							<td><input type="text" class="form-control" id="nmtbzzs" name="nmtbzzs" value="${record.nmtbzzs }"></td>
+							<td><input type="text" class="form-control" id="nmtbzzs" name="nmtbzzs" value="${record.nmtbzzs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 					</table>
-					<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱航线航班开辟情况</h2>
+					<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱航线航班开辟情况</font></h2>
 					<table class="apply">
 						<tr>
 							<th></th>
@@ -103,35 +103,35 @@
 						</tr>
 						<tr>
 							<th>远洋航线</th>
-							<td><input type="text" class="form-control" id="yyhxts" name="yyhxts" value="${record.yyhxts }"></td>
-							<td><input type="text" class="form-control" id="yyhxhbs" name="yyhxhbs" value="${record.yyhxhbs }"></td>
-							<td><input type="text" class="form-control" id="yyxkphxs" name="yyxkphxs" value="${record.yyxkphxs }"></td>
-							<td><input type="text" class="form-control" id="yytkhxs" name="yytkhxs" value="${record.yytkhxs }"></td>
+							<td><input type="text" class="form-control" id="yyhxts" name="yyhxts" value="${record.yyhxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="yyhxhbs" name="yyhxhbs" value="${record.yyhxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="yyxkphxs" name="yyxkphxs" value="${record.yyxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="yytkhxs" name="yytkhxs" value="${record.yytkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 						<tr>
 						<th>近洋航线</th>
-							<td><input type="text" class="form-control" id="jyhxts" name="jyhxts" value="${record.jyhxts }"></td>
-							<td><input type="text" class="form-control" id="jyhxhbs" name="jyhxhbs" value="${record.jyhxhbs }"></td>
-							<td><input type="text" class="form-control" id="jyxkphxs" name="jyxkphxs" value="${record.jyxkphxs }"></td>
-							<td><input type="text" class="form-control" id="jytkhxs" name="jytkhxs" value="${record.jytkhxs }"></td>
+							<td><input type="text" class="form-control" id="jyhxts" name="jyhxts" value="${record.jyhxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="jyhxhbs" name="jyhxhbs" value="${record.jyhxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="jyxkphxs" name="jyxkphxs" value="${record.jyxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="jytkhxs" name="jytkhxs" value="${record.jytkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 						<tr>
 							<th>外贸内支线</th>
-							<td><input type="text" class="form-control" id="nzxts" name="nzxts" value="${record.nzxts }"></td>
-							<td><input type="text" class="form-control" id="nzxhbs" name="nzxhbs" value="${record.nzxhbs }"></td>
-							<td><input type="text" class="form-control" id="nzxxkphxs" name="nzxxkphxs" value="${record.nzxxkphxs }"></td>
-							<td><input type="text" class="form-control" id="nzxtkhxs" name="nzxtkhxs" value="${record.nzxtkhxs }"></td>
+							<td><input type="text" class="form-control" id="nzxts" name="nzxts" value="${record.nzxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nzxhbs" name="nzxhbs" value="${record.nzxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nzxxkphxs" name="nzxxkphxs" value="${record.nzxxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nzxtkhxs" name="nzxtkhxs" value="${record.nzxtkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 						<tr>
 							<th>内贸航线</th>
-							<td><input type="text" class="form-control" id="nmhxts" name="nmhxts" value="${record.nmhxts }"></td>
-							<td><input type="text" class="form-control" id="nmhxhbs" name="nmhxhbs" value="${record.nmhxhbs }"></td>
-							<td><input type="text" class="form-control" id="nmxkphxs" name="nmxkphxs" value="${record.nmxkphxs }"></td>
-							<td><input type="text" class="form-control" id="nmtkhxs" name="nmtkhxs" value="${record.nmtkhxs }"></td>
+							<td><input type="text" class="form-control" id="nmhxts" name="nmhxts" value="${record.nmhxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmhxhbs" name="nmhxhbs" value="${record.nmhxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmxkphxs" name="nmxkphxs" value="${record.nmxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmtkhxs" name="nmtkhxs" value="${record.nmtkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
 						</tr>
 						<tr>
 							<th>填表人:</th>
-							<td><input type="text" class="form-control" id="tbr" readOnly = "true" value="${record.tbr }"></td>
+							<td><input type="text" class="form-control" id="tbr" readOnly = "true" value="${record.tbr }" ></td>
 							<th>联系电话:</th>
 							<td colspan="2"><input type="text" class="form-control" id="lxdh" readOnly = "true" value="${record.lxdh }"></td>
 						</tr>
@@ -140,7 +140,7 @@
 				<div id="buttons">
             	<a class="btn btn-default btn-sm" href="#" onclick="hxhbtj.detail.save()">
 			   		<i class="glyphicon glyphicon-floppy-disk"></i>保存
-			   	</a>
+			   	</a>	
 			   	<a class="btn btn-default btn-sm" href="#" onclick="hxhbtj.detail.saveTbzt()">
 					<i class="glyphicon glyphicon-share"></i>提交
 				</a>

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjView.jsp

@@ -57,7 +57,7 @@
 	                        </td>
 	                    </tr> -->
                 </table>
- 				<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱吞吐量完成情况</h2>
+ 				<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱吞吐量完成情况</font></h2>
 				<table class="apply" cellpadding="0" cellspacing="0">
 					<tr>
 						<th colspan="2">本月完成量:&nbsp;</th>
@@ -93,7 +93,7 @@
 						<td>${record.nmtbzzs }</td>
 					</tr>
 				</table>
-				<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱航线航班开辟情况</h2>
+				<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱航线航班开辟情况</font></h2>
 				<table class="apply">
 					<tr>
 						<th></th>

+ 60 - 3
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjpro.jsp

@@ -12,12 +12,20 @@
 	<script type="text/javascript" src="${app }/static/biz/js/gkyxtjyfx/hxhbtj/hxhbtjmain.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
+			initgkSelect('szgksel','${szgkid }','','','80%');
 			iFrameHeightIframe('${menuid}');//自适应高度
 		});
 		
 		function searchMain(){
 			$("#hxhbtjproform").submit();
 		}
+		
+		function view(id){
+			location.href=$.app+"/hxhbtjpro/view?id="+id;
+		}
+		function edit(data){
+			location.href=$.app+"/hxhbtjpro/edit?id="+data;
+		}
 	</script>
 	
 </head>
@@ -31,20 +39,28 @@
 		<div>
    				   <table class="search_table" cellpadding="0" cellspacing="0">
    				   	   <tr>
-							
+							<th width="10%"></th>
+							<th width="24%"></th>	
 							<th width="10%"></th>
 							<th width="24%"></th>
 							<th width="10%"></th>
 							<th width="22%"></th>
 					   </tr>
 					   <tr>
+					   		<td class="right">
+			                	所在港口:&nbsp;
+			                </td>
+			                 <td>
+				            	<span id="szgksel">
+								</span>
+				            </td>
 				            <td class="right">
 			                	日期:&nbsp;
 			                </td>
 			                <td>
 			                	<input class="Wdate" id="rq" name="rq" value="${rq }" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM'})">
 			                </td>
-	                        <td class="right" colspan="6">
+	                        <td class="right" >
 			                       	<a class="btn btn-default btn-sm" href="#" onclick="searchMain()">
 								   		<i class="glyphicon glyphicon-search"></i>查询
 							   		</a>
@@ -53,6 +69,7 @@
                     </table>
           		</div>
 				<!-- 列表 -->
+				<c:if test="${szgkid == null}">
 			    <div  style="background-color:#f4f4f4;">
 				    <table class="main_table" cellpadding="0" cellspacing="0">
 					  
@@ -100,8 +117,48 @@
 					   	</tr>
 				    </table>
 				</div>
+				</c:if>
+				<c:if test="${szgkid != null}">
+				<!-- 列表 -->
+			    <div  style="background-color:#f4f4f4;">
+				    <table class="main_table" cellpadding="0" cellspacing="0">
+					    <thead>
+						    <tr>
+						    	<th width="5%">序号</th>
+				    			<th width="20%">本月完成量</th>
+				        		<th width="20%">本年累计量</th>
+								<th width="20%">同比增长数(%)</th>
+								<th width="20%">日期</th>
+								<th width="15%">操作</th>
+						    </tr>
+					    </thead>
+					    <c:forEach items="${list}" var="list" varStatus="status">
+						    <tr >
+						    	<td >${status.count }</td>
+								<td >${list.bywcl }</td>
+						        <td >${list.bnljl }</td>
+								<td >${list.tbzzs }</td>
+								<td >${list.rq }</td>
+						        <td class="operatetd">
+							        <a class="btn btn-default btn-xs" href="#" onclick="view('${list.id}')" title="查看">
+							            <i class="glyphicon glyphicon-search"></i>
+							        </a>
+										<a class="btn btn-default btn-xs" href="#"  onclick="edit('${list.id}')" title="编辑">
+									   		<i class="glyphicon glyphicon-pencil"></i>
+									   	</a>
+									  
+						        </td>
+						    </tr>
+					    </c:forEach>
+				    </table>
+				</div>
+	  			<!-- 分页 -->
+	  			<jsp:include page="../../pageinfo.jsp"></jsp:include>
+				</c:if>
 				</form>
+				
+		</div>
+			
 		</div>
-</div>
 </body>
 </html>

+ 155 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjproEdit.jsp

@@ -0,0 +1,155 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>江苏省港口建设与经营管理信息系统</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <%@ include file="../../common.jsp"%>
+	<script type="text/javascript" src="${app }/static/biz/js/gkyxtjyfx/hxhbtj/hxhbtjprodetail.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			initgkSelect('szgksel','${szgkid }','','showgq','80%');
+			iFrameHeightIframe('${menuid}');//自适应高度
+		});
+	</script>
+	<style type="text/css">
+	.apply th {
+  width: 9%;
+  height: 35px;
+  font-weight: normal;
+  border-bottom: 1px solid #dadbda;
+  color: #185f8a;
+  background: #e6eff9;
+  font-size: 14px;
+  text-align: center;
+}
+	.apply td {
+  width: 15%;
+  height: 30px;
+  border: 1px solid #e2e3cb;
+  text-indent: 5px;
+  font-size: 14px;
+  color: #000000
+}
+	</style>
+</head>
+
+<body>
+	<div class="box" >
+		<div class="box-content" >
+			<div class="apply_fill">
+				<form  id="addform" method="post"> 			
+ 					<input type="hidden" name="id" value="${record.id }">
+					<table class="apply" cellpadding="0" cellspacing="0">
+						<tr>
+							<th><span class="needwrite">*</span>所在港口:&nbsp;</th>
+							<td >
+							${record.szgkzw }
+								<input type="hidden" id="szgkid" name="szgkid" value="${record.szgk }"/>
+							</td>
+							<th><span class="needwrite">*</span>日期:&nbsp;</th>
+							<td >
+								<input type="hidden" id="rq" name="rq" value="${record.rq }"/>
+								${record.rq }
+							</td>
+						</tr>
+	                </table>
+	 				<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱吞吐量完成情况</font></h2>
+					<table class="apply" cellpadding="0" cellspacing="0">
+						<tr>
+							<th colspan="2">本月完成量:&nbsp;</th>
+							<td>
+								<input type="text" class="form-control" id="bywcl" name="bywcl" value="${record.bywcl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
+							</td>
+							<th colspan="2">本年累计量:&nbsp;</th>
+							<td>
+								<input type="text" class="form-control" id="bnljl" name="bnljl" value="${record.bnljl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
+							</td>
+							<th colspan="2">同比增长数(%):&nbsp;</th>
+							<td>
+								<input type="text" class="form-control" id="tbzzs" name="tbzzs" value="${record.tbzzs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')">
+							</td>
+						</tr>
+						<tr>
+							<th rowspan="2">其中:</th>
+							<th>外贸:&nbsp;</th>
+							<td><input type="text" class="form-control" id="wmjzxttl" name="wmjzxttl" value="${record.wmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<th rowspan="2">其中:</th>
+							<th>外贸:&nbsp;</th>
+							<td><input type="text" class="form-control" id="nwmjzxttl" name="nwmjzxttl" value="${record.nwmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<th rowspan="2">其中:</th>
+							<th>外贸:&nbsp;</th>
+							<td><input type="text" class="form-control" id="wmtbzzs" name="wmtbzzs" value="${record.wmtbzzs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+						</tr>
+						<tr>
+							<th>内贸:&nbsp;</th>
+							<td><input type="text" class="form-control" id="nmjzxttl" name="nmjzxttl" value="${record.nmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<th>内贸:&nbsp;</th>
+							<td><input type="text" class="form-control" id="nnmjzxttl" name="nnmjzxttl" value="${record.nnmjzxttl }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<th>内贸:&nbsp;</th>
+							<td><input type="text" class="form-control" id="nmtbzzs" name="nmtbzzs" value="${record.nmtbzzs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+						</tr>
+					</table>
+					<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱航线航班开辟情况</font></h2>
+					<table class="apply">
+						<tr>
+							<th></th>
+							<th>本月营运航线总数</th>
+							<th>本月营运航班总数</th>
+							<th>本月新开辟航线数</th>
+							<th>本月停开航线数</th>
+						</tr>
+						<tr>
+							<th>远洋航线</th>
+							<td><input type="text" class="form-control" id="yyhxts" name="yyhxts" value="${record.yyhxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="yyhxhbs" name="yyhxhbs" value="${record.yyhxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="yyxkphxs" name="yyxkphxs" value="${record.yyxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="yytkhxs" name="yytkhxs" value="${record.yytkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+						</tr>
+						<tr>
+						<th>近洋航线</th>
+							<td><input type="text" class="form-control" id="jyhxts" name="jyhxts" value="${record.jyhxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="jyhxhbs" name="jyhxhbs" value="${record.jyhxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="jyxkphxs" name="jyxkphxs" value="${record.jyxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="jytkhxs" name="jytkhxs" value="${record.jytkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+						</tr>
+						<tr>
+							<th>外贸内支线</th>
+							<td><input type="text" class="form-control" id="nzxts" name="nzxts" value="${record.nzxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nzxhbs" name="nzxhbs" value="${record.nzxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nzxxkphxs" name="nzxxkphxs" value="${record.nzxxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nzxtkhxs" name="nzxtkhxs" value="${record.nzxtkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+						</tr>
+						<tr>
+							<th>内贸航线</th>
+							<td><input type="text" class="form-control" id="nmhxts" name="nmhxts" value="${record.nmhxts }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmhxhbs" name="nmhxhbs" value="${record.nmhxhbs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmxkphxs" name="nmxkphxs" value="${record.nmxkphxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+							<td><input type="text" class="form-control" id="nmtkhxs" name="nmtkhxs" value="${record.nmtkhxs }" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>
+						</tr>
+						<tr>
+							<th>填表人:</th>
+							<td><input type="text" class="form-control" id="tbr" readOnly = "true" value="${record.tbr }" ></td>
+							<th>联系电话:</th>
+							<td colspan="2"><input type="text" class="form-control" id="lxdh" readOnly = "true" value="${record.lxdh }"></td>
+						</tr>
+					</table>
+				</form>
+				<div id="buttons">
+            	<a class="btn btn-default btn-sm" href="#" onclick="hxhbtjpro.detail.save()">
+			   		<i class="glyphicon glyphicon-floppy-disk"></i>保存
+			   	</a>
+				<a class="btn btn-default btn-sm" href="#"  onclick="hxhbtjpro.detail.back()">
+					<i class="glyphicon glyphicon-arrow-left"></i>返回
+				</a>
+         		</div>
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>

+ 151 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjproView.jsp

@@ -0,0 +1,151 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>江苏省港口建设与经营管理信息系统</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <%@ include file="../../common.jsp"%>
+	<script type="text/javascript" src="${app }/static/biz/js/gkyxtjyfx/hxhbtj/hxhbtjprodetail.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			iFrameHeightIframe('${menuid}');//自适应高度
+		});
+	</script>
+	<style type="text/css">
+	.apply th {
+  width: 9%;
+  height: 35px;
+  font-weight: normal;
+  border-bottom: 1px solid #dadbda;
+  color: #185f8a;
+  background: #e6eff9;
+  font-size: 14px;
+  text-align: center;
+}
+	.apply td {
+  width: 15%;
+  height: 30px;
+  border: 1px solid #e2e3cb;
+  text-indent: 5px;
+  font-size: 14px;
+  color: #000000
+}
+	</style>
+</head>
+
+<body>
+	<div class="box" >
+		<div class="box-content" >
+		<input type="hidden" id="szgkid" value="${record.szgk }"/>
+		<input type="hidden" id="rq" value="${record.rq }"/>
+			<div class="apply_fill">
+				<table class="apply" cellpadding="0" cellspacing="0">
+				
+					<tr>
+						<th class="right">所在港口:&nbsp;</td>
+						<td>${record.szgkzw }</td>
+						<th class="right">日期:&nbsp;</td>
+						<td>${record.rq }</td>
+					</tr>
+	                	<!-- <tr>
+	                        <td class="right" colspan="6">
+		                       	<a class="btn btn-default btn-sm" href="#" onclick="hxhbtjpro.main.search()">
+							   		<i class="glyphicon glyphicon-search"></i>查询
+	                        </td>
+	                    </tr> -->
+                </table>
+ 				<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱吞吐量完成情况</font></h2>
+				<table class="apply" cellpadding="0" cellspacing="0">
+					<tr>
+						<th colspan="2">本月完成量:&nbsp;</th>
+						<td>
+							${record.bywcl }
+						</td>
+						<th colspan="2">本年累计量:&nbsp;</th>
+						<td>
+							${record.bnljl }
+						</td>
+						<th colspan="2">同比增长数(%):&nbsp;</th>
+						<td>
+							${record.tbzzs }
+						</td>
+					</tr>
+					<tr>
+						<th rowspan="2">其中:</th>
+						<th>外贸:&nbsp;</th>
+						<td>${record.wmjzxttl }</td>
+						<th rowspan="2">其中:</th>
+						<th>外贸:&nbsp;</th>
+						<td>${record.nwmjzxttl }</td>
+						<th rowspan="2">其中:</th>
+						<th>外贸:&nbsp;</th>
+						<td>${record.wmtbzzs }</td>
+					</tr>
+					<tr>
+						<th>内贸:&nbsp;</th>
+						<td>${record.nmjzxttl }</td>
+						<th>内贸:&nbsp;</th>
+						<td>${record.nnmjzxttl }</td>
+						<th>内贸:&nbsp;</th>
+						<td>${record.nmtbzzs }</td>
+					</tr>
+				</table>
+				<h2 align="center" style="margin-top:0px;"><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">集装箱航线航班开辟情况</font></h2>
+				<table class="apply">
+					<tr>
+						<th></th>
+						<th>本月营运航线总数</th>
+						<th>本月营运航班总数</th>
+						<th>本月新开辟航线数</th>
+						<th>本月停开航线数</th>
+					</tr>
+					<tr>
+						<th>远洋航线</th>
+						<td>${record.yyhxts }</td>
+						<td>${record.yyhxhbs }</td>
+						<td>${record.yyxkphxs }</td>
+						<td>${record.yytkhxs }</td>
+					</tr>
+					<tr>
+					<th>近洋航线</th>
+						<td>${record.jyhxts }</td>
+						<td>${record.jyhxhbs }</td>
+						<td>${record.jyxkphxs }</td>
+						<td>${record.jytkhxs }</td>
+					</tr>
+					<tr>
+						<th>外贸内支线</th>
+						<td>${record.nzxts }</td>
+						<td>${record.nzxhbs }</td>
+						<td>${record.nzxxkphxs }</td>
+						<td>${record.nzxtkhxs }</td>
+					</tr>
+					<tr>
+						<th>内贸航线</th>
+						<td>${record.nmhxts }</td>
+						<td>${record.nmhxhbs }</td>
+						<td>${record.nmxkphxs }</td>
+						<td>${record.nmtkhxs }</td>
+					</tr>
+					<tr>
+						<th>填表人:</th>
+						<td>${record.tbr }</td>
+						<th>联系电话:</th>
+						<td colspan="2">${record.lxdh }</td>
+					</tr>
+				</table>
+				<div  id="buttons">
+					<a class="btn btn-default btn-sm" href="#"  onclick="hxhbtjpro.detail.back()">
+						<i class="glyphicon glyphicon-arrow-left"></i>返回
+					</a>
+         		</div>
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>

+ 33 - 1
gkjsjy/trunk/WebContent/static/biz/js/gkyxtjyfx/hxhbtj/hxhbtjdetail.js

@@ -86,6 +86,38 @@ hxhbtj.detail.stat=function(){
 };
 
 hxhbtj.detail.saveTbzt=function(data){
+	
+	// 必填非空验证
+	if(vae($('#szgkid'), "所在港口")==false){return false;}
+	if(vae($('#rq'), "日期")==false){return false;}
+	
+	// 特殊字段类型验证
+	if(van($('#yyhxts'), "远洋航线条数")==false){return false;}
+	if(van($('#yyhxhbs'), "远洋航线航班数")==false){return false;}
+	if(van($('#jyhxts'), "近洋航线条数")==false){return false;}
+	if(van($('#jyhxhbs'), "近洋航线航班数")==false){return false;}
+	if(van($('#nzxts'), "内支线条数")==false){return false;}
+	if(van($('#nzxhbs'), "内支线航班数")==false){return false;}
+	if(van($('#nmhxts'), "内贸航线条数")==false){return false;}
+	if(van($('#nmhxhbs'), "内贸航线航班数")==false){return false;}
+	if(van($('#nmjzxttl'), "月内贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#wmjzxttl'), "月外贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#nnmjzxttl'), "年内贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#nwmjzxttl'), "年外贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#bywcl'), "本月完成量")==false){return false;}
+	if(van($('#bnljl'), "本年累积量")==false){return false;}
+	//if(van($('#tbzzs'), "同比增长数")==false){return false;}
+	//if(van($('#nmtbzzs'), "内贸同比增长数")==false){return false;}
+	//if(van($('#wmtbzzs'), "外贸同比增长数")==false){return false;}
+	if(van($('#yyxkphxs'), "远洋新开辟航线数")==false){return false;}
+	if(van($('#yytkhxs'), "远洋停开航线数")==false){return false;}
+	if(van($('#jyxkphxs'), "近洋新开辟航线数")==false){return false;}
+	if(van($('#jytkhxs'), "近洋停开航线数")==false){return false;}
+	if(van($('#nzxxkphxs'), "内支线新开辟航线数")==false){return false;}
+	if(van($('#nzxtkhxs'), "内支线停开航线数")==false){return false;}
+	if(van($('#nmxkphxs'), "内贸新开辟航线数")==false){return false;}
+	if(van($('#nmtkhxs'), "内贸停开航线数")==false){return false;}
+	
 	 $(".btn").attr("disabled",true);
 	 $.ajax({
 			url:$.app + "/hxhbtj/saveTbzt",
@@ -130,7 +162,7 @@ van=function(area,name){
  	if(!isFDS(area.val())&&!isZS(area.val())){
  		$.alert({
  		    title: '提示',
- 		    content: name+'需为正数',
+ 		    content: name+'只能输入数字!',
  		});
  		return false;
  	}

+ 165 - 0
gkjsjy/trunk/WebContent/static/biz/js/gkyxtjyfx/hxhbtj/hxhbtjprodetail.js

@@ -0,0 +1,165 @@
+$.namespace("hxhbtjpro.detail");
+
+hxhbtjpro.detail.path=null;
+
+hxhbtjpro.detail.wxydjselData=null;
+
+hxhbtjpro.detail.back=function(){
+		location.href=$.app+"/hxhbtjpro/main?szgkid="+$('#szgkid').val()+"&rq="+$('#rq').val();
+};
+
+hxhbtjpro.detail.save=function(){
+	// 必填非空验证
+	if(vae($('#szgkid'), "所在港口")==false){return false;}
+	if(vae($('#rq'), "日期")==false){return false;}
+	
+	// 特殊字段类型验证
+	if(van($('#yyhxts'), "远洋航线条数")==false){return false;}
+	if(van($('#yyhxhbs'), "远洋航线航班数")==false){return false;}
+	if(van($('#jyhxts'), "近洋航线条数")==false){return false;}
+	if(van($('#jyhxhbs'), "近洋航线航班数")==false){return false;}
+	if(van($('#nzxts'), "内支线条数")==false){return false;}
+	if(van($('#nzxhbs'), "内支线航班数")==false){return false;}
+	if(van($('#nmhxts'), "内贸航线条数")==false){return false;}
+	if(van($('#nmhxhbs'), "内贸航线航班数")==false){return false;}
+	if(van($('#nmjzxttl'), "月内贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#wmjzxttl'), "月外贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#nnmjzxttl'), "年内贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#nwmjzxttl'), "年外贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#bywcl'), "本月完成量")==false){return false;}
+	if(van($('#bnljl'), "本年累积量")==false){return false;}
+	//if(van($('#tbzzs'), "同比增长数")==false){return false;}
+	//if(van($('#nmtbzzs'), "内贸同比增长数")==false){return false;}
+	//if(van($('#wmtbzzs'), "外贸同比增长数")==false){return false;}
+	if(van($('#yyxkphxs'), "远洋新开辟航线数")==false){return false;}
+	if(van($('#yytkhxs'), "远洋停开航线数")==false){return false;}
+	if(van($('#jyxkphxs'), "近洋新开辟航线数")==false){return false;}
+	if(van($('#jytkhxs'), "近洋停开航线数")==false){return false;}
+	if(van($('#nzxxkphxs'), "内支线新开辟航线数")==false){return false;}
+	if(van($('#nzxtkhxs'), "内支线停开航线数")==false){return false;}
+	if(van($('#nmxkphxs'), "内贸新开辟航线数")==false){return false;}
+	if(van($('#nmtkhxs'), "内贸停开航线数")==false){return false;}
+	
+//	$("#szgkid").removeAttr("disabled");
+	$(".btn").attr("disabled",true);
+	$.ajax({
+		url:$.app+"/hxhbtjpro/save",
+		data:$("#addform").serialize(),
+		type:"post",
+		dataType:"json",
+		success:function(data){//ajax返回的数据
+			if (data.success) {
+				$.alert({
+					title: '提示',
+					content: '操作成功',
+					confirm: function(){
+						if(hxhbtjpro.detail.path!=null&&hxhbtjpro.detail.path!='') {
+							location.href=$.app+hxhbtjpro.detail.path;
+						} else {
+							location.href=$.app+"/hxhbtjpro/main?szgkid="+$('#szgkid').val()+"&rq="+$('#rq').val();
+						}
+					}
+				});
+			}else {
+				$.alert({
+					title: '提示',
+					content: data.message,
+					confirm: function(){
+						$(".btn").attr("disabled",false);
+					}
+				});
+			}
+		}
+	});
+};
+
+hxhbtjpro.detail.stat=function(){
+	// 必填非空验证
+	if(vae($('#szgkid'), "所在港口")==false){return false;}
+	if(vae($('#rq'), "日期")==false){return false;}
+	
+	location.href=$.app+"/hxhbtjpro/stat?szgkid="+$('#szgkid').val()+"&rq="+$('#rq').val();
+};
+
+hxhbtjpro.detail.saveTbzt=function(data){
+	
+	// 必填非空验证
+	if(vae($('#szgkid'), "所在港口")==false){return false;}
+	if(vae($('#rq'), "日期")==false){return false;}
+	
+	// 特殊字段类型验证
+	if(van($('#yyhxts'), "远洋航线条数")==false){return false;}
+	if(van($('#yyhxhbs'), "远洋航线航班数")==false){return false;}
+	if(van($('#jyhxts'), "近洋航线条数")==false){return false;}
+	if(van($('#jyhxhbs'), "近洋航线航班数")==false){return false;}
+	if(van($('#nzxts'), "内支线条数")==false){return false;}
+	if(van($('#nzxhbs'), "内支线航班数")==false){return false;}
+	if(van($('#nmhxts'), "内贸航线条数")==false){return false;}
+	if(van($('#nmhxhbs'), "内贸航线航班数")==false){return false;}
+	if(van($('#nmjzxttl'), "月内贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#wmjzxttl'), "月外贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#nnmjzxttl'), "年内贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#nwmjzxttl'), "年外贸集装箱吞吐量  TEU")==false){return false;}
+	if(van($('#bywcl'), "本月完成量")==false){return false;}
+	if(van($('#bnljl'), "本年累积量")==false){return false;}
+	//if(van($('#tbzzs'), "同比增长数")==false){return false;}
+	//if(van($('#nmtbzzs'), "内贸同比增长数")==false){return false;}
+	//if(van($('#wmtbzzs'), "外贸同比增长数")==false){return false;}
+	if(van($('#yyxkphxs'), "远洋新开辟航线数")==false){return false;}
+	if(van($('#yytkhxs'), "远洋停开航线数")==false){return false;}
+	if(van($('#jyxkphxs'), "近洋新开辟航线数")==false){return false;}
+	if(van($('#jytkhxs'), "近洋停开航线数")==false){return false;}
+	if(van($('#nzxxkphxs'), "内支线新开辟航线数")==false){return false;}
+	if(van($('#nzxtkhxs'), "内支线停开航线数")==false){return false;}
+	if(van($('#nmxkphxs'), "内贸新开辟航线数")==false){return false;}
+	if(van($('#nmtkhxs'), "内贸停开航线数")==false){return false;}
+	
+	 $(".btn").attr("disabled",true);
+	 $.ajax({
+			url:$.app + "/hxhbtjpro/saveTbzt",
+			data:$("#addform").serialize(),
+			type:"post",
+			dataType:"json",
+			success:function(data){//ajax返回的数据
+				if (data.success) {
+					$.alert({
+		       		    title: '提示',
+		       		    content: '提交成功',
+		       		    confirm: function(){
+		       		    	location.href=$.app+'/hxhbtjpro/main';
+		       		    }
+		       	 });
+				}else {
+					$.alert({
+		    		    title: '提示',
+		    		    content: data.message,
+		    		    confirm: function(){
+		    		    	 $(".btn").attr("disabled",false);
+		    		    }
+		    	 });
+				}
+			}
+		});
+};
+	 
+//验证不为空
+vae=function(area,name){
+ 	if(isEmpty(area.val())){
+ 		$.alert({
+ 		    title: '提示',
+ 		    content: name+'不能为空!',
+ 		});
+ 		return false;
+ 	}
+};
+
+//验证为整数或者浮点数
+van=function(area,name){
+ 	if(!isFDS(area.val())&&!isZS(area.val())){
+ 		$.alert({
+ 		    title: '提示',
+ 		    content: name+'只能输入数字!',
+ 		});
+ 		return false;
+ 	}
+};

+ 6 - 7
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -272,13 +272,12 @@ public class XmxxglCtl extends BaseWebCtl {
 		}
 
 		model.addAttribute("list", voList);
-		model.addAttribute("xmmc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmmc"));
-		model.addAttribute("xmfr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmfr"));
-		model.addAttribute("szd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid"));
-		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
-		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));
-		model.addAttribute("xmhzjbid", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmhzjbid"));
-		model.addAttribute("ztz", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ztz"));
+		model.addAttribute("xmmc", xmmc);
+		model.addAttribute("xmfr", xmfr);
+		model.addAttribute("szd", szdid);
+		model.addAttribute("szgk", szgkid);
+		model.addAttribute("szgq", szgqid);
+		model.addAttribute("xmhzjbid",xmhzjbid);
 		model.addAttribute("menuid", menuid);
 
 		// 翻页共通

+ 2 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/ctl/HxhbtjCtl.java

@@ -331,6 +331,8 @@ public class HxhbtjCtl extends BaseWebCtl {
 			szgk.setId(szgkid);
 			entity.setSzgk(szgk);
 
+			entity = hxhbtjService.save(entity);
+			
 			if ("1".equals(path)) {
 				entity.setRecordStatus(code.getRecordStatus());
 			}

+ 298 - 36
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/ctl/HxhbtjProCtl.java

@@ -6,22 +6,32 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.ggfwxxgl.hxgl.service.HxglService;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
-import com.xt.jygl.gkyxtjyfx.gkttlfx.vo.GkttlfxVo;
+import com.xt.jygl.gkyxtjyfx.hxhbtj.entity.HxhbtjEntity;
 import com.xt.jygl.gkyxtjyfx.hxhbtj.service.HxhbtjService;
 import com.xt.jygl.gkyxtjyfx.hxhbtj.vo.HxhbtjVo;
+import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
+import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
 import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.util.StringUtils;
@@ -41,51 +51,303 @@ public class HxhbtjProCtl extends BaseWebCtl {
 	private QueryService query;
 
 	@RequestMapping(value = "/main")
-	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, String rq, final String szgkid, final String menuid) throws JsonProcessingException {
-		
-		if(StringUtils.isEmpty(rq)){
+	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String rq, final String szgkid, final String menuid) throws JsonProcessingException {
+		String start = "";
+		if (StringUtils.isEmpty(rq)) {
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
-			rq = sdf.format(new Date());
+			start = sdf.format(new Date());
 		}
-		
-		List<Object> list = hxhbtjService.findAllSzd(rq);
-		List<HxhbtjVo> volist = new ArrayList<HxhbtjVo>();
-		Object[] sum = new Object[10];
-		if(list != null && list.size()>0){
-			for (Object ob : list) {
-				Object[] e = (Object[]) ob;
+		if (!StringUtils.isEmpty(szgkid)) {
+			// 查询条件
+			Specification<HxhbtjEntity> spec = new Specification<HxhbtjEntity>() {
+				@Override
+				public Predicate toPredicate(Root<HxhbtjEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+					List<Predicate> list = new ArrayList<Predicate>();
+					// 所在港口
+					if (StringUtils.isNotEmpty(szgkid)) {
+						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+					}
+					// 日期
+					if (rq != null) {
+						list.add(cb.like(root.get("rq").as(String.class), "%" + rq + "%"));
+					} else {
+						SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+						list.add(cb.like(root.get("rq").as(String.class), "%" + sdf.format(new Date()) + "%"));
+					}
+
+					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+					return cb.and(list.toArray(new Predicate[] {}));
+				}
+			};
+
+			Page<HxhbtjEntity> list = query.findAll(spec, toPageRequest(page), HxhbtjEntity.class);
+			List<HxhbtjVo> svoList = new ArrayList<HxhbtjVo>();
+			for (HxhbtjEntity entity : list) {
 				HxhbtjVo vo = new HxhbtjVo();
-				vo.setSzd((String) e[0]);
-				vo.setYyhxts(e[1].toString());
-				vo.setYyhxhbs(e[2].toString());
-				vo.setJyhxts(e[3].toString());
-				vo.setJyhxhbs(e[4].toString());
-				vo.setNzxts(e[5].toString());
-				vo.setNzxhbs(e[6].toString());
-				vo.setNmhxts(e[7].toString());
-				vo.setNmhxhbs(e[8].toString());
-				volist.add(vo);
-				for (int j = 1; j < e.length; j++) {
-					BigDecimal s = new BigDecimal(0.0000);
-					if (sum[j] != null) {
-						s = (BigDecimal) sum[j];
+				if (entity != null) {
+					BeanUtils.copyProperties(entity, vo);
+					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+					vo.setBywcl(entity.getBywcl() != null ? entity.getBywcl().toString() : "");
+					vo.setBnljl(entity.getBnljl() != null ? entity.getBnljl().toString() : "");
+					vo.setTbzzs(entity.getTbzzs() != null ? entity.getTbzzs().toString() : "");
+					vo.setRq(entity.getRq() != null ? entity.getRq().toString() : "");
+					vo.setRecordStatus(entity.getRecordStatus());
+					svoList.add(vo);
+				}
+			}
+
+			model.addAttribute("list", svoList);
+			model.addAttribute("menuid", menuid);
+			model.addAttribute("szgkid", szgkid);
+			model.addAttribute("rq", rq);
+			// 翻页共通
+			putPageInfo(model, page, list);
+		} else {
+			List<Object> slist = hxhbtjService.findAllSzd(rq != null ? rq : start);
+			List<HxhbtjVo> volist = new ArrayList<HxhbtjVo>();
+			Object[] sum = new Object[10];
+			if (slist != null && slist.size() > 0) {
+				for (Object ob : slist) {
+					Object[] e = (Object[]) ob;
+					HxhbtjVo vo = new HxhbtjVo();
+					vo.setSzd((String) e[0]);
+					vo.setYyhxts(e[1].toString());
+					vo.setYyhxhbs(e[2].toString());
+					vo.setJyhxts(e[3].toString());
+					vo.setJyhxhbs(e[4].toString());
+					vo.setNzxts(e[5].toString());
+					vo.setNzxhbs(e[6].toString());
+					vo.setNmhxts(e[7].toString());
+					vo.setNmhxhbs(e[8].toString());
+					volist.add(vo);
+					for (int j = 1; j < e.length; j++) {
+						BigDecimal s = new BigDecimal(0.0000);
+						if (sum[j] != null) {
+							s = (BigDecimal) sum[j];
+						}
+						BigDecimal ss = (BigDecimal) e[j];
+						s = s.add(ss);
+						sum[j] = s;
 					}
-					BigDecimal ss = (BigDecimal) e[j];
-					s = s.add(ss);
-					sum[j] = s;
 				}
 			}
-		}
-		for (int i = 0; i < sum.length; i++) {
-			if (sum[i] != null) {
-				model.addAttribute("a" + i, sum[i].toString());
+			for (int i = 0; i < sum.length; i++) {
+				if (sum[i] != null) {
+					model.addAttribute("a" + i, sum[i].toString());
+				}
 			}
+			model.addAttribute("volist", volist);
+			model.addAttribute("rq", rq != null ? rq : start);
+			model.addAttribute("menuid", menuid);
 		}
-		model.addAttribute("volist", volist);
-		model.addAttribute("rq", rq);
-		model.addAttribute("menuid", menuid);
 		return "gkyxtjyfx/hxhbtj/hxhbtjpro";
 	}
 
+	@RequestMapping(value = "/view")
+	public String view(Model model, String id, String menuid) {
+		HxhbtjEntity entity = hxhbtjService.findOne(id);
+		HxhbtjVo vo = new HxhbtjVo();
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setBywcl(entity.getBywcl() != null ? entity.getBywcl().toString() : "");
+		vo.setBnljl(entity.getBnljl() != null ? entity.getBnljl().toString() : "");
+		vo.setTbzzs(entity.getTbzzs() != null ? entity.getTbzzs().toString() : "");
+		vo.setRq(entity.getRq() != null ? entity.getRq().toString() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		// 月内外贸完成量
+		vo.setNmjzxttl(entity.getNmjzxttl() != null ? entity.getNmjzxttl().toString() : "");
+		vo.setWmjzxttl(entity.getWmjzxttl() != null ? entity.getWmjzxttl().toString() : "");
+
+		// 年内外贸完成量
+		vo.setNnmjzxttl(entity.getNnmjzxttl() != null ? entity.getNnmjzxttl().toString() : "");
+		vo.setNwmjzxttl(entity.getNwmjzxttl() != null ? entity.getNwmjzxttl().toString() : "");
+
+		// 内外贸同比增长数
+		vo.setNmtbzzs(entity.getNmtbzzs() != null ? entity.getNmtbzzs().toString() : "");
+		vo.setWmtbzzs(entity.getWmtbzzs() != null ? entity.getWmtbzzs().toString() : "");
+
+		// 本月运营航线、航班数
+		vo.setYyhxts(entity.getYyhxts() != null ? entity.getYyhxts().toString() : "");
+		vo.setYyhxhbs(entity.getYyhxhbs() != null ? entity.getYyhxhbs().toString() : "");
+		vo.setJyhxts(entity.getJyhxts() != null ? entity.getJyhxts().toString() : "");
+		vo.setJyhxhbs(entity.getJyhxhbs() != null ? entity.getJyhxhbs().toString() : "");
+
+		vo.setNzxts(entity.getNzxts() != null ? entity.getNzxts().toString() : "");
+		vo.setNzxhbs(entity.getNzxhbs() != null ? entity.getNzxhbs().toString() : "");
+		vo.setNmhxts(entity.getNmhxts() != null ? entity.getNmhxts().toString() : "");
+		vo.setNmhxhbs(entity.getNmhxhbs() != null ? entity.getNmhxhbs().toString() : "");
+
+		// 新开辟航线数
+		vo.setYyxkphxs(entity.getYyxkphxs() != null ? entity.getYyxkphxs().toString() : "");
+		vo.setYytkhxs(entity.getYytkhxs() != null ? entity.getYytkhxs().toString() : "");
+		vo.setJyxkphxs(entity.getJyxkphxs() != null ? entity.getJyxkphxs().toString() : "");
+		vo.setJytkhxs(entity.getJytkhxs() != null ? entity.getJytkhxs().toString() : "");
+
+		// 停开航线数
+		vo.setNzxxkphxs(entity.getNzxxkphxs() != null ? entity.getNzxxkphxs().toString() : "");
+		vo.setNzxtkhxs(entity.getNzxtkhxs() != null ? entity.getNzxtkhxs().toString() : "");
+		vo.setNmxkphxs(entity.getNmxkphxs() != null ? entity.getNmxkphxs().toString() : "");
+		vo.setNmtkhxs(entity.getNmtkhxs() != null ? entity.getNmtkhxs().toString() : "");
+
+		// 填表人跟联系电话
+		vo.setTbr(securityMgr.getCurrUser().getName());
+		if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+			vo.setLxdh(securityMgr.getCurrUser().getSsjyr().getLxdh());
+		} else {
+			vo.setLxdh(securityMgr.getCurrUser().getSsglbm() != null ? securityMgr.getCurrUser().getSsglbm().getLxdh() : "");
+		}
+
+		model.addAttribute("record", vo);
+		model.addAttribute("menuid", menuid);
+		return "gkyxtjyfx/hxhbtj/hxhbtjproView";
+	}
+	
+	@RequestMapping(value = "/edit")
+	public String edit(Model model, String id, String path) {
+		if (!StringUtils.isEmpty(path)) {
+			path = path.replace(":", "&");
+		}
+		model.addAttribute("path", path);
+		HxhbtjEntity entity = hxhbtjService.findOne(id);
+		HxhbtjVo vo = new HxhbtjVo();
+		BeanUtils.copyProperties(entity, vo);
+		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
+		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
+		vo.setBywcl(entity.getBywcl() != null ? entity.getBywcl().toString() : "");
+		vo.setBnljl(entity.getBnljl() != null ? entity.getBnljl().toString() : "");
+		vo.setTbzzs(entity.getTbzzs() != null ? entity.getTbzzs().toString() : "");
+		vo.setRq(entity.getRq() != null ? entity.getRq().toString() : "");
+
+		// 月内外贸完成量
+		vo.setNmjzxttl(entity.getNmjzxttl() != null ? entity.getNmjzxttl().toString() : "");
+		vo.setWmjzxttl(entity.getWmjzxttl() != null ? entity.getWmjzxttl().toString() : "");
+
+		// 年内外贸完成量
+		vo.setNnmjzxttl(entity.getNnmjzxttl() != null ? entity.getNnmjzxttl().toString() : "");
+		vo.setNwmjzxttl(entity.getNwmjzxttl() != null ? entity.getNwmjzxttl().toString() : "");
+
+		// 内外贸同比增长数
+		vo.setNmtbzzs(entity.getNmtbzzs() != null ? entity.getNmtbzzs().toString() : "");
+		vo.setWmtbzzs(entity.getWmtbzzs() != null ? entity.getWmtbzzs().toString() : "");
+
+		// 本月运营航线、航班数
+		vo.setYyhxts(entity.getYyhxts() != null ? entity.getYyhxts().toString() : "");
+		vo.setYyhxhbs(entity.getYyhxhbs() != null ? entity.getYyhxhbs().toString() : "");
+		vo.setJyhxts(entity.getJyhxts() != null ? entity.getJyhxts().toString() : "");
+		vo.setJyhxhbs(entity.getJyhxhbs() != null ? entity.getJyhxhbs().toString() : "");
+
+		vo.setNzxts(entity.getNzxts() != null ? entity.getNzxts().toString() : "");
+		vo.setNzxhbs(entity.getNzxhbs() != null ? entity.getNzxhbs().toString() : "");
+		vo.setNmhxts(entity.getNmhxts() != null ? entity.getNmhxts().toString() : "");
+		vo.setNmhxhbs(entity.getNmhxhbs() != null ? entity.getNmhxhbs().toString() : "");
+
+		// 新开辟航线数
+		vo.setYyxkphxs(entity.getYyxkphxs() != null ? entity.getYyxkphxs().toString() : "");
+		vo.setYytkhxs(entity.getYytkhxs() != null ? entity.getYytkhxs().toString() : "");
+		vo.setJyxkphxs(entity.getJyxkphxs() != null ? entity.getJyxkphxs().toString() : "");
+		vo.setJytkhxs(entity.getJytkhxs() != null ? entity.getJytkhxs().toString() : "");
+
+		// 停开航线数
+		vo.setNzxxkphxs(entity.getNzxxkphxs() != null ? entity.getNzxxkphxs().toString() : "");
+		vo.setNzxtkhxs(entity.getNzxtkhxs() != null ? entity.getNzxtkhxs().toString() : "");
+		vo.setNmxkphxs(entity.getNmxkphxs() != null ? entity.getNmxkphxs().toString() : "");
+		vo.setNmtkhxs(entity.getNmtkhxs() != null ? entity.getNmtkhxs().toString() : "");
+
+		// 填表人跟联系电话
+		vo.setTbr(securityMgr.getCurrUser().getName());
+		if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+			vo.setLxdh(securityMgr.getCurrUser().getSsjyr().getLxdh());
+		} else {
+			vo.setLxdh(securityMgr.getCurrUser().getSsglbm() != null ? securityMgr.getCurrUser().getSsglbm().getLxdh() : "");
+		}
+		model.addAttribute("record", vo);
+		model.addAttribute("szgkid", entity.getSzgk().getId());
+		return "gkyxtjyfx/hxhbtj/hxhbtjproEdit";
+	}
 	
+	@RequestMapping(value = "/save")
+	@ResponseBody
+	public WebJsonResult save(Model model, String path, String szgkid, String rq, HxhbtjEntity code) {
+		WebJsonResult wr = success();
+		if (StringUtils.isEmpty(szgkid)) {
+			wr.setSuccess(false);
+			wr.setMessage("请选择所在港口!");
+			return wr;
+		}
+		if (StringUtils.isEmpty(rq)) {
+			wr.setSuccess(false);
+			wr.setMessage("请选择日期!");
+			return wr;
+		}
+		// 日期、港口不能重复
+		List<Object> cf = hxhbtjService.cf(rq, szgkid);
+		if (cf != null && cf.size() != 0 && StringUtils.isEmpty(code.getId())) {
+			wr.setSuccess(false);
+			wr.setMessage("该日期已存在记录!");
+			return wr;
+		}
+		HxhbtjEntity entity = new HxhbtjEntity();
+		try {
+			if (!StringUtils.isEmpty(code.getId())) {
+				entity = hxhbtjService.findOne(code.getId());
+			}
+			entity.setBywcl(code.getBywcl());
+			entity.setBnljl(code.getBnljl());
+			entity.setTbzzs(code.getTbzzs());
+			entity.setRq(code.getRq());
+
+			// 月内外贸完成量
+			entity.setNmjzxttl(code.getNmjzxttl());
+			entity.setWmjzxttl(code.getWmjzxttl());
+
+			// 年内外贸完成量
+			entity.setNnmjzxttl(code.getNnmjzxttl());
+			entity.setNwmjzxttl(code.getNwmjzxttl());
+
+			// 内外贸同比增长数
+			entity.setNmtbzzs(code.getNmtbzzs());
+			entity.setWmtbzzs(code.getWmtbzzs());
+
+			// 本月运营航线、航班数
+			entity.setYyhxts(code.getYyhxts());
+			entity.setYyhxhbs(code.getYyhxhbs());
+			entity.setJyhxts(code.getJyhxts());
+			entity.setJyhxhbs(code.getJyhxhbs());
+
+			entity.setNzxts(code.getNzxts());
+			entity.setNzxhbs(code.getNzxhbs());
+			entity.setNmhxts(code.getNmhxts());
+			entity.setNmhxhbs(code.getNmhxhbs());
+
+			// 新开辟航线数
+			entity.setYyxkphxs(code.getYyxkphxs());
+			entity.setYytkhxs(code.getYytkhxs());
+			entity.setJyxkphxs(code.getJyxkphxs());
+			entity.setJytkhxs(code.getJytkhxs());
+
+			// 停开航线数
+			entity.setNzxxkphxs(code.getNzxxkphxs());
+			entity.setNzxtkhxs(code.getNzxtkhxs());
+			entity.setNmxkphxs(code.getNmxkphxs());
+			entity.setNmtkhxs(code.getNmtkhxs());
+
+			if(!StringUtils.isEmpty(szgkid)){
+				GkEntity szgk = gkService.findOne(szgkid);
+				entity.setSzgk(szgk);
+				entity.setSzd(szgk.getSzd());
+			}
+			
+			entity = hxhbtjService.save(entity);
+			
+			if ("1".equals(path)) {
+				entity.setRecordStatus(code.getRecordStatus());
+			}
+			hxhbtjService.save(entity);
+		} catch (Exception e) {
+			wr.setSuccess(false);
+			wr.setMessage("操作失败!");
+			e.printStackTrace();
+		}
+		return wr;
+	}
 }

+ 94 - 93
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/entity/HxhbtjEntity.java

@@ -15,6 +15,7 @@ import com.xtframe.sec.common.BaseEntity;
 
 /**
  * 航线航班统计Entity
+ * 
  * @author guxl2
  *
  */
@@ -26,40 +27,40 @@ public class HxhbtjEntity extends BaseEntity<String> implements Cloneable {
 	 * 
 	 */
 	private static final long serialVersionUID = -3184732392767118611L;
-	
-	private Integer yyhxts; //远洋航线条数
-	private Integer yyhxhbs; //远洋航线航班数
-	private String yyhxbz; //远洋航线备注
-	private Integer jyhxts; //近洋航线条数
-	private Integer jyhxhbs; //近洋航线航班数
-	private String jyhxbz; //近洋航线备注
-	private Integer nzxts; //内支线条数
-	private Integer nzxhbs; //内支线航班数
-	private String nzxbz; //内支线备注
-	private Integer nmhxts; //内贸航线条数
-	private Integer nmhxhbs; //内贸航线航班数
-	private String nmhxbz; //内贸航线备注
-	private GkEntity szgk; //所在港口
-	private String id; //ID
-	private Double nmjzxttl; //月内贸集装箱吞吐量  TEU
-	private Double wmjzxttl; //月外贸集装箱吞吐量  TEU
-	
-	private Double nnmjzxttl; //年内贸集装箱吞吐量  TEU
-	private Double nwmjzxttl; //年外贸集装箱吞吐量  TEU
-	private Double bywcl; //本月完成量
-	private Double bnljl; //本年累积量
-	private Double tbzzs; //同比增长数
-	private Double nmtbzzs; //内贸同比增长数
-	private Double wmtbzzs; //外贸同比增长数
-	private Integer yyxkphxs; //远洋新开辟航线数
-	private Integer yytkhxs; //远洋停开航线数
-	private Integer jyxkphxs; //近洋新开辟航线数
-	private Integer jytkhxs; //近洋停开航线数
-	private Integer nzxxkphxs; //内支线新开辟航线数
-	private Integer nzxtkhxs; //内支线停开航线数
-	private Integer nmxkphxs; //内贸新开辟航线数
-	private Integer nmtkhxs; //内贸停开航线数
-	private String rq; //日期
+
+	private Double yyhxts; // 远洋航线条数
+	private Double yyhxhbs; // 远洋航线航班数
+	private String yyhxbz; // 远洋航线备注
+	private Double jyhxts; // 近洋航线条数
+	private Double jyhxhbs; // 近洋航线航班数
+	private String jyhxbz; // 近洋航线备注
+	private Double nzxts; // 内支线条数
+	private Double nzxhbs; // 内支线航班数
+	private String nzxbz; // 内支线备注
+	private Double nmhxts; // 内贸航线条数
+	private Double nmhxhbs; // 内贸航线航班数
+	private String nmhxbz; // 内贸航线备注
+	private GkEntity szgk; // 所在港口
+	private String id; // ID
+	private Double nmjzxttl; // 月内贸集装箱吞吐量 TEU
+	private Double wmjzxttl; // 月外贸集装箱吞吐量 TEU
+
+	private Double nnmjzxttl; // 年内贸集装箱吞吐量 TEU
+	private Double nwmjzxttl; // 年外贸集装箱吞吐量 TEU
+	private Double bywcl; // 本月完成量
+	private Double bnljl; // 本年累积量
+	private Double tbzzs; // 同比增长数
+	private Double nmtbzzs; // 内贸同比增长数
+	private Double wmtbzzs; // 外贸同比增长数
+	private Double yyxkphxs; // 远洋新开辟航线数
+	private Double yytkhxs; // 远洋停开航线数
+	private Double jyxkphxs; // 近洋新开辟航线数
+	private Double jytkhxs; // 近洋停开航线数
+	private Double nzxxkphxs; // 内支线新开辟航线数
+	private Double nzxtkhxs; // 内支线停开航线数
+	private Double nmxkphxs; // 内贸新开辟航线数
+	private Double nmtkhxs; // 内贸停开航线数
+	private String rq; // 日期
 
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
@@ -71,95 +72,95 @@ public class HxhbtjEntity extends BaseEntity<String> implements Cloneable {
 	public void setId(String id) {
 		this.id = id;
 	}
-	
-	public Integer getYyhxts() {
+
+	public Double getYyhxts() {
 		return yyhxts;
 	}
 
-	public void setYyhxts(Integer yyhxts) {
+	public void setYyhxts(Double yyhxts) {
 		this.yyhxts = yyhxts;
 	}
 
-	public Integer getYyhxhbs() {
+	public Double getYyhxhbs() {
 		return yyhxhbs;
 	}
 
-	public void setYyhxhbs(Integer yyhxhbs) {
+	public void setYyhxhbs(Double yyhxhbs) {
 		this.yyhxhbs = yyhxhbs;
 	}
 
-	public String getYyhxbz() {
-		return yyhxbz;
-	}
-
-	public void setYyhxbz(String yyhxbz) {
-		this.yyhxbz = yyhxbz;
-	}
-
-	public Integer getJyhxts() {
+	public Double getJyhxts() {
 		return jyhxts;
 	}
 
-	public void setJyhxts(Integer jyhxts) {
+	public void setJyhxts(Double jyhxts) {
 		this.jyhxts = jyhxts;
 	}
 
-	public Integer getJyhxhbs() {
+	public Double getJyhxhbs() {
 		return jyhxhbs;
 	}
 
-	public void setJyhxhbs(Integer jyhxhbs) {
+	public void setJyhxhbs(Double jyhxhbs) {
 		this.jyhxhbs = jyhxhbs;
 	}
 
-	public String getJyhxbz() {
-		return jyhxbz;
-	}
-
-	public void setJyhxbz(String jyhxbz) {
-		this.jyhxbz = jyhxbz;
-	}
-
-	public Integer getNzxts() {
+	public Double getNzxts() {
 		return nzxts;
 	}
 
-	public void setNzxts(Integer nzxts) {
+	public void setNzxts(Double nzxts) {
 		this.nzxts = nzxts;
 	}
 
-	public Integer getNzxhbs() {
+	public Double getNzxhbs() {
 		return nzxhbs;
 	}
 
-	public void setNzxhbs(Integer nzxhbs) {
+	public void setNzxhbs(Double nzxhbs) {
 		this.nzxhbs = nzxhbs;
 	}
 
-	public String getNzxbz() {
-		return nzxbz;
-	}
-
-	public void setNzxbz(String nzxbz) {
-		this.nzxbz = nzxbz;
-	}
-
-	public Integer getNmhxts() {
+	public Double getNmhxts() {
 		return nmhxts;
 	}
 
-	public void setNmhxts(Integer nmhxts) {
+	public void setNmhxts(Double nmhxts) {
 		this.nmhxts = nmhxts;
 	}
 
-	public Integer getNmhxhbs() {
+	public Double getNmhxhbs() {
 		return nmhxhbs;
 	}
 
-	public void setNmhxhbs(Integer nmhxhbs) {
+	public void setNmhxhbs(Double nmhxhbs) {
 		this.nmhxhbs = nmhxhbs;
 	}
 
+	public String getYyhxbz() {
+		return yyhxbz;
+	}
+
+	public void setYyhxbz(String yyhxbz) {
+		this.yyhxbz = yyhxbz;
+	}
+
+	public String getJyhxbz() {
+		return jyhxbz;
+	}
+
+	public void setJyhxbz(String jyhxbz) {
+		this.jyhxbz = jyhxbz;
+	}
+
+	public String getNzxbz() {
+		return nzxbz;
+	}
+
+	public void setNzxbz(String nzxbz) {
+		this.nzxbz = nzxbz;
+	}
+
 	public String getNmhxbz() {
 		return nmhxbz;
 	}
@@ -183,7 +184,7 @@ public class HxhbtjEntity extends BaseEntity<String> implements Cloneable {
 	public void setWmjzxttl(Double wmjzxttl) {
 		this.wmjzxttl = wmjzxttl;
 	}
-	
+
 	public Double getNnmjzxttl() {
 		return nnmjzxttl;
 	}
@@ -240,67 +241,67 @@ public class HxhbtjEntity extends BaseEntity<String> implements Cloneable {
 		this.wmtbzzs = wmtbzzs;
 	}
 
-	public Integer getYyxkphxs() {
+	public Double getYyxkphxs() {
 		return yyxkphxs;
 	}
 
-	public void setYyxkphxs(Integer yyxkphxs) {
+	public void setYyxkphxs(Double yyxkphxs) {
 		this.yyxkphxs = yyxkphxs;
 	}
 
-	public Integer getYytkhxs() {
+	public Double getYytkhxs() {
 		return yytkhxs;
 	}
 
-	public void setYytkhxs(Integer yytkhxs) {
+	public void setYytkhxs(Double yytkhxs) {
 		this.yytkhxs = yytkhxs;
 	}
 
-	public Integer getJyxkphxs() {
+	public Double getJyxkphxs() {
 		return jyxkphxs;
 	}
 
-	public void setJyxkphxs(Integer jyxkphxs) {
+	public void setJyxkphxs(Double jyxkphxs) {
 		this.jyxkphxs = jyxkphxs;
 	}
 
-	public Integer getJytkhxs() {
+	public Double getJytkhxs() {
 		return jytkhxs;
 	}
 
-	public void setJytkhxs(Integer jytkhxs) {
+	public void setJytkhxs(Double jytkhxs) {
 		this.jytkhxs = jytkhxs;
 	}
 
-	public Integer getNzxxkphxs() {
+	public Double getNzxxkphxs() {
 		return nzxxkphxs;
 	}
 
-	public void setNzxxkphxs(Integer nzxxkphxs) {
+	public void setNzxxkphxs(Double nzxxkphxs) {
 		this.nzxxkphxs = nzxxkphxs;
 	}
 
-	public Integer getNzxtkhxs() {
+	public Double getNzxtkhxs() {
 		return nzxtkhxs;
 	}
 
-	public void setNzxtkhxs(Integer nzxtkhxs) {
+	public void setNzxtkhxs(Double nzxtkhxs) {
 		this.nzxtkhxs = nzxtkhxs;
 	}
 
-	public Integer getNmxkphxs() {
+	public Double getNmxkphxs() {
 		return nmxkphxs;
 	}
 
-	public void setNmxkphxs(Integer nmxkphxs) {
+	public void setNmxkphxs(Double nmxkphxs) {
 		this.nmxkphxs = nmxkphxs;
 	}
 
-	public Integer getNmtkhxs() {
+	public Double getNmtkhxs() {
 		return nmtkhxs;
 	}
 
-	public void setNmtkhxs(Integer nmtkhxs) {
+	public void setNmtkhxs(Double nmtkhxs) {
 		this.nmtkhxs = nmtkhxs;
 	}
 
@@ -313,7 +314,7 @@ public class HxhbtjEntity extends BaseEntity<String> implements Cloneable {
 	public void setSzgk(GkEntity szgk) {
 		this.szgk = szgk;
 	}
-	
+
 	public String getRq() {
 		return rq;
 	}

+ 9 - 1
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/vo/HxhbtjVo.java

@@ -1,6 +1,5 @@
 package com.xt.jygl.gkyxtjyfx.hxhbtj.vo;
 
-import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xtframe.sec.common.BaseVo;
 
 public class HxhbtjVo extends BaseVo {
@@ -60,6 +59,7 @@ public class HxhbtjVo extends BaseVo {
 	private String lxdh = null;
 	//所在港口
 	private String szgkzw = null;
+	private String szgk = null;
 	//日期
 	private String rq = null;
 	
@@ -87,6 +87,14 @@ public class HxhbtjVo extends BaseVo {
 	private String nmxkphxs = null; //内贸新开辟航线数
 	private String nmtkhxs = null; //内贸停开航线数
 
+	public String getSzgk() {
+		return szgk;
+	}
+
+	public void setSzgk(String szgk) {
+		this.szgk = szgk;
+	}
+
 	public String getYyhxts() {
 		return yyhxts;
 	}