首页 发现 帮助
注册 登录
hs
/
jsgkj
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

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

ld_xuhx 8 年之前
父节点
187f3a5bcb
当前提交
8a7bcd045b
共有 45 个文件被更改，包括 2468 次插入 和 548 次删除
分列视图 显示文件统计
  1. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/editLhxkz.jsp
  2. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/editxkz.jsp
  3. 802 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hzttltj/hzttltj.jsp
  4. 225 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hzttltj/jzxttltj.jsp
  5. 174 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hzttltj/jzxxltj.jsp
  6. 78 0
      gkjsjy/trunk/WebContent/static/biz/js/gkyxtjyfx/hzttltj/hzttltj.js
  7. 1 1
      gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/hxhbgl/ctl/HxhbglCtl.java
  8. 24 0
      gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/ctl/JdtxxxCtl.java
  9. 60 35
      gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/tzgg/ggxx/ctl/GgxxCtl.java
  10. 23 54
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/ax/ctl/AxCtl.java
  11. 1 21
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/cb/ctl/CbCtl.java
  12. 34 50
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/fbd/ctl/FbdCtl.java
  13. 0 28
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gk/ctl/GkCtl.java
  14. 1 45
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gq/ctl/GqCtl.java
  15. 38 0
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/jghd/ctl/JghdCtl.java
  16. 4 43
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/md/ctl/MdCtl.java
  17. 15 43
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/zyq/ctl/ZyqCtl.java
  18. 22 15
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/ctl/TzjhglCtl.java
  19. 22 50
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java
  20. 20 22
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbybbCtl.java
  21. 212 24
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/service/impl/DcsbServiceImpl.java
  22. 1 1
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrcg/ctl/CgCtl.java
  23. 1 1
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrck/ctl/CkCtl.java
  24. 1 1
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrdc/ctl/DcCtl.java
  25. 2 94
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java
  26. 14 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/qytz/ctl/QytzCtl.java
  27. 15 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/ry/ctl/RyCtl.java
  28. 14 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/sssb/ctl/SssbCtl.java
  29. 1 1
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java
  30. 6 6
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java
  31. 15 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/dcttltj/ctl/DcttltjCtl.java
  32. 8 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkjcssjsfx/ctl/GkjcssjsfxCtl.java
  33. 15 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkttlfx/ctl/HwttlfzCtl.java
  34. 8 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/ctl/HxhbtjCtl.java
  35. 210 5
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/ctl/HzttltjCtl.java
  36. 129 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/ctl/JzxttltjCtl.java
  37. 88 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/ctl/JzxxltjCtl.java
  38. 9 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/dao/HzttlDao.java
  39. 19 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/dao/JzxttltjDao.java
  40. 5 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/service/HzttlService.java
  41. 14 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/service/impl/HzttlServiceImpl.java
  42. 42 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/service/impl/jzxttltjServiceImpl.java
  43. 12 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/service/jzxttltjService.java
  44. 28 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/vo/HzttlVo.java
  45. 47 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/vo/JzxxlVo.java

+ 3 - 3
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/editLhxkz.jsp
查看文件 

@@ -76,7 +76,7 @@
 
 					<tr>

 						<th><span class="needwrite">*</span>公司名称:&nbsp;</th>

 						<td colspan="3">

-                        	<input type="text" class="form-control" readonly="readonly" value="${record.gkjyrzw}">

+                        	<input type="text" class="form-control"  value="${record.gkjyrzw}">

                         	<input type="hidden" class="form-control" id="gkjyr" name="gkjyr"  value="${record.gkjyr}">

                         </td>

                         

@@ -84,13 +84,13 @@
 
 					<tr>

 					<th><span class="needwrite">*</span>法定代表人:&nbsp;</th>

 						<td colspan="3">

-							<input type="text" class="form-control" id="fddbr"  name="fddbr" readonly="readonly"  value="${record.fddbr}">

+							<input type="text" class="form-control" id="fddbr"  name="fddbr"   value="${record.fddbr}">

 						</td>

 					</tr>

 					<tr>

 					<th><span class="needwrite">*</span>办公地址:&nbsp;</th>

 						<td colspan="3">

-							<input type="text" class="form-control" id="dz"  value="${record.dz}" readonly="readonly"  name="dz">

+							<input type="text" class="form-control" id="dz"  value="${record.dz}"   name="dz">

 						</td>

 					</tr>

 					<tr >

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/editxkz.jsp
查看文件 

@@ -76,7 +76,7 @@
 
 					<tr>

 						<th><span class="needwrite">*</span>公司名称:&nbsp;</th>

 						<td colspan="3">

-                        	<input type="text" class="form-control" readonly="readonly" value="${record.gkjyrzw}">

+                        	<input type="text" class="form-control"  value="${record.gkjyrzw}">

                         	<input type="hidden" class="form-control" id="gkjyr" name="gkjyr"  value="${record.gkjyr}">

                         </td>

                         

@@ -84,25 +84,25 @@
 
 					<tr>

 					<th><span class="needwrite">*</span>法定代表人:&nbsp;</th>

 						<td colspan="3">

-							<input type="text" class="form-control" id="fddbr"  name="fddbr" readonly="readonly"  value="${record.fddbr}">

+							<input type="text" class="form-control" id="fddbr"  name="fddbr"   value="${record.fddbr}">

 						</td>

 					</tr>

 					<tr>

 					<th><span class="needwrite">*</span>办公地址:&nbsp;</th>

 						<td colspan="3">

-							<input type="text" class="form-control" id="dz"  value="${record.dz}" readonly="readonly"  name="dz">

+							<input type="text" class="form-control" id="dz"  value="${record.dz}"   name="dz">

 						</td>

 					</tr>

 					<tr >

 						<th><span class="needwrite">*</span>经营地域:&nbsp;</th>

 						<td colspan="3">

-							<input type="text" class="form-control" id="cq" name="cq" readonly="readonly"  value="${record.cq}">

+							<input type="text" class="form-control" id="cq" name="cq"   value="${record.cq}">

 						</td>

 					</tr>

 					<tr>

 						<th><span class="needwrite">*</span>经营范围:&nbsp;</th>

 						<td colspan="3">

-							<input type="text" class="form-control" id="zyqyfw" name="zyqyfw" readonly="readonly"  value="${record.zyqyfw}">

+							<input type="text" class="form-control" id="zyqyfw" name="zyqyfw"   value="${record.zyqyfw}">

 						</td>

 					</tr>

 					<tr>

+ 802 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hzttltj/hzttltj.jsp
查看文件 

@@ -0,0 +1,802 @@
 
+<!DOCTYPE html >

+<html >

+<%@ page language="java" contentType="text/html; charset=UTF-8"

+	pageEncoding="UTF-8"%>

+<%@ page import="java.text.SimpleDateFormat"%>

+ <%@ include file="../../common.jsp"%>

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+<title>单船吞吐量统计</title>

+</head>

+<link rel="stylesheet" type="text/css"	href="${app }/static/css/public.css" />

+<link rel="stylesheet" type="text/css"	href="${app }/static/css/other.css" />

+<script type="text/javascript" src="${app }/static/js/highcharts.js"></script>

+<script type="text/javascript" src="${app }/static/js/exporting.js"></script>

+<script type="text/javascript" src="${app }/static/js/highcharts-3d.js"></script>

+<script type="text/javascript" src="${app }/static/biz/js/gkyxtjyfx/hzttltj/hzttltj.js"></script>

+<script type="text/javascript">

+	$(document).ready(function () {

+		hzttltj.main.init();

+		iFrameHeightIframe('${menuid}');//自适应高度

+	});

+

+	

+	$(function () {

+		var list = '${list}';

+		var zttl=[];

+		var name=[];

+		var hb=[];

+		var tb=[]

+		

+	    $.each(JSON.parse(list), function (n, value) {

+	    	name[n]=value.tjmonth+"月";

+	    	zttl[n]=value.ttl;

+	    	hb[n]=value.hb;

+	    	tb[n]=value.tb;

+	  	});

+	    $('#container').highcharts({

+	    	title:{

+	    		text:""

+	    	},

+	        chart: {

+	            zoomType: 'xy'

+	        },

+	        xAxis: [{

+	            categories: eval(name)

+	        }],

+	        yAxis: [{ // Primary yAxis

+	        	min:-20,

+	        	max:50,

+	            labels: {

+	                formatter: function() {

+	                    return this.value +'%';

+	                },

+	                style: {

+	                    color: '#89A54E'

+	                }

+	            },

+	            title: {

+	                text: '同比增长率',

+	                style: {

+	                    color: '#89A54E'

+	                }

+	            },

+	            opposite: true,

+

+	        }, { // Secondary yAxis

+	        	min:0,

+	        	max:100,

+	            gridLineWidth: 0,

+	            title: {

+	                text: '吞吐量',

+	                style: {

+	                    color: '#4572A7'

+	                }

+	            },

+	            labels: {

+	                formatter: function() {

+	                    return this.value +' 吨';

+	                },

+	                style: {

+	                    color: '#4572A7'

+	                }

+	            }

+

+	        }, { // Tertiary yAxis

+	        	min:-20,

+	        	max:50,

+	            gridLineWidth: 0,

+	            title: {

+	                text: '环比增长率',

+	                style: {

+	                    color: '#AA4643'

+	                }

+	            },

+	            labels: {

+	                formatter: function() {

+	                    return this.value +' %';

+	                },

+	                style: {

+	                    color: '#AA4643'

+	                }

+	            },

+	            opposite: true

+	        }],

+	        tooltip: {

+	            shared: true

+	        },

+	        legend: {

+	            layout: 'vertical',

+	            align: 'left',

+	            x: 120,

+	            verticalAlign: 'top',

+	            y: 80,

+	            floating: true,

+	            backgroundColor: '#FFFFFF'

+	        },

+	        series: [{

+	            name: '吞吐量',

+	            color: '#4572A7',

+	            type: 'column',

+	            yAxis: 1,

+	            data: eval('['+zttl+']'),

+	            tooltip: {

+	                valueSuffix: ' 吨'

+	            }

+

+	        }, {

+	            name: '环比增长率',

+	            type: 'spline',

+	            color: '#AA4643',

+	            yAxis: 2,

+	            data: eval('['+hb+']'),

+	            marker: {

+	                enabled: false

+	            },

+	            dashStyle: 'shortdot',

+	            tooltip: {

+	                valueSuffix: ' %'

+	            }

+

+	        }, {

+	            name: '同比增长率',

+	            color: '#89A54E',

+	            type: 'spline',

+	            data: eval('['+tb+']'),

+	            tooltip: {

+	                valueSuffix: ' %'

+	            }

+	        }]

+	    });

+	});	

+</script>

+<style type="text/css">

+.main_table td{

+text-align:left;

+padding-left:20px;

+width:50px;

+}

+</style>

+</head>

+<body>

+<div style="margin-top:30px;">

+<form action="${app }/hzttltj/main" id="hzttltjform" method="post"> 	

+<table class="search_table" cellpadding="0" cellspacing="0" align="center" >

+		<tr>

+				<th width="11%"></th>	

+				<th width="22%"></th>

+				<th width="11%"></th>

+				<th width="22%"></th>

+				<th width="12%"></th>

+		</tr>

+                      

+			    <tr align="center">

+				<td align="right" >报告时间起：&nbsp;</td>

+                <td align="left" ><input id="d4311" class="Wdate" name="startDate" value="${startDate}"  type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})"></td>

+                <td align="right">报告时间止：&nbsp;</td>

+                <td align="left" ><input id="d4312" class="Wdate" name="endDate" value="${endDate}" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})"></td>

+               <th width="12%"></th>

+               </tr>

+               <tr>

+                <tr align="center">

+                <td align="right" >货物种类第一大类：&nbsp;</td>

+              	<td align="left" ><span id="hwzldydl"></span></td>

+              	<td align="right" >货物种类第二大类：&nbsp;</td>

+              	<td align="left" ><span id="hwzldedl"></span></td>

+                <td align="left">

+               	<a class="btn btn-default btn-sm" href="#" onclick="hzttltj.main.search()">

+				<i class="glyphicon glyphicon-search"></i>检索</a>

+                </td>

+		 	   </tr>

+         <tr>

+         </tr>

+</table>

+</form>

+</div>

+<h2 align="center" style="margin-top:20px;" ><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">

+${queryTime1}<c:if test="${queryTime2!=''&&(queryTime2!=queryTime1)}">-${queryTime2}</c:if>单船吞吐量统计图</font></h2>

+<div id="container" style="min-width: 200px; min-height:300px; margin: 0 auto;"></div>

+	<div style="margin:28px 35px ;height:40%;min-height:200px;">

+    <table id="dctjtb" class="main_table" style="width:99%" border="1">

+			<tr >

+				<th rowspan="2">货物分类</th>

+				<th colspan="3">总计</th>

+				<th colspan="3">出港</th>

+				<th colspan="3">进港</th>

+			</tr>

+			<tr >

+				<th >合计</th>

+				<th >外贸</th>

+				<th >内贸</th>

+				<th >合计</th>

+				<th >外贸</th>

+				<th >内贸</th>

+				<th >合计</th>

+				<th >外贸</th>

+				<th >内贸</th>

+			</tr>

+			<tr>

+				<td >总计</td>

+				<td>${a1}</td>

+				<td>${a44}</td>

+				<td>${a87}</td>

+				<td>${a130}</td>

+				<td>${a173}</td>

+				<td>${a216}</td>

+				<td>${a259}</td>

+				<td>${a302}</td>

+				<td>${a345}</td>

+			</tr>

+			<tr>

+				<td>其中：转口</td>

+				<td>${a2}</td>

+				<td>${a45}</td>

+				<td>${a88}</td>

+				<td>${a131}</td>

+				<td>${a174}</td>

+				<td>${a217}</td>

+				<td>${a260}</td>

+				<td>${a303}</td>

+				<td>${a346}</td>

+			</tr>

+			<tr>

+				<td>内：船过船</td>

+				<td>${a3}</td>

+				<td>${a46}</td>

+				<td>${a89}</td>

+				<td>${a132}</td>

+				<td>${a175}</td>

+				<td>${a218}</td>

+				<td>${a261}</td>

+				<td>${a304}</td>

+				<td>${a347}</td>

+			</tr>

+			<tr>

+				<td>煤炭及制品</td>

+				<td>${a4}</td>

+				<td>${a47}</td>

+				<td>${a90}</td>

+				<td>${a133}</td>

+				<td>${a176}</td>

+				<td>${a219}</td>

+				<td>${a262}</td>

+				<td>${a305}</td>

+				<td>${a348}</td>

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：焦炭</td>

+				<td>${a5}</td>

+				<td>${a48}</td>

+				<td>${a91}</td>

+				<td>${a134}</td>

+				<td>${a177}</td>

+				<td>${a220}</td>

+				<td>${a263}</td>

+				<td>${a306}</td>

+				<td>${a349}</td>

+			</tr>

+			<tr>

+				<td>石油、天然气及制品</td>

+				<td>${a6}</td>

+				<td>${a49}</td>

+				<td>${a92}</td>

+				<td>${a135}</td>

+				<td>${a178}</td>

+				<td>${a221}</td>

+				<td>${a264}</td>

+				<td>${a307}</td>

+				<td>${a350}</td>

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：原油</td>

+				<td>${a7}</td>

+				<td>${a50}</td>

+				<td>${a93}</td>

+				<td>${a136}</td>

+				<td>${a179}</td>

+				<td>${a222}</td>

+				<td>${a265}</td>

+				<td>${a308}</td>

+				<td>${a351}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">成品油</td>

+				<td>${a8}</td>

+				<td>${a51}</td>

+				<td>${a94}</td>

+				<td>${a137}</td>

+				<td>${a180}</td>

+				<td>${a223}</td>

+				<td>${a266}</td>

+				<td>${a309}</td>

+				<td>${a352}</td>

+

+								

+			</tr>

+			<tr>

+				<td style="padding-left:100px">液化气、天然气</td>

+				<td>${a9}</td>

+				<td>${a52}</td>

+				<td>${a95}</td>

+				<td>${a138}</td>

+				<td>${a181}</td>

+				<td>${a224}</td>

+				<td>${a267}</td>

+				<td>${a310}</td>

+				<td>${a353}</td>

+			</tr>

+			<tr>

+				<td>金属矿石</td>

+				<td>${a10}</td>

+				<td>${a53}</td>

+				<td>${a96}</td>

+				<td>${a139}</td>

+				<td>${a182}</td>

+				<td>${a225}</td>

+				<td>${a268}</td>

+				<td>${a311}</td>

+				<td>${a354}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：铁矿石</td>

+				<td>${a11}</td>

+				<td>${a54}</td>

+				<td>${a97}</td>

+				<td>${a140}</td>

+				<td>${a183}</td>

+				<td>${a226}</td>

+				<td>${a269}</td>

+				<td>${a312}</td>

+				<td>${a355}</td>

+			</tr>

+			<tr>

+				<td>钢铁</td>

+				<td>${a12}</td>

+				<td>${a55}</td>

+				<td>${a98}</td>

+				<td>${a141}</td>

+				<td>${a184}</td>

+				<td>${a227}</td>

+				<td>${a270}</td>

+				<td>${a313}</td>

+				<td>${a356}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：钢铁</td>

+				<td>${a13}</td>

+				<td>${a56}</td>

+				<td>${a99}</td>

+				<td>${a142}</td>

+				<td>${a185}</td>

+				<td>${a228}</td>

+				<td>${a271}</td>

+				<td>${a314}</td>

+				<td>${a357}</td>

+

+			</tr>

+			<tr>

+				<td style="padding-left:100px">生铁</td>

+				<td>${a14}</td>

+				<td>${a57}</td>

+				<td>${a100}</td>

+				<td>${a143}</td>

+				<td>${a186}</td>

+				<td>${a229}</td>

+				<td>${a272}</td>

+				<td>${a315}</td>

+				<td>${a358}</td>

+

+				

+			</tr>

+			<tr>

+				<td>矿建材料</td>

+				<td>${a15}</td>

+<td>${a58}</td>

+<td>${a101}</td>

+<td>${a144}</td>

+<td>${a187}</td>

+<td>${a230}</td>

+<td>${a273}</td>

+<td>${a316}</td>

+<td>${a359}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：砂</td>

+				<td>${a16}</td>

+<td>${a59}</td>

+<td>${a102}</td>

+<td>${a145}</td>

+<td>${a188}</td>

+<td>${a231}</td>

+<td>${a274}</td>

+<td>${a317}</td>

+<td>${a360}</td>

+

+				

+			</tr>

+			<tr>

+				<td>水泥</td>

+				<td>${a17}</td>

+<td>${a60}</td>

+<td>${a103}</td>

+<td>${a146}</td>

+<td>${a189}</td>

+<td>${a232}</td>

+<td>${a275}</td>

+<td>${a318}</td>

+<td>${a361}</td>

+

+				

+			</tr>

+			<tr>

+				<td>木材</td>

+				<td>${a18}</td>

+<td>${a61}</td>

+<td>${a104}</td>

+<td>${a147}</td>

+<td>${a190}</td>

+<td>${a233}</td>

+<td>${a276}</td>

+<td>${a319}</td>

+<td>${a362}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：原木</td>

+			<td>${a19}</td>

+<td>${a62}</td>

+<td>${a105}</td>

+<td>${a148}</td>

+<td>${a191}</td>

+<td>${a234}</td>

+<td>${a277}</td>

+<td>${a320}</td>

+<td>${a363}</td>

+

+				

+			</tr>

+			<tr>

+				<td>非金属矿石</td>

+			<td>${a20}</td>

+<td>${a63}</td>

+<td>${a106}</td>

+<td>${a149}</td>

+<td>${a192}</td>

+<td>${a235}</td>

+<td>${a278}</td>

+<td>${a321}</td>

+<td>${a364}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：磷矿</td>

+			<td>${a21}</td>

+<td>${a64}</td>

+<td>${a107}</td>

+<td>${a150}</td>

+<td>${a193}</td>

+<td>${a236}</td>

+<td>${a279}</td>

+<td>${a322}</td>

+<td>${a365}</td>

+

+			</tr>

+			<tr>

+				<td>化肥及农药</td>

+				<td>${a22}</td>

+<td>${a65}</td>

+<td>${a108}</td>

+<td>${a151}</td>

+<td>${a194}</td>

+<td>${a237}</td>

+<td>${a280}</td>

+<td>${a323}</td>

+<td>${a366}</td>

+

+				

+			</tr>

+			<tr>

+				<td>盐</td>

+			<td>${a23}</td>

+<td>${a66}</td>

+<td>${a109}</td>

+<td>${a152}</td>

+<td>${a195}</td>

+<td>${a238}</td>

+<td>${a281}</td>

+<td>${a324}</td>

+<td>${a367}</td>

+

+				

+			</tr>

+			<tr>

+				<td>粮食</td>

+				<td>${a24}</td>

+<td>${a67}</td>

+<td>${a110}</td>

+<td>${a153}</td>

+<td>${a196}</td>

+<td>${a239}</td>

+<td>${a282}</td>

+<td>${a325}</td>

+<td>${a368}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：小麦</td>

+			<td>${a25}</td>

+<td>${a68}</td>

+<td>${a111}</td>

+<td>${a154}</td>

+<td>${a197}</td>

+<td>${a240}</td>

+<td>${a283}</td>

+<td>${a326}</td>

+<td>${a369}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">玉米</td>

+				<td>${a26}</td>

+<td>${a69}</td>

+<td>${a112}</td>

+<td>${a155}</td>

+<td>${a198}</td>

+<td>${a241}</td>

+<td>${a284}</td>

+<td>${a327}</td>

+<td>${a370}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">黄豆</td>

+				<td>${a27}</td>

+<td>${a70}</td>

+<td>${a113}</td>

+<td>${a156}</td>

+<td>${a199}</td>

+<td>${a242}</td>

+<td>${a285}</td>

+<td>${a328}</td>

+<td>${a371}</td>

+

+			</tr>

+			<tr>

+				<td style="padding-left:100px">大米</td>

+				<td>${a28}</td>

+<td>${a71}</td>

+<td>${a114}</td>

+<td>${a157}</td>

+<td>${a200}</td>

+<td>${a243}</td>

+<td>${a286}</td>

+<td>${a329}</td>

+<td>${a372}</td>

+

+				

+			</tr>

+			<tr>

+				<td>机械、设备、电器</td>

+				<td>${a29}</td>

+<td>${a72}</td>

+<td>${a115}</td>

+<td>${a158}</td>

+<td>${a201}</td>

+<td>${a244}</td>

+<td>${a287}</td>

+<td>${a330}</td>

+<td>${a373}</td>

+

+				

+			</tr>

+			<tr>

+				<td>化工原料及制品</td>

+				<td>${a30}</td>

+<td>${a73}</td>

+<td>${a116}</td>

+<td>${a159}</td>

+<td>${a202}</td>

+<td>${a245}</td>

+<td>${a288}</td>

+<td>${a331}</td>

+<td>${a374}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：橡胶</td>

+				<td>${a31}</td>

+<td>${a74}</td>

+<td>${a117}</td>

+<td>${a160}</td>

+<td>${a203}</td>

+<td>${a246}</td>

+<td>${a289}</td>

+<td>${a332}</td>

+<td>${a375}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">纯碱</td>

+			<td>${a32}</td>

+<td>${a75}</td>

+<td>${a118}</td>

+<td>${a161}</td>

+<td>${a204}</td>

+<td>${a247}</td>

+<td>${a290}</td>

+<td>${a333}</td>

+<td>${a376}</td>

+

+				

+			</tr>

+			<tr>

+				<td>有色金属</td>

+			<td>${a33}</td>

+<td>${a76}</td>

+<td>${a119}</td>

+<td>${a162}</td>

+<td>${a205}</td>

+<td>${a248}</td>

+<td>${a291}</td>

+<td>${a334}</td>

+<td>${a377}</td>

+

+				

+			</tr>

+			<tr>

+				<td>轻工、医药产品</td>

+				<td>${a34}</td>

+<td>${a77}</td>

+<td>${a120}</td>

+<td>${a163}</td>

+<td>${a206}</td>

+<td>${a249}</td>

+<td>${a292}</td>

+<td>${a335}</td>

+<td>${a378}</td>

+								

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：纸</td>

+		<td>${a35}</td>

+<td>${a78}</td>

+<td>${a121}</td>

+<td>${a164}</td>

+<td>${a207}</td>

+<td>${a250}</td>

+<td>${a293}</td>

+<td>${a336}</td>

+<td>${a379}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">日用工业品</td>

+			<td>${a36}</td>

+<td>${a79}</td>

+<td>${a122}</td>

+<td>${a165}</td>

+<td>${a208}</td>

+<td>${a251}</td>

+<td>${a294}</td>

+<td>${a337}</td>

+<td>${a380}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">糖</td>

+			<td>${a37}</td>

+<td>${a80}</td>

+<td>${a123}</td>

+<td>${a166}</td>

+<td>${a209}</td>

+<td>${a252}</td>

+<td>${a295}</td>

+<td>${a338}</td>

+<td>${a381}</td>

+

+								

+			</tr>

+			<tr>

+				<td>农、林、牧、渔业产品</td>

+			<td>${a38}</td>

+<td>${a81}</td>

+<td>${a124}</td>

+<td>${a167}</td>

+<td>${a210}</td>

+<td>${a253}</td>

+<td>${a296}</td>

+<td>${a339}</td>

+<td>${a382}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：棉花</td>

+				<td>${a39}</td>

+<td>${a82}</td>

+<td>${a125}</td>

+<td>${a168}</td>

+<td>${a211}</td>

+<td>${a254}</td>

+<td>${a297}</td>

+<td>${a340}</td>

+<td>${a383}</td>

+

+				

+			</tr>

+			<tr>

+				<td>其他</td>

+				<td>${a40}</td>

+<td>${a83}</td>

+<td>${a126}</td>

+<td>${a169}</td>

+<td>${a212}</td>

+<td>${a255}</td>

+<td>${a298}</td>

+<td>${a341}</td>

+<td>${a384}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">其中：集装箱重量（吨）</td>

+			<td>${a41}</td>

+<td>${a84}</td>

+<td>${a127}</td>

+<td>${a170}</td>

+<td>${a213}</td>

+<td>${a256}</td>

+<td>${a299}</td>

+<td>${a342}</td>

+<td>${a385}</td>

+

+			</tr>

+			<tr>

+				<td style="padding-left:100px">滚装船汽车吞吐量（吨）</td>

+			<td>${a42}</td>

+<td>${a85}</td>

+<td>${a128}</td>

+<td>${a171}</td>

+<td>${a214}</td>

+<td>${a257}</td>

+<td>${a300}</td>

+<td>${a343}</td>

+<td>${a386}</td>

+

+				

+			</tr>

+			<tr>

+				<td style="padding-left:100px">滚装船汽车吞吐量（标辆）</td>

+			<td>${a43}</td>

+<td>${a86}</td>

+<td>${a129}</td>

+<td>${a172}</td>

+<td>${a215}</td>

+<td>${a258}</td>

+<td>${a301}</td>

+<td>${a344}</td>

+<td>${a387}</td>

+

+				

+			</tr>

+		</table>

+	</div> 

+</body>

+</html>

+ 225 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hzttltj/jzxttltj.jsp
查看文件 

@@ -0,0 +1,225 @@
 
+<!DOCTYPE html >

+<html >

+<%@ page language="java" contentType="text/html; charset=UTF-8"

+	pageEncoding="UTF-8"%>

+<%@ page import="java.text.SimpleDateFormat"%>

+ <%@ include file="../../common.jsp"%>

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+<title>集装箱吞吐量统计</title>

+</head>

+<link rel="stylesheet" type="text/css"	href="${app }/static/css/public.css" />

+<link rel="stylesheet" type="text/css"	href="${app }/static/css/other.css" />

+<script type="text/javascript" src="${app }/static/js/highcharts.js"></script>

+<script type="text/javascript" src="${app }/static/js/exporting.js"></script>

+<script type="text/javascript" src="${app }/static/js/highcharts-3d.js"></script>

+<script type="text/javascript">

+	$(document).ready(function () {

+		iFrameHeightIframe('${menuid}');//自适应高度

+		$('.hxselectpicker').selectpicker({

+    		width:'80%'

+    	});

+	});

+

+	

+	$(function () {

+		var list = '${list}';

+		var zttl=[];

+		var name=[];

+		var hb=[];

+		var tb=[]

+		var aa='${zcl}';

+		var bb=-+'${zcl}';

+		

+	    $.each(JSON.parse(list), function (n, value) {

+	    	name[n]=value.tjmonth+"月";

+	    	zttl[n]=value.ttl;

+	    	hb[n]=value.hb;

+	    	tb[n]=value.tb;

+	  	});

+	    $('#container').highcharts({

+	    	title:{

+	    		text:""

+	    	},

+	        chart: {

+	            zoomType: 'xy'

+	        },

+	        xAxis: [{

+	            categories: eval(name)

+	        }],

+	        yAxis: [{ // Primary yAxis

+	        	min:-20,

+	        	max:50,

+	            labels: {

+	                formatter: function() {

+	                    return this.value +'%';

+	                },

+	                style: {

+	                    color: '#89A54E'

+	                }

+	            },

+	            title: {

+	                text: '同比增长率',

+	                style: {

+	                    color: '#89A54E'

+	                }

+	            },

+	            opposite: true,

+	            plotLines:[{

+	                color:'red',           //线的颜色，定义为红色

+	                dashStyle:'ShortDash',     //默认值，这里定义为实线

+	                value:aa,               //定义在那个值上显示标示线，这里是在x轴上刻度为3的值处垂直化一条线

+	                width:2                //标示线的宽度，2px

+	            },{

+	                color:'yellow',           //线的颜色，定义为红色

+	                dashStyle:'ShortDash',     //默认值，这里定义为实线

+	                value:bb,               //定义在那个值上显示标示线，这里是在x轴上刻度为1的值处垂直化一条线

+	                width:2                //标示线的宽度，2px

+	            }]

+

+	        }, { // Secondary yAxis

+	        	min:0,

+	        	max:100,

+	            gridLineWidth: 0,

+	            title: {

+	                text: '吞吐量',

+	                style: {

+	                    color: '#4572A7'

+	                }

+	            },

+	            labels: {

+	                formatter: function() {

+	                    return this.value +' 万吨';

+	                },

+	                style: {

+	                    color: '#4572A7'

+	                }

+	            }

+

+	        }, { // Tertiary yAxis

+	        	min:-20,

+	        	max:50,

+	            gridLineWidth: 0,

+	            title: {

+	                text: '环比增长率',

+	                style: {

+	                    color: '#AA4643'

+	                }

+	            },

+	            labels: {

+	                formatter: function() {

+	                    return this.value +' %';

+	                },

+	                style: {

+	                    color: '#AA4643'

+	                }

+	            },

+	            opposite: true

+	        }],

+	        tooltip: {

+	            shared: true

+	        },

+	        legend: {

+	            layout: 'vertical',

+	            align: 'left',

+	            x: 120,

+	            verticalAlign: 'top',

+	            y: 80,

+	            floating: true,

+	            backgroundColor: '#FFFFFF'

+	        },

+	        series: [{

+	            name: '吞吐量',

+	            color: '#4572A7',

+	            type: 'column',

+	            yAxis: 1,

+	            data: eval('['+zttl+']'),

+	            tooltip: {

+	                valueSuffix: ' 万吨'

+	            }

+

+	        }, {

+	            name: '环比增长率',

+	            type: 'spline',

+	            color: '#AA4643',

+	            yAxis: 2,

+	            data: eval('['+hb+']'),

+	            marker: {

+	                enabled: false

+	            },

+	            dashStyle: 'shortdot',

+	            tooltip: {

+	                valueSuffix: ' %'

+	            }

+

+	        }, {

+	            name: '同比增长率',

+	            color: '#89A54E',

+	            type: 'spline',

+	            data: eval('['+tb+']'),

+	            tooltip: {

+	                valueSuffix: ' %'

+	            }

+	        }]

+	    });

+	});	

+	

+	function search(){

+		$("#jzxttltjform").submit();

+	}

+</script>

+<style type="text/css">

+.main_table td{

+text-align:left;

+padding-left:20px;

+width:50px;

+}

+</style>

+</head>

+<body>

+<div style="margin-top:30px;">

+<form action="${app }/jzxttltj/main" id="jzxttltjform" method="post"> 	

+<table class="search_table" cellpadding="0" cellspacing="0" align="center" >

+		<tr>

+				<th width="11%"></th>	

+				<th width="22%"></th>

+				<th width="11%"></th>

+				<th width="22%"></th>

+				<th width="12%"></th>

+		</tr>

+                      

+			    <tr align="center">

+				<td align="right" >报告时间起：&nbsp;</td>

+                <td align="left" ><input id="d4311" class="Wdate" name="startDate" value="${startDate}"  type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})"></td>

+                <td align="right">报告时间止：&nbsp;</td>

+                <td align="left" ><input id="d4312" class="Wdate" name="endDate" value="${endDate}" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})"></td>

+               <th width="12%"></th>

+               </tr>

+               <tr>

+                <tr align="center">

+                <td align="right" >航线分类：&nbsp;</td>

+              	<td align="left" >

+              		<select class='hxselectpicker' name="hx" id="hx">

+			            	<option></option>

+			            	<option value="1">国际航线</option>

+			            	<option value="2">内支线</option>

+			            	<option value="3">国内航线</option>

+			            	</select>

+              	</td>

+              	<td align="right" ></td>

+              	<td align="left" ></td>

+                <td align="left">

+               	<a class="btn btn-default btn-sm" href="#" onclick="search()">

+				<i class="glyphicon glyphicon-search"></i>检索</a>

+                </td>

+		 	   </tr>

+         <tr>

+         </tr>

+</table>

+</form>

+</div>

+<h2 align="center" style="margin-top:20px;" ><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">

+${queryTime1}<c:if test="${queryTime2!=''&&(queryTime2!=queryTime1)}">-${queryTime2}</c:if>集装箱吞吐量统计图</font></h2>

+<div id="container" style="min-width: 200px; min-height:300px; margin: 0 auto;"></div>

+</body>

+</html>

+ 174 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hzttltj/jzxxltj.jsp
查看文件 

@@ -0,0 +1,174 @@
 
+<!DOCTYPE html >

+<html >

+<%@ page language="java" contentType="text/html; charset=UTF-8"

+	pageEncoding="UTF-8"%>

+<%@ page import="java.text.SimpleDateFormat"%>

+ <%@ include file="../../common.jsp"%>

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

+<title>集装箱吞吐量统计</title>

+</head>

+<link rel="stylesheet" type="text/css"	href="${app }/static/css/public.css" />

+<link rel="stylesheet" type="text/css"	href="${app }/static/css/other.css" />

+<script type="text/javascript" src="${app }/static/js/highcharts.js"></script>

+<script type="text/javascript" src="${app }/static/js/exporting.js"></script>

+<script type="text/javascript" src="${app }/static/js/highcharts-3d.js"></script>

+<script type="text/javascript">

+	$(document).ready(function () {

+		iFrameHeightIframe('${menuid}');//自适应高度

+		

+	});

+

+	$(function () {

+		var list = '${list}';

+		var kxxl=[];

+		var zxxl=[];

+		var name=[];

+		var zxl=[];

+		var zbl=[]

+	    $.each(JSON.parse(list), function (n, value) {

+	    	name[n]=value.tjmonth+"月";

+	    	kxxl[n]=value.kxxl;

+	    	zxxl[n]=value.zxxl;

+	    	zxl[n]=value.zxl;

+	    	zbl[n]=value.zbl;

+	  	});

+	    $('#container').highcharts({

+	    	title:{

+	    		text:""

+	    	},

+	        chart: {

+	        	type: 'column'

+	        },

+	        xAxis: [{

+	            categories: eval(name)

+	        }],

+	        yAxis: [{ // Secondary yAxis

+	        	min:0,

+	        	max:100,

+	            gridLineWidth: 0,

+	            title: {

+	                text: '箱数',

+	                style: {

+	                    color: '#4572A7'

+	                }

+	            },

+	            labels: {

+	                formatter: function() {

+	                    return this.value +' 个';

+	                },

+	                style: {

+	                    color: '#4572A7'

+	                }

+	            }

+

+	        }, { // Tertiary yAxis

+	        	min:0,

+	        	max:500,

+	            gridLineWidth: 0,

+	            title: {

+	                text: '空箱占比率',

+	                style: {

+	                    color: '#AA4643'

+	                }

+	            },

+	            labels: {

+	                formatter: function() {

+	                    return this.value +' %';

+	                },

+	                style: {

+	                    color: '#AA4643'

+	                }

+	            },

+	            opposite: true

+	        }],

+	        tooltip: {

+	            pointFormat: '<span style="color:{series.color}">{series.name}</span>: <b>{point.y}</b><br/>',

+	            shared: true

+	        },

+	        plotOptions: {

+	            column: {

+	                stacking: 'percent'

+	            }

+	        },

+	      /*   legend: {

+	            layout: 'vertical',

+	            align: 'left',

+	            x: 80,

+	            verticalAlign: 'top',

+	            y: 80,

+	            floating: true,

+	            backgroundColor: '#FFFFFF'

+	        }, */

+	        series: [{

+	            name: '空箱数量',

+	            color: '#4572A7',

+	            type: 'column',

+	            data: eval('['+kxxl+']'),

+	            tooltip: {

+	                valueSuffix: ' 个'

+	            }

+

+	        }, {

+	            name: '重箱箱数',

+	            type: 'column',

+	            color: '#AA4643',

+	            data: eval('['+zxxl+']'),

+	            tooltip: {

+	                valueSuffix: ' 个'

+	            }

+

+	        }, {

+	            name: '空箱占用率',

+	            color: '#89A54E',

+	            type: 'spline',

+	            yAxis: 1,

+	            data: eval('['+zbl+']'),

+	            tooltip: {

+	                valueSuffix: ' %'

+	            }

+	        }]

+	    });

+	});	

+

+</script>

+<style type="text/css">

+.main_table td{

+text-align:left;

+padding-left:20px;

+width:50px;

+}

+</style>

+</head>

+<body>

+<div style="margin-top:30px;">

+<form action="${app }/jzxttltj/main" id="jzxttltjform" method="post"> 	

+<table class="search_table" cellpadding="0" cellspacing="0" align="center" >

+		<tr>

+				<th width="11%"></th>	

+				<th width="22%"></th>

+				<th width="11%"></th>

+				<th width="22%"></th>

+				<th width="12%"></th>

+		</tr>

+                      

+			    <tr align="center">

+				<td align="right" >报告时间起：&nbsp;</td>

+                <td align="left" ><input id="d4311" class="Wdate" name="startDate" value="${startDate}"  type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})"></td>

+                <td align="right">报告时间止：&nbsp;</td>

+                <td align="left" ><input id="d4312" class="Wdate" name="endDate" value="${endDate}" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})"></td>

+                <td align="left">

+               	<a class="btn btn-default btn-sm" href="#" onclick="search()">

+				<i class="glyphicon glyphicon-search"></i>检索</a>

+                </td>

+		 	   </tr>

+         <tr>

+         </tr>

+</table>

+</form>

+</div>

+<h2 align="center" style="margin-top:20px;" ><font style="font-size:16px;color:#196794;font-family:微软雅黑;font-weight: bold;">

+${startDate}-${endDate}集装箱空箱/重箱统计图</font></h2>

+<div id="container" style="min-width: 200px; min-height:300px; margin: 0 auto;"></div>

+</body>

+</html>

+ 78 - 0
gkjsjy/trunk/WebContent/static/biz/js/gkyxtjyfx/hzttltj/hzttltj.js
查看文件 

@@ -0,0 +1,78 @@
 
+$.namespace("hzttltj.main");

+

+hzttltj.main.hwzlbackData=null;

+hzttltj.main.hwzldedlbackData=null;

+hzttltj.main.nwm=null;

+hzttltj.main.jcg=null;

+hzttltj.main.search=function(){

+	$("#hzttltjform").submit();

+}

+

+hzttltj.main.init=function(){

+	initHwzldydlSelect('hwzldydl',hzttltj.main.hwzlbackData,'showdedl','80%');

+	initHwzldedlSelect('hwzldedl',hzttltj.main.hwzldedlbackData,hzttltj.main.hwzlbackData,'80%');

+	//initdctjtb();

+}

+

+function showdedl(){

+	initHwzldedlSelect('hwzldedl','',$('.dydlselectpicker').val(),'80%')

+}

+

+

+//构建货物种类第一大类下拉	

+function initHwzldydlSelect(divid,existVal,changefunc,width){

+	$.post($.app+"/dcsb/selectHwlxdydl",{

+	},function(data) {

+		var str="";

+		if(changefunc!=null&&changefunc!=""){

+			str+="<select class='dydlselectpicker' name='dydlid' onchange='"+changefunc+"()' id='dydlid'>";

+		}else{

+			str+="<select class='dydlselectpicker' name='dydlid' id='dydlid'>";

+		}

+		str+="<option></option>";

+		if(data){

+			for(var i=0;i<data.length;i++){

+				var dydl=data[i];

+				if(dydl.id==existVal){

+					str+=" <option selected='selected' value='"+dydl.id+"' >"+dydl.text+"</option>";

+				}else{

+					str+="<option value='"+dydl.id+"'>"+dydl.text+"</option>" ;

+				}

+			}

+		}

+		str+="</select>";

+		$("#"+divid).empty();

+		$("#"+divid).append(str);

+		$('.dydlselectpicker').selectpicker({

+    		width:width

+    	});

+	}, "json");

+}	

+

+//构建货物种类第二大类下拉	

+//existVal：默认值，dydlid：第一大类id

+function initHwzldedlSelect(divid,existVal,dydlid,width){

+	$.post($.app+"/dcsb/selectHwlxdedl",{

+	dydlid:dydlid

+	},function(data) {

+		var str="";

+		str+="<select class='dedlselectpicker' name='dedlid' id='dedlid'>";

+		str+="<option></option>";

+		if(data){

+			for(var i=0;i<data.length;i++){

+				var dedl=data[i];

+				if(dedl.id==existVal){

+					str+=" <option selected='selected' value='"+dedl.id+"' >"+dedl.text+"</option>";

+				}else{

+					str+="<option value='"+dedl.id+"'>"+dedl.text+"</option>" ;

+				}

+			}

+		}

+		str+="</select>";

+		$("#"+divid).empty();

+		$("#"+divid).append(str);

+		$('.dedlselectpicker').selectpicker({

+  		width:width

+  	});

+	}, "json");

+}

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/hxhbgl/ctl/HxhbglCtl.java
查看文件 

@@ -55,7 +55,7 @@ public class HxhbglCtl extends BaseWebCtl {
 
 	private GkjyrService gkjyrService;

 

 	/**

-	 * 待办发文维护首页

+	 * 一览页面

 	 * 

 	 * @return

 	 */

+ 24 - 0
gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/ctl/JdtxxxCtl.java
查看文件 

@@ -75,6 +75,19 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 	@Autowired

 	private JdjcfjService jdjcfjService;

 

+	/**

+	 * 一览信息

+	 * @param page

+	 * @param model

+	 * @param request

+	 * @param ssjyr

+	 * @param szdid

+	 * @param szgkid

+	 * @param szgqid

+	 * @param menuid

+	 * @return

+	 * @throws JsonProcessingException

+	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("jdtxxx:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String ssjyr, final String szdid, final String szgkid, final String szgqid, final String menuid) throws JsonProcessingException {

@@ -222,6 +235,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		return "ggfwxxgl/jdtxxx/jdtxxxmain";

 	}

 

+	//删除

 	@RequestMapping(value = "/delete")

 	@ResponseBody

 	@RequiresPermissions("jdtxxx:delete")

@@ -237,6 +251,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//保存数据

 	@RequestMapping(value = "/save")

 	@ResponseBody

 	public WebJsonResult save(Model model, JdtxxxEntity code, String szdid, String szgkid, String accid, String szgqid, String jyrid) {

@@ -322,6 +337,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//下发保存

 	@RequestMapping(value = "/savexf")

 	@ResponseBody

 	public WebJsonResult savexf(Model model, JdtxxxEntity code, String szdid, String szgkid, String accid, String szgqid, String jyrid) {

@@ -408,6 +424,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//同步 数据 

 	@RequestMapping(value = "/saveTb")

 	@ResponseBody

 	public WebJsonResult saveTb(Model model, String id) {

@@ -444,6 +461,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//提交数据

 	@RequestMapping(value = "/submit")

 	@ResponseBody

 	public WebJsonResult submit(Model model, JdtxxxEntity code, String accid, String szdid, String szgkid, String szgqid, String jyrid) {

@@ -528,6 +546,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//退回提交

 	@RequestMapping(value = "/submitAudit")

 	@ResponseBody

 	public WebJsonResult submitAudit(JdtxxxEntity code, String accid) {

@@ -565,6 +584,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//审核流程

 	@RequestMapping(value = "/audit")

 	@ResponseBody

 	public WebJsonResult audit(String shyj, String id, String dqzt, String zghtzje, String flag, String accid) {

@@ -633,6 +653,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//编辑信息

 	@RequestMapping(value = "/edit")

 	@RequiresPermissions("jdtxxx:edit")

 	public String edit(Model model, String id, String flag) {

@@ -659,6 +680,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		return "ggfwxxgl/jdtxxx/jdtxxxedit";

 	}

 

+	//查看

 	@RequestMapping(value = "/view")

 	public String view(Model model, String id, String flag, String opflag) {

 		model.addAttribute("flag", flag);

@@ -722,6 +744,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		return "ggfwxxgl/jdtxxx/jdtxxxview";

 	}

 

+	//新增

 	@RequestMapping(value = "/add")

 	@RequiresPermissions("jdtxxx:add")

 	public String add(Model model) {

@@ -776,6 +799,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//删除附件

 	@RequestMapping(value = "/delFile")

 	@ResponseBody

 	public WebJsonResult delFile(String accid, Model model) {

+ 60 - 35
gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/tzgg/ggxx/ctl/GgxxCtl.java
查看文件 

@@ -76,11 +76,28 @@ public class GgxxCtl extends BaseWebCtl {
 
 	@Autowired

 	private XzglryService xzglryService;

 	@Autowired

-	private XzglbmxxService  xzglbmxxService;

+	private XzglbmxxService xzglbmxxService;

+

+	/**

+	 * 一览

+	 * 

+	 * @param page 分页

+	 * @param model

+	 * @param menuid

+	 * @param request

+	 * @param title 标题

+	 * @param startDate 开始时间

+	 * @param endDate 结束时间

+	 * @param fbr 发布人

+	 * @param gglxid 公告类型

+	 * @param zt 状态

+	 * @return

+	 * @throws JsonProcessingException

+	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("ggxx:main")

 	public String main(SimplePageRequest page, Model model, final String menuid, final HttpServletRequest request, final String title, final Date startDate, final Date endDate, final String fbr, final String gglxid, final String zt) throws JsonProcessingException {

-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"ggxx");

+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "ggxx");

 		Specification<GgxxEntity> spec = new Specification<GgxxEntity>() {

 			// 查询条件

 			@Override

@@ -88,16 +105,16 @@ public class GgxxCtl extends BaseWebCtl {
 
 				List<Predicate> list = new ArrayList<Predicate>();

 				if (!StringUtils.isEmpty(title)) {

 					list.add(cb.like(root.get("title").as(String.class), "%" + title + "%"));

-				}else if (isGET(request)) {

-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"title");

+				} else if (isGET(request)) {

+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "title");

 				}

 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

 				Date date;

 				if (!StringUtils.isEmpty(startDate)) {

 					list.add(cb.greaterThanOrEqualTo(root.get("fbsj").as(Date.class), startDate));

-				}else if (isGET(request)) {

-					String val =(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap,"startDate");

-					if(StringUtils.isNotEmpty(val)){

+				} else if (isGET(request)) {

+					String val = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "startDate");

+					if (StringUtils.isNotEmpty(val)) {

 						try {

 							date = sdf.parse(val);

 						} catch (ParseException e) {

@@ -105,14 +122,14 @@ public class GgxxCtl extends BaseWebCtl {
 
 							e.printStackTrace();

 						}

 						list.add(cb.greaterThanOrEqualTo(root.get("fbsj").as(Date.class), date));

-					}										

-					

+					}

+

 				}

 				if (!StringUtils.isEmpty(endDate)) {

 					list.add(cb.lessThanOrEqualTo(root.get("fbsj").as(Date.class), endDate));

-				}else if (isGET(request)) {

-					String val =(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap,"endDate");

-					if(StringUtils.isNotEmpty(val)){

+				} else if (isGET(request)) {

+					String val = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "endDate");

+					if (StringUtils.isNotEmpty(val)) {

 						try {

 							date = sdf.parse(val);

 						} catch (ParseException e) {

@@ -124,16 +141,15 @@ public class GgxxCtl extends BaseWebCtl {
 
 				}

 				if (!StringUtils.isEmpty(gglxid)) {

 					list.add(cb.equal(root.get("gglx").get("id").as(String.class), gglxid));

-				}else if (isGET(request)) {

-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","gglx","gglxid");

+				} else if (isGET(request)) {

+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "gglx", "gglxid");

 				}

 				if (!StringUtils.isEmpty(zt)) {

 					list.add(cb.equal(root.get("fbzt").as(String.class), zt));

-				}else if (isGET(request)) {

-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"fbzt","zt");

+				} else if (isGET(request)) {

+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "fbzt", "zt");

 				}

-				// list.add(cb.equal(root.get("createUser").as(String.class),

-				// SecUtils.getCurrUser().getId()));

+

 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));

 

 				if (!StringUtils.isEmpty(fbr)) {

@@ -251,6 +267,16 @@ public class GgxxCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	/**

+	 * 保存信息

+	 * @param model

+	 * @param code

+	 * @param gglxid

+	 * @param accid

+	 * @param user

+	 * @param jyr

+	 * @return

+	 */

 	@RequestMapping(value = "/save")

 	@ResponseBody

 	public WebJsonResult save(Model model, GgxxEntity code, String gglxid, String accid, String[] user, String[] jyr) {

@@ -308,8 +334,8 @@ public class GgxxCtl extends BaseWebCtl {
 
 					ggxxtxService.save(tx);

 				}

 			}

-			

-			if(!StringUtils.isEmpty(securityMgr.getCurrUser().getSsglry())){

+

+			if (!StringUtils.isEmpty(securityMgr.getCurrUser().getSsglry())) {

 				GgxxtxEntity tx = new GgxxtxEntity();

 				tx.setGgid(ggxxEntity.getId());

 				tx.setJyr(securityMgr.getCurrUser().getSsglry().getId());

@@ -445,30 +471,30 @@ public class GgxxCtl extends BaseWebCtl {
 
 	}

 

 	@RequestMapping(value = "/ggxxDetail")

-	public String ggxxDetail(Model model,String id) {

+	public String ggxxDetail(Model model, String id) {

 		List<GgxxtxEntity> list = ggxxtxService.findByggid(id);

-		if(list!=null && list.size()>0){

+		if (list != null && list.size() > 0) {

 			List<GgxxtxVo> jyrlist = new ArrayList<GgxxtxVo>();

-			List<GgxxtxVo>  rylist = new ArrayList<GgxxtxVo>();

-			for(GgxxtxEntity ggxxtx:list){

-				if(ggxxtx != null && ggxxtx.getFlag() != null){

+			List<GgxxtxVo> rylist = new ArrayList<GgxxtxVo>();

+			for (GgxxtxEntity ggxxtx : list) {

+				if (ggxxtx != null && ggxxtx.getFlag() != null) {

 					GgxxtxVo vo = new GgxxtxVo();

 					vo.setId(ggxxtx.getId());

 					vo.setJyr(ggxxtx.getJyr());

-					if("1".equals(ggxxtx.getSfyd())){

+					if ("1".equals(ggxxtx.getSfyd())) {

 						vo.setSfyd("是");

 						SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");

 						vo.setYdsj(dateTimeFormat.format(ggxxtx.getUpdateDateTime()));

-					}else{

+					} else {

 						vo.setSfyd("否");

 						vo.setYdsj("");

 					}

-					if(ggxxtx.getFlag().equals("0")){//行政人员

-						XzglryEntity ry =xzglryService.findOne(ggxxtx.getJyr());

+					if (ggxxtx.getFlag().equals("0")) {// 行政人员

+						XzglryEntity ry = xzglryService.findOne(ggxxtx.getJyr());

 						vo.setRymc(ry.getXm());

 						vo.setBmmc(getbmmcBybmid(ry.getSsbm().getId()));

 						rylist.add(vo);

-					}else{//经营人

+					} else {// 经营人

 						GkjyrEntity jyr = gkjyrService.findOne(ggxxtx.getJyr());

 						vo.setGkmc(jyr.getSzgk().getGkmc());

 						vo.setJyrmc(jyr.getGkjyr());

@@ -482,13 +508,12 @@ public class GgxxCtl extends BaseWebCtl {
 
 		}

 		return "ggfwxxgl/tzgg/ggxx/ggxxdetails";

 	}

-	

-	

-	public String getbmmcBybmid(String bmid){

+

+	public String getbmmcBybmid(String bmid) {

 		XzglbmxxEntity bm = xzglbmxxService.findOne(bmid);

-		if("00".equals(bm.getPid())){

+		if ("00".equals(bm.getPid())) {

 			return bm.getGkglbmqc();

-		}else{

+		} else {

 			getbmmcBybmid(bm.getPid());

 		}

 		return "";

+ 23 - 54
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/ax/ctl/AxCtl.java
查看文件 

@@ -79,6 +79,21 @@ public class AxCtl extends BaseWebCtl {
 
 	@Autowired

 	private GkjyrService gkjyrService;

 

+	/**

+	 * 一览页面

+	 * @param page 分页

+	 * @param model

+	 * @param request

+	 * @param axmc 岸线名称

+	 * @param szdid 所在地ID

+	 * @param szgkid 所在港口ID

+	 * @param szgqid 所在港区ID

+	 * @param ssjyr 经营人

+	 * @param menuid

+	 * @param lyztid 

+	 * @return

+	 * @throws JsonProcessingException

+	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("ax:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String axmc, final String szdid, final String szgkid, final String szgqid, final String ssjyr, String menuid,final String lyztid) throws JsonProcessingException {

@@ -102,25 +117,21 @@ public class AxCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.axszgk + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szgk","szgkid");

 				}

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.axszgq + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szgq","szgqid");

 				}

 				if (StringUtils.isNotEmpty(ssjyr)) {

 					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + SearchCondition.axssjyr + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "gkjyr","ssjyr");

 				}

 				if (StringUtils.isNotEmpty(lyztid)) {

 					list.add(cb.like(root.get("lyzt").get("id").as(String.class), "%" + lyztid + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("lyzt").get("id").as(String.class), "%" + SearchCondition.axlyzt + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","lyzt","lyztid");

 				}

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据

@@ -142,24 +153,7 @@ public class AxCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 		};

-	/*	String user1 = (String) Utils.getSession().getAttribute("user");

-		String user2 = SecUtils.getCurrUser().getId();

-		if(user2!=null){

-			if(!user2.equals(user1)){

-				SearchCondition.axpage = 1;

-				SearchCondition.axmc = "";

-				SearchCondition.axszd = "";

-				SearchCondition.axszgk = "";

-				SearchCondition.axszgq = "";

-				SearchCondition.axssjyr = "";

-				SearchCondition.axlyzt = "";

-			}

-			

-		}

-		Utils.getSession().setAttribute("user", user2);

-		if (page.getPage() < 1) {

-			page.setPage(SearchCondition.axpage);

-		}*/

+	

 		if (page.getPage() < 1) {

 			Object axpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "axpage");

 			if (StringUtils.isEmpty(axpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(axpage))) {

@@ -168,8 +162,6 @@ public class AxCtl extends BaseWebCtl {
 
 			page.setPage(Integer.valueOf(String.valueOf(axpage)));

 		}

 

-		/*page.setSort("axmc");

-		page.setOrder("asc");*/

 		page.setSort("id");

 		page.setOrder("desc");

 		Page<AxEntity> list = query.findAll(spec, toPageRequest(page), AxEntity.class);

@@ -197,19 +189,7 @@ public class AxCtl extends BaseWebCtl {
 
 				voList.add(vo);

 			}

 		}

-		

-

-		/*if (isPOST(request)) {

-			SearchCondition.axpage = page.getPage();

-			SearchCondition.axmc = axmc;

-			SearchCondition.axszd = szdid;

-			SearchCondition.axszgk = szgkid;

-			SearchCondition.axszgq = szgqid;

-			SearchCondition.axssjyr = ssjyr;

-			SearchCondition.axlyzt = lyztid;

-		}*/

-

-		

+	

 		if (isPOST(request)) {

 			cacheSCmap.put("axpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

@@ -230,6 +210,7 @@ public class AxCtl extends BaseWebCtl {
 
 		return "gkjcxx/ax/axmain";

 	}

 

+	//删除

 	@RequestMapping(value = "/delete")

 	@RequiresPermissions("ax:delete")

 	@ResponseBody

@@ -259,6 +240,7 @@ public class AxCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//保存

 	@RequestMapping(value = "/save")

 	@ResponseBody

 	@RequiresPermissions("ax:add")

@@ -309,11 +291,6 @@ public class AxCtl extends BaseWebCtl {
 
 			ssjyr.setId(ssjyrid);

 			axEntity.setSsjyr(ssjyr);

 

-			/*

-			 * axEntity.setAxlx(code.getAxlx());

-			 * axEntity.setAxgn(code.getAxgn());

-			 * axEntity.setLyzt(code.getLyzt());

-			 */

 			// 非必填字段的验证，如为空则不验证，不为空则验证

 			if (!StringUtils.isEmpty(axlxid)) {

 				CodeEntity axlx = new CodeEntity(axlxid);

@@ -350,18 +327,7 @@ public class AxCtl extends BaseWebCtl {
 
 			CodeEntity szd = new CodeEntity(szdid);

 			axEntity.setSzd(szd);

 			axService.save(axEntity);

-			// 如果是市级新增或者修改，保存后同步到省级

-			/*try {

-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && needWS()) {

-					AxWebService webService = axService.getWebService(null);

-					webService.save(code);

-					code.setTbzt(Constants.YES);

-					axService.save(code);

-				}

-			} catch (Exception e) {

-				code.setTbzt(Constants.NO);

-				axService.save(code);

-			}*/

+			

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -370,6 +336,7 @@ public class AxCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//编辑

 	@RequestMapping(value = "/edit")

 	@RequiresPermissions("ax:edit")

 	public String edit(Model model, String id) {

@@ -411,6 +378,7 @@ public class AxCtl extends BaseWebCtl {
 
 		return "gkjcxx/ax/axedit";

 	}

 

+	//查看

 	@RequestMapping(value = "/view")

 	@RequiresPermissions("ax:main")

 	public String view(Model model, String id) {

@@ -444,6 +412,7 @@ public class AxCtl extends BaseWebCtl {
 
 		return "gkjcxx/ax/axview";

 	}

 

+	//新增

 	@RequestMapping(value = "/add")

 	@RequiresPermissions("ax:add")

 	public String add(Model model) {

+ 1 - 21
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/cb/ctl/CbCtl.java
查看文件 

@@ -84,22 +84,7 @@ public class CbCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));
 
 			}
 
 		};
 
-		/*String user1 = (String) Utils.getSession().getAttribute("user");
 
-		String user2 = SecUtils.getCurrUser().getId();
 
-		if(user2!=null){
 
-			if(!user2.equals(user1)){
 
-				SearchCondition.cbpage=1;
 
-				SearchCondition.zwcm="";
 
-				SearchCondition.ywcm="";
 
-				SearchCondition.cbsyr="";
 
-			}
 
-			
-		}
 
-		Utils.getSession().setAttribute("user", user2);*/
 
 		
-		/*if(page.getPage()<1){
 
-			page.setPage(SearchCondition.cbpage);
 
-		}*/
 
 		if (page.getPage() < 1) {
 
 			Object cbpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "cbpage");
 
 			if (StringUtils.isEmpty(cbpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(cbpage))) {
 
@@ -114,12 +99,7 @@ public class CbCtl extends BaseWebCtl {
 
 		for (CbEntity entity : list) {
 
 			voList.add(entity);
 
 		}
 
-		/*if(isPOST(request)){
 
-			SearchCondition.cbpage=page.getPage();
 
-			SearchCondition.zwcm=zwcm;
 
-			SearchCondition.ywcm=ywcm;
 
-			SearchCondition.cbsyr=cbsyr;
 
-		}*/
 
+		
 		if (isPOST(request)) {
 
 			cacheSCmap.put("cbpage", page.getPage());
 
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

+ 34 - 50
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/fbd/ctl/FbdCtl.java
查看文件 

@@ -71,6 +71,20 @@ public class FbdCtl extends BaseWebCtl {
 
 	@Autowired

 	private XzglbmxxService xzglbmService;

 

+	/**

+	 * 一览信息

+	 * @param page 分页

+	 * @param model

+	 * @param request

+	 * @param fbdmc 防波堤名称

+	 * @param szgkid 所在港口ID

+	 * @param szgqid 所在港区ID

+	 * @param szdid 所在地ID

+	 * @param fbdlx 防波堤类型

+	 * @param menuid

+	 * @return

+	 * @throws JsonProcessingException

+	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("fbd:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String fbdmc, final String szgkid, final String szgqid, final String szdid, final String fbdlx, String menuid) throws JsonProcessingException {

@@ -130,24 +144,6 @@ public class FbdCtl extends BaseWebCtl {
 
 			}

 		};

 

-		/*String user1 = (String) Utils.getSession().getAttribute("user");

-		String user2 = SecUtils.getCurrUser().getId();

-		if(user2!=null){

-			if(!user2.equals(user1)){

-				SearchCondition.fbdpage = 1;

-				SearchCondition.fbdmc = "";

-				SearchCondition.fbdlx = "";

-				SearchCondition.fbdszd = "";

-				SearchCondition.fbdszgk = "";

-				SearchCondition.fbdszgq = "";

-			}

-			

-		}

-		Utils.getSession().setAttribute("user", user2);

-		

-		if (page.getPage() < 1) {

-			page.setPage(SearchCondition.fbdpage);

-		}*/

 		if (page.getPage() < 1) {

 			Object fbdpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fbdpage");

 			if (StringUtils.isEmpty(fbdpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(fbdpage))) {

@@ -184,22 +180,11 @@ public class FbdCtl extends BaseWebCtl {
 
 		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));

 		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));

 		// 翻页共通

-

-		/*if (isPOST(request)) {

-			SearchCondition.fbdpage = page.getPage();

-			SearchCondition.fbdmc = fbdmc;

-			SearchCondition.fbdlx = fbdlx;

-			SearchCondition.fbdszd = szdid;

-			SearchCondition.fbdszgk = szgkid;

-			SearchCondition.fbdszgq = szgqid;

-		}*/

-

-		

-		

 		putPageInfo(model, page, list);

 		return "gkjcxx/fbd/fbdmain";

 	}

 

+	//删除

 	@RequestMapping(value = "/delete")

 	@RequiresPermissions("fbd:delete")

 	@ResponseBody

@@ -229,6 +214,7 @@ public class FbdCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//保存数据

 	@RequestMapping(value = "/save")

 	@RequiresPermissions("fbd:add")

 	@ResponseBody

@@ -250,11 +236,6 @@ public class FbdCtl extends BaseWebCtl {
 
 			wr.setMessage("请选择所在港区");

 			return wr;

 		}

-		/*if (StringUtils.isEmpty(ssjyrid)) {

-			wr.setSuccess(false);

-			wr.setMessage("请选择所属经营人");

-			return wr;

-		}*/

 

 		FbdEntity fbdEntity = new FbdEntity();

 		try {

@@ -272,9 +253,6 @@ public class FbdCtl extends BaseWebCtl {
 
 			szgq.setId(szgqid);

 			fbdEntity.setSzgq(szgq);

 

-			/*GkjyrEntity ssjyr = new GkjyrEntity();

-			ssjyr.setId(ssjyrid);

-			fbdEntity.setSsjyr(ssjyr);*/

 			if(!StringUtils.isEmpty(ssjyrid)){

 				GkjyrEntity ssjyr = new GkjyrEntity();

 				ssjyr.setId(ssjyrid);

@@ -287,18 +265,7 @@ public class FbdCtl extends BaseWebCtl {
 
 			CodeEntity szd = new CodeEntity(szdid);

 			fbdEntity.setSzd(szd);

 			fbdService.save(fbdEntity);

-			// 如果是市级新增或者修改，保存后同步到省级

-			/*try {

-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && needWS()) {

-					FbdWebService webService = fbdService.getWebService(null);

-					webService.save(code);

-					code.setTbzt(Constants.YES);

-					fbdService.save(code);

-				}

-			} catch (Exception e) {

-				code.setTbzt(Constants.NO);

-				fbdService.save(code);

-			}*/

+			

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -307,6 +274,12 @@ public class FbdCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	/**

+	 * 编辑数据

+	 * @param model

+	 * @param id

+	 * @return

+	 */

 	@RequestMapping(value = "/edit")

 	@RequiresPermissions("fbd:edit")

 	public String edit(Model model, String id) {

@@ -327,6 +300,12 @@ public class FbdCtl extends BaseWebCtl {
 
 		return "gkjcxx/fbd/fbdedit";

 	}

 

+	/**

+	 * 查看

+	 * @param model

+	 * @param id

+	 * @return

+	 */

 	@RequestMapping(value = "/view")

 	@RequiresPermissions("fbd:main")

 	public String view(Model model, String id) {

@@ -347,6 +326,11 @@ public class FbdCtl extends BaseWebCtl {
 
 		return "gkjcxx/fbd/fbdview";

 	}

 

+	/**

+	 * 新增

+	 * @param model

+	 * @return

+	 */

 	@RequestMapping(value = "/add")

 	@RequiresPermissions("fbd:add")

 	public String add(Model model) {

+ 0 - 28
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gk/ctl/GkCtl.java
查看文件 

@@ -75,41 +75,22 @@ public class GkCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(gkmc)) {

 					list.add(cb.like(root.get("gkmc").as(String.class), "%" + gkmc + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("gkmc").as(String.class), "%" + SearchCondition.gkmc + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "gkmc");

 				}

 				if (StringUtils.isNotEmpty(szd)) {

 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szd + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.gkszd + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szd");

 				}

 				if (StringUtils.isNotEmpty(ssgkglbm)) {

 					list.add(cb.like(root.get("ssgkglbm").get("id").as(String.class), "%" + ssgkglbm + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("ssgkglbm").get("id").as(String.class), "%" + SearchCondition.gkssgkglbm + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "ssgkglbm");

 				}

 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));

 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 		};

-		/*String user1 = (String) Utils.getSession().getAttribute("user");

-		String user2 = SecUtils.getCurrUser().getId();

-		if(user2!=null){

-			if(!user2.equals(user1)){

-				SearchCondition.gkpage = 1;

-				SearchCondition.gkmc = "";

-				SearchCondition.gkszd = "";

-				SearchCondition.gkssgkglbm = "";

-			}

-			

-		}

-		Utils.getSession().setAttribute("user", user2);*/

-		

-		/*if (page.getPage() < 1) {

-			page.setPage(SearchCondition.gkpage);

-		}*/

 		if (page.getPage() < 1) {

 			Object gkpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkpage");

 			if (StringUtils.isEmpty(gkpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(gkpage))) {

@@ -140,15 +121,6 @@ public class GkCtl extends BaseWebCtl {
 
 		model.addAttribute("szd",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szd"));

 		model.addAttribute("ssgkglbm",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssgkglbm"));

 		model.addAttribute("menuid", menuid);

-

-		/*if (isPOST(request)) {

-			SearchCondition.gkpage = page.getPage();

-			SearchCondition.gkmc = gkmc;

-			SearchCondition.gkszd = szd;

-			SearchCondition.gkssgkglbm = ssgkglbm;

-		}*/

-

-		

 		

 		// 翻页共通

 		putPageInfo(model, page, list);

+ 1 - 45
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gq/ctl/GqCtl.java
查看文件 

@@ -82,43 +82,31 @@ public class GqCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(gqmc)) {

 					list.add(cb.like(root.get("gqmc").as(String.class), "%" + gqmc + "%"));

 				} else if (isGET(request)) {

-					// list.add(cb.like(root.get("gqmc").as(String.class), "%" +

-					// SearchCondition.gqmc + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "gqmc");

 				}

 

 				if (StringUtils.isNotEmpty(gqszsylx)) {

 					list.add(cb.like(root.get("gqszsylx").get("id").as(String.class), "%" + gqszsylx + "%"));

 				} else if (isGET(request)) {

-					// list.add(cb.like(root.get("gqszsylx").get("id").as(String.class),

-					// "%" + SearchCondition.gqszsylx + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "gqszsylx");

 				}

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				} else if (isGET(request)) {

-					// list.add(cb.like(root.get("szgk").get("id").as(String.class),

-					// "%" + SearchCondition.gqszgk + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgk", "szgkid");

 				}

 

 				if (StringUtils.isNotEmpty(szd)) {

 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szd + "%"));

 				} else if (isGET(request)) {

-					// list.add(cb.like(root.get("szd").get("id").as(String.class),

-					// "%" + SearchCondition.gqszd + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szd");

 				}

 				if (StringUtils.isNotEmpty(ssgkglbm)) {

 					list.add(cb.like(root.get("ssgkglbm").get("id").as(String.class), "%" + ssgkglbm + "%"));

 				} else if (isGET(request)) {

-					// list.add(cb.like(root.get("ssgkglbm").get("id").as(String.class),

-					// "%" + SearchCondition.gqssgkglbm + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "ssgkglbm");

 				}

 				if (isJyr()) {

-					// list.add(cb.like(root.get("ssjyr").get("id").as(String.class),

-					// "%" + getSsjyr().getId() + "%"));

 				} else {

 					In<String> in = cb.in(root.get("id").as(String.class));

 					@SuppressWarnings("unchecked")

@@ -134,20 +122,6 @@ public class GqCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 		};

-		/*

-		 * String user1 = (String) Utils.getSession().getAttribute("user");

-		 * String user2 = SecUtils.getCurrUser().getId(); if(user2!=null){

-		 * if(!user2.equals(user1)){ SearchCondition.gqpage = 1;

-		 * SearchCondition.gqmc = ""; SearchCondition.gqszd = "";

-		 * SearchCondition.gqssgkglbm = ""; SearchCondition.gqszgk = "";

-		 * SearchCondition.gqszsylx = ""; }

-		 * 

-		 * } Utils.getSession().setAttribute("user", user2);

-		 */

-

-		/*

-		 * if (page.getPage() < 1) { page.setPage(SearchCondition.gqpage); }

-		 */

 		if (page.getPage() < 1) {

 			Object gqpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gqpage");

 			if (StringUtils.isEmpty(gqpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(gqpage))) {

@@ -186,15 +160,6 @@ public class GqCtl extends BaseWebCtl {
 
 		model.addAttribute("list", voList);

 		model.addAttribute("menuid", menuid);

 

-		/*

-		 * if (isPOST(request)) { SearchCondition.gqpage = page.getPage();

-		 * SearchCondition.gqmc = gqmc; SearchCondition.gqszd = szd;

-		 * SearchCondition.gqssgkglbm = ssgkglbm; SearchCondition.gqszgk =

-		 * szgkid; SearchCondition.gqszsylx = gqszsylx;

-		 * 

-		 * }

-		 */

-

 		// 翻页共通

 		putPageInfo(model, page, list);

 		return "gkjcxx/gq/gqmain";

@@ -275,16 +240,7 @@ public class GqCtl extends BaseWebCtl {
 
 			if (gqList != null && gqList.size() > 0) {

 				Utils.getSession().setAttribute("gkList", gkService.findByGqList(gqList));

 			}

-			// 如果是市级新增或者修改，保存后同步到省级

-			/*

-			 * try { if

-			 * (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) &&

-			 * needWS()) { GqWebService webService =

-			 * gqService.getWebService(null); webService.save(code);

-			 * code.setTbzt(Constants.YES); gqService.save(code); } } catch

-			 * (Exception e) { code.setTbzt(Constants.NO); gqService.save(code);

-			 * }

-			 */

+			

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

+ 38 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/jghd/ctl/JghdCtl.java
查看文件 

@@ -60,6 +60,19 @@ public class JghdCtl extends BaseWebCtl {
 
 	@Autowired

 	private GkjyrService gkjyrService;

 

+	/**

+	 * 一览页面

+	 * @param page 分页

+	 * @param model

+	 * @param request

+	 * @param szdid 所在地ID

+	 * @param szgkid 所在港口ID

+	 * @param hdmc 航道名称

+	 * @param hdlx

+	 * @param menuid

+	 * @return

+	 * @throws JsonProcessingException

+	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("jghd:main")

 	public String main(SimplePageRequest page, Model model,final HttpServletRequest request, final String szdid, final String szgkid, final String hdmc, final String hdlx, String menuid) throws JsonProcessingException {

@@ -183,6 +196,14 @@ public class JghdCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	/**

+	 * 保存信息

+	 * @param model

+	 * @param code

+	 * @param szdid

+	 * @param szgkid

+	 * @return

+	 */

 	@RequestMapping(value = "/save")

 	@RequiresPermissions("jghd:add")

 	@ResponseBody

@@ -238,6 +259,12 @@ public class JghdCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	/**

+	 * 编辑

+	 * @param model

+	 * @param id

+	 * @return

+	 */

 	@RequestMapping(value = "/edit")

 	@RequiresPermissions("jghd:edit")

 	public String edit(Model model, String id) {

@@ -253,6 +280,12 @@ public class JghdCtl extends BaseWebCtl {
 
 		return "gkjcxx/jghd/jghdedit";

 	}

 

+	/**

+	 * 查看

+	 * @param model

+	 * @param id

+	 * @return

+	 */

 	@RequestMapping(value = "/view")

 	@RequiresPermissions("jghd:main")

 	public String view(Model model, String id) {

@@ -277,6 +310,11 @@ public class JghdCtl extends BaseWebCtl {
 
 		return "gkjcxx/jghd/jghdview";

 	}

 

+	/**

+	 * 新增

+	 * @param model

+	 * @return

+	 */

 	@RequestMapping(value = "/add")

 	@RequiresPermissions("jghd:add")

 	public String add(Model model) {

+ 4 - 43
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/md/ctl/MdCtl.java
查看文件 

@@ -71,7 +71,7 @@ public class MdCtl extends BaseWebCtl {
 
 	private XzglbmxxService xzglbmService;
 
 
 	/**
 
-	 * 锚地管理
 
+	 * 锚地一览管理
 
 	 * 
 	 * @return
 
 	 */
 
@@ -88,19 +88,16 @@ public class MdCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(mdmc)) {
 
 					list.add(cb.like(root.get("mdmc").as(String.class), "%" + mdmc + "%"));
 
 				} else if (StringUtils.isNotEmpty(SearchCondition.mdmc) && isGET(request)) {
 
-					//list.add(cb.like(root.get("mdmc").as(String.class), "%" + SearchCondition.mdmc + "%"));
 
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"mdmc");
 
 				}
 
 				if (StringUtils.isNotEmpty(szgkid)) {
 
 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
 
 				} else if (isGET(request)) {
 
-					//list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.mdszgk + "%"));
 
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szgk","szgkid");
 
 				}
 
 				if (StringUtils.isNotEmpty(szdid)) {
 
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
 
 				} else if (isGET(request)) {
 
-					//list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.mdszd + "%"));
 
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szd","szdid");
 
 				}
 
 				if (StringUtils.isNotEmpty(xzhghid)) {
 
@@ -109,7 +106,6 @@ public class MdCtl extends BaseWebCtl {
 
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","xzhgh","xzhghid");
 
 				}
 
 				if (isJyr()) {
 
-					//list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 
 				} else {
 
 					In<String> in = cb.in(root.get("szgq").as(String.class));
 
 					@SuppressWarnings("unchecked")
 
@@ -126,23 +122,6 @@ public class MdCtl extends BaseWebCtl {
 
 			}
 
 		};
 
 
-		/*String user1 = (String) Utils.getSession().getAttribute("user");
 
-		String user2 = SecUtils.getCurrUser().getId();
 
-		if(user2!=null){
 
-			if(!user2.equals(user1)){
 
-				SearchCondition.mdpage = 1;
 
-				SearchCondition.mdmc = "";
 
-				SearchCondition.mdszd = "";
 
-				SearchCondition.mdszgk = "";
 
-				SearchCondition.mdxzhgh = "";
 
-			}
 
-			
-		}
 
-		Utils.getSession().setAttribute("user", user2);*/
 
-		
-		/*if (page.getPage() < 1) {
 
-			page.setPage(SearchCondition.mdpage);
 
-		}*/
 
 		if (page.getPage() < 1) {
 
 			Object mdpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "mdpage");
 
 			if (StringUtils.isEmpty(mdpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(mdpage))) {
 
@@ -187,20 +166,12 @@ public class MdCtl extends BaseWebCtl {
 
 		model.addAttribute("xzhgh",CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xzhghid"));
 
 		model.addAttribute("menuid", menuid);
 
 		
-		/*if (isPOST(request)) {
 
-			SearchCondition.mdpage = page.getPage();
 
-			SearchCondition.mdmc = mdmc;
 
-			SearchCondition.mdszd = szdid;
 
-			SearchCondition.mdszgk = szgkid;
 
-			SearchCondition.mdxzhgh = xzhghid;
 
-			
-		}*/
 
-
 
 		// 翻页共通
 
 		putPageInfo(model, page, list);
 
 		return "gkjcxx/md/mdmain";
 
 	}
 
 
+	//删除
 
 	@RequestMapping(value = "/delete")
 
 	@RequiresPermissions("md:delete")
 
 	@ResponseBody
 
@@ -229,6 +200,7 @@ public class MdCtl extends BaseWebCtl {
 
 		return wr;
 
 	}
 
 
+	//保存
 
 	@RequestMapping(value = "/save")
 
 	@ResponseBody
 
 	@RequiresPermissions("md:add")
 
@@ -285,18 +257,7 @@ public class MdCtl extends BaseWebCtl {
 
 			}
 
 
 			mdService.save(entity);
 
-			// 如果是市级新增或者修改，保存后同步到省级
 
-			/*try {
 
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && needWS()) {
 
-					MdWebService webService = mdService.getWebService(null);
 
-					webService.save(code);
 
-					code.setTbzt(Constants.YES);
 
-					mdService.save(code);
 
-				}
 
-			} catch (Exception e) {
 
-				code.setTbzt(Constants.NO);
 
-				mdService.save(code);
 
-			}*/
 
+			
 		} catch (Exception e) {
 
 			wr.setSuccess(false);
 
 			wr.setMessage("操作失败！");

+ 15 - 43
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/zyq/ctl/ZyqCtl.java
查看文件 

@@ -70,6 +70,19 @@ public class ZyqCtl extends BaseWebCtl {
 
 	@Autowired

 	private XzglbmxxService xzglbmService;

 

+	/**

+	 * 一览页面

+	 * @param page 分页

+	 * @param model

+	 * @param request

+	 * @param zyqmc 作业区名称

+	 * @param szgkid 所在港口ID

+	 * @param szgqid 所在港区ID

+	 * @param szdid 所在地ID

+	 * @param menuid

+	 * @return

+	 * @throws JsonProcessingException

+	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("zyqgl:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String zyqmc, final String szgkid, final String szgqid, final String szdid, String menuid) throws JsonProcessingException {

@@ -82,29 +95,24 @@ public class ZyqCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(zyqmc)) {

 					list.add(cb.like(root.get("zyqmc").as(String.class), "%" + zyqmc + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("zyqmc").as(String.class), "%" + SearchCondition.zyqmc + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"zyqmc");

 				}

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				} else if (isGET(request)) {

-					/*list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.zyqszgk + "%"));*/

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szgk","szgkid");

 				}

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.zyqszgq + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szgq","szgqid");

 				}

 				if (StringUtils.isNotEmpty(szdid)) {

 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.zyqszd + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szd","szdid");

 				}

 				if (isJyr()) {

-					//list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));

 				} else {

 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));

 					@SuppressWarnings("unchecked")

@@ -121,23 +129,6 @@ public class ZyqCtl extends BaseWebCtl {
 
 			}

 		};

 

-		/*String user1 = (String) Utils.getSession().getAttribute("user");

-		String user2 = SecUtils.getCurrUser().getId();

-		if(user2!=null){

-			if(!user2.equals(user1)){

-				SearchCondition.zyqpage = 1;

-				SearchCondition.zyqmc = "";

-				SearchCondition.zyqszd = "";

-				SearchCondition.zyqszgk = "";

-				SearchCondition.zyqszgq = "";

-			}

-			

-		}

-		Utils.getSession().setAttribute("user", user2);*/

-		

-		/*if (page.getPage() < 1) {

-			page.setPage(SearchCondition.zyqpage);

-		}*/

 		if (page.getPage() < 1) {

 			Object zyqpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zyqpage");

 			if (StringUtils.isEmpty(zyqpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(zyqpage))) {

@@ -174,15 +165,6 @@ public class ZyqCtl extends BaseWebCtl {
 
 		model.addAttribute("list", voList);

 		// 翻页共通

 

-		/*if (isPOST(request)) {

-			SearchCondition.zyqpage = page.getPage();

-			SearchCondition.zyqmc = zyqmc;

-			SearchCondition.zyqszd = szdid;

-			SearchCondition.zyqszgk = szgkid;

-			SearchCondition.zyqszgq = szgqid;

-		}

-*/

-		

 		putPageInfo(model, page, list);

 		return "gkjcxx/zyq/zyqmain";

 	}

@@ -204,6 +186,7 @@ public class ZyqCtl extends BaseWebCtl {
 
 		return "gkjcxx/zyq/zyqadd";

 	}

 

+	//保存数据

 	@RequestMapping(value = "/save")

 	@ResponseBody

 	@RequiresPermissions("zyqgl:add")

@@ -244,18 +227,7 @@ public class ZyqCtl extends BaseWebCtl {
 
 			zyq.setBz(code.getBz());

 			zyq.setZyid(code.getZyid());

 			zyqService.save(zyq);

-			// 如果是市级新增或者修改，保存后同步到省级

-			/*try {

-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && needWS()) {

-					ZyqWebService webService = zyqService.getWebService(null);

-					webService.save(code);

-					code.setTbzt(Constants.YES);

-					zyqService.save(code);

-				}

-			} catch (Exception e) {

-				code.setTbzt(Constants.NO);

-				zyqService.save(code);

-			}*/

+		

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

+ 22 - 15
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/ctl/TzjhglCtl.java
查看文件 

@@ -60,14 +60,32 @@ public class TzjhglCtl extends BaseWebCtl {
 
 	@Autowired

 	protected TaskInfoService taskInfoService;

 

+	/**

+	 * 一览页面

+	 * @param page

+	 * @param model

+	 * @param request

+	 * @param xmid

+	 * @param szdid

+	 * @param xmmc

+	 * @param xmfr

+	 * @param jhnd

+	 * @param ndjhtz1

+	 * @param ndjhtz2

+	 * @param szgqid

+	 * @param szgkid

+	 * @param xmlbid

+	 * @param sfyzjbzid

+	 * @param menuid

+	 * @return

+	 * @throws JsonProcessingException

+	 * @throws UnsupportedEncodingException

+	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("tzjhgl:main")

 	public String main(SimplePageRequest page, final Model model,final HttpServletRequest request, final String xmid, final String szdid, final String xmmc, final String xmfr, final String jhnd, final Double ndjhtz1, final Double ndjhtz2, final String szgqid, final String szgkid, final String xmlbid, final String sfyzjbzid,String menuid) throws JsonProcessingException, UnsupportedEncodingException {

 

 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"tzjhgl");

-		//final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

-		

-		

 		Specification<TzjhglEntity> spec = new Specification<TzjhglEntity>() {

 			// 查询条件

 			@Override

@@ -83,39 +101,33 @@ public class TzjhglCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(xmmc)) {

 					list.add(cb.like(root.get("xmid").get("xmmc").as(String.class), "%" + xmmc + "%"));

 				}else if (isGET(request)) {

-					//list.add(cb.like(root.get("xmid").get("xmmc").as(String.class), "%" + SearchCondition.tzjhxmmc + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "xmmc", "xmid","xmmc");

 				}

 				if (StringUtils.isNotEmpty(xmfr)) {

 					list.add(cb.like(root.get("xmid").get("xmfr").as(String.class), "%" + xmfr + "%"));

 				}else if (isGET(request)) {

-					//list.add(cb.like(root.get("xmid").get("xmfr").as(String.class), "%" + SearchCondition.tzjhxmfr + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "xmfr", "xmid","xmfr");

 				}

 				if (StringUtils.isNotEmpty(jhnd)) {

 					list.add(cb.like(root.get("jhnd").as(String.class), "%" + jhnd + "%"));

 				}else if (isGET(request)) {

-					//list.add(cb.like(root.get("jhnd").as(String.class), "%" + SearchCondition.tzjhjhnd + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"jhnd");

 				}

 				if (StringUtils.isNotEmpty(szdid)) {

 					list.add(cb.like(root.get("xmid").get("szd").get("id").as(String.class), "%" + szdid + "%"));

 				}else if (isGET(request)) {

-					//list.add(cb.like(root.get("xmid").get("szd").get("id").as(String.class), "%" + SearchCondition.tzjhszd + "%"));

 					Object val = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");

 					list.add(cb.like(root.get("xmid").get("szd").get("id").as(String.class), "%" + val + "%"));

 				}

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("xmid").get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				}else if (isGET(request)) {

-					//list.add(cb.like(root.get("xmid").get("szgk").get("id").as(String.class), "%" + SearchCondition.tzjhszgk + "%"));

 					Object val = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");

 					list.add(cb.like(root.get("xmid").get("szgk").get("id").as(String.class), "%" + val + "%"));

 				}

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("xmid").get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

 				}else if (StringUtils.isNotEmpty(SearchCondition.tzjhszgq) && isGET(request)) {

-					//list.add(cb.like(root.get("xmid").get("szgq").get("id").as(String.class), "%" + SearchCondition.tzjhszgq + "%"));

 					Object val = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");

 					list.add(cb.like(root.get("xmid").get("szgq").get("id").as(String.class), "%" + val + "%"));

 				}

@@ -150,17 +162,12 @@ public class TzjhglCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(sfyzjbzid)) {

 					list.add(cb.like(root.get("sfyzjbz").get("id").as(String.class), "%" + sfyzjbzid + "%"));

 				}else if (isGET(request)) {

-					/*list.add(cb.like(root.get("sfyzjbz").get("id").as(String.class), "%" + SearchCondition.tzsfyzjbz + "%"));*/

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "sfyzjbz","sfyzjbzid");

 				}

 				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {

 					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));

 				}

-				/*if(StringUtils.isNotEmpty(sfyzjbzid)){

-					list.add(cb.equal(root.get("sfyzjbz").get("id").as(String.class), sfyzjbzid));

-				}else if(StringUtils.isNotEmpty(SearchCondition.tzsfyzjbz)&& isGET(request)){

-					list.add(cb.equal(root.get("sfyzjbz").get("id").as(String.class), SearchCondition.tzsfyzjbz));

-				}*/

+				

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在港区的数据

 				if (isJyr()) {

 					list.add(cb.like(root.get("xmid").get("jyrid").get("id").as(String.class), "%"

+ 22 - 50
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java
查看文件 

@@ -91,7 +91,23 @@ public class XmxxglCtl extends BaseWebCtl {
 
 	private BwService bwService;

 	@Autowired

 	private XmbwglbService xmbwglbService;

-

+	

+	/**

+	 * 一览

+	 * @param page 分页

+	 * @param model

+	 * @param request

+	 * @param xmmc 项目名称 

+	 * @param szgkid 所在港口ID

+	 * @param szgqid 所在港区ID

+	 * @param menuid

+	 * @param xmhzjbid

+	 * @param xmfr

+	 * @param szdid 所在地ID

+	 * @param sfyzjbzid

+	 * @return

+	 * @throws JsonProcessingException

+	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("xmxxgl:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {

@@ -107,43 +123,31 @@ public class XmxxglCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(xmmc)) {

 					list.add(cb.like(root.get("xmmc").as(String.class), "%" + xmmc + "%"));

 				} else if (isGET(request)) {

-					// list.add(cb.like(root.get("xmmc").as(String.class), "%" +

-					// SearchCondition.xmxmmc + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "xmmc");

 				}

 				if (StringUtils.isNotEmpty(xmfr)) {

 					list.add(cb.like(root.get("xmfr").as(String.class), "%" + xmfr + "%"));

 				} else if (isGET(request)) {

-					// list.add(cb.like(root.get("xmfr").as(String.class), "%" +

-					// SearchCondition.xmxmfr + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "xmfr");

 				}

 				if (StringUtils.isNotEmpty(xmhzjbid)) {

 					list.add(cb.like(root.get("xmhzjb").get("id").as(String.class), "%" + xmhzjbid + "%"));

 				} else if (isGET(request)) {

-					// list.add(cb.like(root.get("xmhzjb").get("id").as(String.class),

-					// "%" + SearchCondition.xmxmhzjb + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "xmhzjb", "xmhzjbid");

 				}

 				if (StringUtils.isNotEmpty(szdid)) {

 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));

 				} else if (isGET(request)) {

-					// list.add(cb.like(root.get("szd").get("id").as(String.class),

-					// "%" + SearchCondition.xmszd + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szd", "szdid");

 				}

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				} else if (isGET(request)) {

-					// list.add(cb.like(root.get("szgk").get("id").as(String.class),

-					// "%" + SearchCondition.xmszgk + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgk", "szgkid");

 				}

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

 				} else if (isGET(request)) {

-					// list.add(cb.like(root.get("szgq").get("id").as(String.class),

-					// "%" + SearchCondition.xmszgq + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgq", "szgqid");

 				}

 				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {

@@ -169,7 +173,6 @@ public class XmxxglCtl extends BaseWebCtl {
 
 					subQueryPredicates.add(cb.equal(dpRoot.get("xmid").get("id").as(String.class), root.get("id").as(String.class)));

 					Object val = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyzjbzid");

 					if (("201").equals(val) && val != "") {

-						// subQueryPredicates.add(cb.equal(dpRoot.get("sfyzjbz").get("id").as(String.class),SearchCondition.xmsfyzjbz));

 						subQueryPredicates.add(cb.equal(dpRoot.get("sfyzjbz").get("id").as(String.class), val));

 						subquery.where(subQueryPredicates.toArray(new Predicate[] {}));

 						list.add(cb.exists(subquery));

@@ -199,21 +202,6 @@ public class XmxxglCtl extends BaseWebCtl {
 
 			}

 		};

 

-		/*

-		 * String user1 = (String) Utils.getSession().getAttribute("user");

-		 * String user2 = SecUtils.getCurrUser().getId(); if(user2!=null){

-		 * if(!user2.equals(user1)){ SearchCondition.xmxxpage = 1;

-		 * SearchCondition.xmxmmc = ""; SearchCondition.xmszd = "";

-		 * SearchCondition.xmszgk = ""; SearchCondition.xmszgq = "";

-		 * SearchCondition.xmxmfr = ""; SearchCondition.xmxmhzjb = "";

-		 * SearchCondition.xmsfyzjbz = ""; }

-		 * 

-		 * } Utils.getSession().setAttribute("user", user2);

-		 */

-

-		/*

-		 * if (page.getPage() < 1) { page.setPage(SearchCondition.xmxxpage); }

-		 */

 		if (page.getPage() < 1) {

 			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");

 			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {

@@ -282,19 +270,9 @@ public class XmxxglCtl extends BaseWebCtl {
 
 			}

 		}

 

-		/*

-		 * if (isPOST(request)) { SearchCondition.xmxxpage = page.getPage();

-		 * SearchCondition.xmxmmc = xmmc; SearchCondition.xmszd = szdid;

-		 * SearchCondition.xmszgk = szgkid; SearchCondition.xmszgq = szgqid;

-		 * SearchCondition.xmxmfr = xmfr; SearchCondition.xmxmhzjb = xmhzjbid;

-		 * SearchCondition.xmsfyzjbz = sfyzjbzid;

-		 * 

-		 * }

-		 */

 		if (isPOST(request)) {

 			cacheSCmap.put("xmxxpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			// System.out.println(JSONObject.fromObject(cacheSCmap));

 		}

 

 		model.addAttribute("list", voList);

@@ -304,8 +282,6 @@ public class XmxxglCtl extends BaseWebCtl {
 
 		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));

 		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));

 		model.addAttribute("xmhzjbid", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmhzjbid"));

-		// model.addAttribute("sfyzjbz",

-		// CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyzjbzid"));

 		model.addAttribute("ztz", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ztz"));

 		model.addAttribute("menuid", menuid);

 

@@ -314,6 +290,7 @@ public class XmxxglCtl extends BaseWebCtl {
 
 		return "gkjsgl/xmxxgl/xmxxglmain";

 	}

 

+	//删除

 	@RequestMapping(value = "/delete")

 	@RequiresPermissions("xmxxgl:delete")

 	@ResponseBody

@@ -336,6 +313,7 @@ public class XmxxglCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//保存数据

 	@RequestMapping(value = "/save")

 	@RequiresPermissions("xmxxgl:add")

 	@ResponseBody

@@ -559,6 +537,7 @@ public class XmxxglCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	//编辑

 	@RequestMapping(value = "/edit")

 	@RequiresPermissions("xmxxgl:edit")

 	public String edit(Model model, String id) {

@@ -607,6 +586,7 @@ public class XmxxglCtl extends BaseWebCtl {
 
 		return "gkjsgl/xmxxgl/xmxxgledit";

 	}

 

+	//查看

 	@RequestMapping(value = "/view")

 	@RequiresPermissions("xmxxgl:main")

 	public String view(Model model, String id) {

@@ -821,6 +801,7 @@ public class XmxxglCtl extends BaseWebCtl {
 
 		return list;

 	}

 

+	//导出

 	@RequestMapping(value = "/exportExcelAll")

 	public String exportExcelAll(HttpServletResponse response, final String xmmc, final String xmfr, final String szdid, final String szgkid, final String szgqid, final String xmhzjbid, final String sfyzjbzid) {

 		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {

@@ -893,19 +874,10 @@ public class XmxxglCtl extends BaseWebCtl {
 
 				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");

 				vo.setZyhbwflzw(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getText() : "");

 				vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");

-				// if (entity.getJyrid() != null) {

-				// vo.setSzddzw(entity.getJyrid().getSzd() != null ?

-				// entity.getJyrid().getSzd().getText() : "");

-				// }

 				vo.setSzddzw(entity.getSzd() != null ? entity.getSzd().getText() : "");

 				if (entity.getBwyt() != null) {

 					String bwytzw = "";

 					String[] s = entity.getBwyt().split(",");

-					/*

-					 * for (String string : s) { bwytzw +=

-					 * securityMgr.codeService().findOne(string).getText() +

-					 * " "; }

-					 */

 					for (int i = 0; i < s.length; i++) {

 						CodeEntity code = securityMgr.codeService().findOne(s[i]);

 						if (code != null) {

+ 20 - 22
gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbybbCtl.java
查看文件 

@@ -67,9 +67,25 @@ public class DcsbybbCtl extends BaseWebCtl {
 
 	@Autowired

 	private MtService mtService;

 

-	// @Autowired

-	// private GkjyrService gkjyrService;

-

+	/**

+	 * 一览页面

+	 * @param page 分页

+	 * @param model

+	 * @param gkjyr 经营人

+	 * @param szdid 所在地ID

+	 * @param szgkid 所在港区ID

+	 * @param szgqid 所在港口ID

+	 * @param jcg 进出港

+	 * @param nwm 内外贸

+	 * @param hwzl 货物种类

+	 * @param menuid

+	 * @param zysjq 作业时间起

+	 * @param zysjz 作业时间止

+	 * @param request

+	 * @param dydlid

+	 * @return

+	 * @throws JsonProcessingException

+	 */

 	@RequestMapping(value = "/main")

 	public String main(SimplePageRequest page, Model model, final String gkjyr, final String szdid, final String szgkid, final String szgqid, final String jcg, final String nwm, final String hwzl, final String menuid, final String zysjq, final String zysjz, final HttpServletRequest request,final String dydlid) throws JsonProcessingException {

 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"dcsbybb");

@@ -88,39 +104,33 @@ public class DcsbybbCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(szdid)) {

 					list.add(cb.like(root.get("szd").get("id").as(String.class), szdid + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.ybbszd + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szd","szdid");

 				}

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.equal(root.get("szgk").get("id").as(String.class), szgkid));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.ybbszgk + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szgk","szgkid");

 				}

 

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.equal(root.get("szgq").get("id").as(String.class), szgqid));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.ybbszgq + "%"));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szgq","szgqid");

 				}

 

 				if (StringUtils.isNotEmpty(jcg)) {

 					list.add(cb.equal(root.get("jcg").as(String.class), jcg));

 				} else if (isGET(request)) {

-					//list.add(cb.equal(root.get("jcg").as(String.class), SearchCondition.ybbjcg));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"jcg");

 				}

 				if (StringUtils.isNotEmpty(nwm)) {

 					list.add(cb.equal(root.get("nwm").as(String.class), nwm));

 				} else if (isGET(request)) {

-					//list.add(cb.equal(root.get("nwm").as(String.class), SearchCondition.ybbnwm));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"nwm");

 				}

 				if (StringUtils.isNotEmpty(dydlid)) {

 					list.add(cb.equal(root.get("hwzl").get("id").as(String.class), dydlid));

 				} else if (isGET(request)) {

-					//list.add(cb.equal(root.get("hwzl").as(String.class), SearchCondition.ybbhwzl));

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "hwzl", "dydlid");

 				}

 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

@@ -234,17 +244,6 @@ public class DcsbybbCtl extends BaseWebCtl {
 
 		}

 		model.addAttribute("menuid", menuid);

 

-		/*if (isPOST(request)) {

-			SearchCondition.ybbpage = page.getPage();

-			SearchCondition.ybbjyr = gkjyr;

-			SearchCondition.ybbszd = szdid;

-			SearchCondition.ybbszgk = szgkid;

-			SearchCondition.ybbszgq = szgqid;

-			SearchCondition.ybbhwzl = hwzl;

-			SearchCondition.ybbzysjq = zysjq;

-			SearchCondition.ybbzysjz = zysjz;

-		}*/

-

 		// 翻页共通

 		putPageInfo(model, page, list);

 		return "gkjygl/cghzyxxgl/dcsbybb/dcsbybbmain";

@@ -261,8 +260,7 @@ public class DcsbybbCtl extends BaseWebCtl {
 
 			model.addAttribute("szgq", jyr.getSzgq().getGqmc());

 			model.addAttribute("szd", jyr.getSzd().getText());

 		}

-		/*List<CodeEntity> hwzlList = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_HWZL);

-		model.addAttribute("hwzlList", hwzlList);*/

+		

 		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM");

 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

 		Date today = new Date();

+ 212 - 24
gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/service/impl/DcsbServiceImpl.java
查看文件 

@@ -36,11 +36,11 @@ import org.apache.http.message.BasicNameValuePair;
 
 import org.apache.http.params.CoreConnectionPNames;

 import org.apache.http.util.EntityUtils;

 import org.springframework.beans.factory.annotation.Autowired;

+import org.springframework.data.jpa.repository.Query;

 import org.springframework.stereotype.Service;

 

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

-import com.xt.jygl.gkjcxx.gq.entity.GqEntity;

 import com.xt.jygl.gkjcxx.gq.service.GqService;

 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.dao.DcsbDao;

 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;

@@ -51,7 +51,6 @@ import com.xt.jygl.workflow.service.impl.BaseWorkFlowServiceImpl;
 
 import com.xtframe.core.support.SecurityMgr;

 import com.xtframe.sec.common.BaseEntity;

 import com.xtframe.sec.common.SecRepository;

-import com.xtframe.sec.role.entity.RoleEntity;

 import com.xtframe.sec.user.entity.UserEntity;

 import com.xtframe.sec.utils.SecUtils;

 import com.xtframe.util.StringUtils;

@@ -152,22 +151,21 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 
 			// 提交流程

 			create(param, variables);

 			//

-			/*GqEntity gq = gqService.findOne(gqid);

-			List<RoleEntity> reList = securityMgr.roleService().findByCode(Constants.ROLE_DCSBSC);

-			if (reList != null && reList.size() > 0) {

-				for (RoleEntity re : reList) {

-					List<UserEntity> ueList = securityMgr.userService().findByRole(re.getId());

-					if (ueList != null && gq != null && gq.getSsgkglbm() != null) {

-						for (UserEntity ue : ueList) {

-							if (ue.getSsglbm() != null && ue.getSsglbm().getId() != null && ue.getSsglbm().getId().equals(gq.getSsgkglbm().getId())) {

-								tuisong(" 您收到一条提醒", entity.getSsjyr().getGkjyr() + "的单船申报", 7, ue.getWeixinid(), entity.getId(), true);

-							}

-						}

-					}

-				}

-

-			}

-*/

+			/*

+			 * GqEntity gq = gqService.findOne(gqid); List<RoleEntity> reList =

+			 * securityMgr.roleService().findByCode(Constants.ROLE_DCSBSC); if

+			 * (reList != null && reList.size() > 0) { for (RoleEntity re :

+			 * reList) { List<UserEntity> ueList =

+			 * securityMgr.userService().findByRole(re.getId()); if (ueList !=

+			 * null && gq != null && gq.getSsgkglbm() != null) { for (UserEntity

+			 * ue : ueList) { if (ue.getSsglbm() != null &&

+			 * ue.getSsglbm().getId() != null &&

+			 * ue.getSsglbm().getId().equals(gq.getSsgkglbm().getId())) {

+			 * tuisong(" 您收到一条提醒", entity.getSsjyr().getGkjyr() + "的单船申报", 7,

+			 * ue.getWeixinid(), entity.getId(), true); } } } }

+			 * 

+			 * }

+			 */

 		}

 		return entity;

 

@@ -207,16 +205,111 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 
 		return dao.findDcsb(szdid);

 	}

 

+	@SuppressWarnings("unchecked")

 	@Override

 	public List<Object> tongjiproValue(String startDate, String endDate, String hwzl, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dedlid) {

+		Map<String, Object> params = new HashMap<String, Object>();

+		StringBuilder sb = new StringBuilder();

+		sb.append("select count(tw.id) sbsl,tg.gkmc, round(sum(tw.zysl / 10000), 4) sum ");

+		sb.append(" from GK_OPERATION_JSJY_DCSB tw left join GK_BASIC_JSJY_GK_GK tg on tw.szgk = tg.id  ");

+		sb.append(" where tw.RECORD_STATUS !=9  ");

+

+		if (!StringUtils.isEmpty(startDate)) {

+			sb.append(" and to_char(tw.bgsj, 'yyyy-mm-dd') >=  :startDate ");

+			params.put("startDate", startDate);

+		}

+

+		if (!StringUtils.isEmpty(endDate)) {

+			sb.append("  and to_char(tw.bgsj, 'yyyy-mm-dd') <=  :endDate ");

+			params.put("endDate", endDate);

+		}

+		if (!StringUtils.isEmpty(hwzl)) {

+			sb.append(" and tw.hwzl = :hwzl");

+			params.put("hwzl", hwzl);

+		}

+		if (!StringUtils.isEmpty(nwmid)) {

+			sb.append(" and tw.nwm = :nwmid");

+			params.put("nwmid", nwmid);

+		}

+		if (!StringUtils.isEmpty(szdid)) {

+			sb.append(" and tw.szd = :szd");

+			params.put("szd", szdid);

+		}

+

+		if (!StringUtils.isEmpty(szgkid)) {

+			sb.append(" and tw.szgk = :szgk");

+			params.put("szgk", szgkid);

+		}

+		if (!StringUtils.isEmpty(szgqid)) {

+			sb.append(" and tw.szgq = :szgq");

+			params.put("szgq", szgqid);

+		}

+		if (!StringUtils.isEmpty(jcgid)) {

+			sb.append(" and tw.jcg = :jcg");

+			params.put("jcg", jcgid);

+		}

+

+		if (!StringUtils.isEmpty(dedlid)) {

+			sb.append(" and tw.hwzldedl = :hwzldedl");

+			params.put("hwzldedl", dedlid);

+		}

+		sb.append(" group by tg.gkmc ");

+		System.out.println(sb.toString());

+		return (List<Object>) dao.nativeQuery(sb.toString(), params);

 

-		return dao.tongjiproValue(startDate, endDate, hwzl, nwmid, szdid, szgkid, szgqid, jcgid, dedlid);

 	}

 

+	@SuppressWarnings("unchecked")

 	@Override

 	public List<Object> tongjicityValue(String startDate, String endDate, String hwzl, String nwmid, String szdid, String szgkid, String szgqid, String jcgid, String dedlid) {

+		Map<String, Object> params = new HashMap<String, Object>();

+		StringBuilder sb = new StringBuilder();

+		sb.append("select count(tw.id) sbsl,tg.gqmc, round(sum(tw.zysl / 10000), 4) sum ");

+		sb.append(" from GK_OPERATION_JSJY_DCSB tw left join GK_BASIC_JSJY_GK_GQ tg on tw.szgq = tg.id  ");

+		sb.append(" where tw.RECORD_STATUS !=9  ");

+

+		if (!StringUtils.isEmpty(startDate)) {

+			sb.append(" and to_char(tw.bgsj, 'yyyy-mm-dd') >=  :startDate ");

+			params.put("startDate", startDate);

+		}

+

+		if (!StringUtils.isEmpty(endDate)) {

+			sb.append("  and to_char(tw.bgsj, 'yyyy-mm-dd') <=  :endDate ");

+			params.put("endDate", endDate);

+		}

+		if (!StringUtils.isEmpty(hwzl)) {

+			sb.append(" and tw.hwzl = :hwzl");

+			params.put("hwzl", hwzl);

+		}

+		if (!StringUtils.isEmpty(nwmid)) {

+			sb.append(" and tw.nwm = :nwmid");

+			params.put("nwmid", nwmid);

+		}

+		if (!StringUtils.isEmpty(szdid)) {

+			sb.append(" and tw.szd = :szd");

+			params.put("szd", szdid);

+		}

 

-		return dao.tongjicityValue(startDate, endDate, hwzl, nwmid, szdid, szgkid, szgqid, jcgid, dedlid);

+		if (!StringUtils.isEmpty(szgkid)) {

+			sb.append(" and tw.szgk = :szgk");

+			params.put("szgk", szgkid);

+		}

+		if (!StringUtils.isEmpty(szgqid)) {

+			sb.append(" and tw.szgq = :szgq");

+			params.put("szgq", szgqid);

+		}

+		if (!StringUtils.isEmpty(jcgid)) {

+			sb.append(" and tw.jcg = :jcg");

+			params.put("jcg", jcgid);

+		}

+

+		if (!StringUtils.isEmpty(dedlid)) {

+			sb.append(" and tw.hwzldedl = :hwzldedl");

+			params.put("hwzldedl", dedlid);

+		}

+		sb.append(" group by tg.gqmc ");

+		System.out.println(sb.toString());

+		return (List<Object>) dao.nativeQuery(sb.toString(), params);

 	}

 

 	@Override

@@ -263,14 +356,109 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 
 		return dao.hwttltbmt(hwzlid, startDate, szdid, szgkid, szgqid, sfdwkf);

 	}

 

+	@SuppressWarnings("unchecked")

 	@Override

 	public List<Object> dcsbtjbg(String sTime, String eTime, String hwzl, String nwmid, String szdid, String szgkid, String szgqid, String jcgid) {

-		return dao.dcsbtjbg(sTime, eTime, hwzl, nwmid, szdid, szgkid, szgqid, jcgid);

+		Map<String, Object> params = new HashMap<String, Object>();

+		StringBuilder sb = new StringBuilder();

+		sb.append("select text,a.jgnm,a.jgwm,a.cgnm,a.cgwm from GK_OPERATION_JSJY_CODE c  ");

+		sb.append(" left join ( select d.hwzl,sum(case when (d.jcg = '5701' and d.nwm = '5601') then  d.zysl  end) as jgnm, ");

+		sb.append(" sum(case  when (d.jcg = '5701' and d.nwm = '5602') then d.zysl end) as jgwm, ");

+		sb.append(" sum(case when (d.jcg = '5702' and d.nwm = '5601') then d.zysl end) as cgnm,  ");

+		sb.append(" sum(case when (d.jcg = '5702' and d.nwm = '5602') then  d.zysl end) as cgwm ");

+		sb.append(" from GK_OPERATION_JSJY_DCSB d where d.record_status != 9 ");

+		if (!StringUtils.isEmpty(sTime)) {

+			sb.append(" and to_char(d.bgsj, 'yyyy-mm-dd') >=  :sTime ");

+			params.put("sTime", sTime);

+		}

+		if (!StringUtils.isEmpty(eTime)) {

+			sb.append("  and to_char(d.bgsj, 'yyyy-mm-dd') <=  :eTime ");

+			params.put("eTime", eTime);

+		}

+		if (!StringUtils.isEmpty(hwzl)) {

+			sb.append(" and d.hwzl = :hwzl");

+			params.put("hwzl", hwzl);

+		}

+		if (!StringUtils.isEmpty(nwmid)) {

+			sb.append(" and d.nwm = :nwmid");

+			params.put("nwmid", nwmid);

+		}

+		if (!StringUtils.isEmpty(szdid)) {

+			sb.append(" and d.szd = :szd");

+			params.put("szd", szdid);

+		}

+

+		if (!StringUtils.isEmpty(szgkid)) {

+			sb.append(" and d.szgk = :szgk");

+			params.put("szgk", szgkid);

+		}

+		if (!StringUtils.isEmpty(szgqid)) {

+			sb.append(" and d.szgq = :szgq");

+			params.put("szgq", szgqid);

+		}

+		if (!StringUtils.isEmpty(jcgid)) {

+			sb.append(" and d.jcg = :jcg");

+			params.put("jcg", jcgid);

+		}

+		sb.append(" group by d.hwzl) a on a.hwzl =c.id where c.pid = 72 order by c.id ");

+		System.out.println(sb.toString());

+		return (List<Object>) dao.nativeQuery(sb.toString(), params);

 	}

 

+	@SuppressWarnings("unchecked")

 	@Override

 	public List<Object> dcsbtjbg2(String sTime, String eTime, String hwzldedl, String nwmid, String szdid, String szgkid, String szgqid, String jcgid) {

-		return dao.dcsbtjbg2(sTime, eTime, hwzldedl, nwmid, szdid, szgkid, szgqid, jcgid);

+		Map<String, Object> params = new HashMap<String, Object>();

+		StringBuilder sb = new StringBuilder();

+		sb.append("select text,a.jgnm,a.jgwm,a.cgnm,a.cgwm from GK_OPERATION_JSJY_CODE c  ");

+		sb.append(" left join ( select d.hwzldedl,sum(case when (d.jcg = '5701' and d.nwm = '5601') then  d.zysl  end) as jgnm, ");

+		sb.append(" sum(case  when (d.jcg = '5701' and d.nwm = '5602') then d.zysl end) as jgwm, ");

+		sb.append(" sum(case when (d.jcg = '5702' and d.nwm = '5601') then d.zysl end) as cgnm,  ");

+		sb.append(" sum(case when (d.jcg = '5702' and d.nwm = '5602') then  d.zysl end) as cgwm ");

+		sb.append(" from GK_OPERATION_JSJY_DCSB d where d.record_status != 9 ");

+		if (!StringUtils.isEmpty(sTime)) {

+			sb.append(" and to_char(d.bgsj, 'yyyy-mm-dd') >=  :sTime ");

+			params.put("sTime", sTime);

+		}

+		if (!StringUtils.isEmpty(eTime)) {

+			sb.append("  and to_char(d.bgsj, 'yyyy-mm-dd') <=  :eTime ");

+			params.put("eTime", eTime);

+		}

+		if (!StringUtils.isEmpty(hwzldedl)) {

+			sb.append(" and d.hwzldedl = :hwzldedl");

+			params.put("hwzldedl", hwzldedl);

+		}

+		if (!StringUtils.isEmpty(nwmid)) {

+			sb.append(" and d.nwm = :nwmid");

+			params.put("nwmid", nwmid);

+		}

+		if (!StringUtils.isEmpty(szdid)) {

+			sb.append(" and d.szd = :szd");

+			params.put("szd", szdid);

+		}

+

+		if (!StringUtils.isEmpty(szgkid)) {

+			sb.append(" and d.szgk = :szgk");

+			params.put("szgk", szgkid);

+		}

+		if (!StringUtils.isEmpty(szgqid)) {

+			sb.append(" and d.szgq = :szgq");

+			params.put("szgq", szgqid);

+		}

+		if (!StringUtils.isEmpty(jcgid)) {

+			sb.append(" and d.jcg = :jcg");

+			params.put("jcg", jcgid);

+		}

+		sb.append(" group by d.hwzldedl) a on a.hwzldedl =c.id ");

+		sb.append(" where c.pid = 7201 or c.pid = 7202 or c.pid = 7203 ");

+		sb.append(" or c.pid = 7204 or c.pid = 7205 or c.pid = 7206 ");

+		sb.append(" or c.pid = 7207 or c.pid = 7208 or c.pid = 7209 ");

+		sb.append(" or c.pid = 7210 or c.pid = 7211 or c.pid = 7212 ");

+		sb.append(" or c.pid = 7213 or c.pid = 7214 or c.pid = 7215 ");

+		sb.append(" or c.pid = 7216 or c.pid = 7217 order by c.id ");

+		System.out.println(sb.toString());

+		return (List<Object>) dao.nativeQuery(sb.toString(), params);

+

 	}

 

 	// 参数顺序 标题，内容，微信应用id，微信id，业务key(PC端调用),查看or编辑页面

@@ -287,7 +475,7 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 
 			sbf.append(URLEncoder.encode(("http://" + GlobalData.WEIXIN_IP + ":" + GlobalData.WEIXIN_PORT + "/weixinoa/mobile/dcsb/" + path + ".html?hname=db&isDone=1&id=" + busskey), "utf-8"));

 			sbf.append("&response_type=code&scope=snsapi_base&state=a#wechat_redirect");

 			String json = "{\"touser\": \"" + weixinid + "\",\"toparty\": \"" + "" + "\"" + ",\"totag\": \"\",\"msgtype\": \"text\",\"agentid\": \"" + agentid + "\",\"text\": {\"content\": \"" + content + ",<a href='" + sbf.toString() + "'>点击查看</a>" + "\"},\"safe\":\"0\"}";

-			System.out.println("@@@@"+json);

+			System.out.println("@@@@" + json);

 			sendWxmsg(json);

 		} catch (Exception e) {

 			flag = false;

@@ -426,7 +614,7 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 
 		// TODO Auto-generated method stub

 		return dao.findByJyrid(jyrid);

 	}

-	

+

 	@Override

 	public List<Object> findByGqids(List<String> gqids) {

 		// TODO Auto-generated method stub

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrcg/ctl/CgCtl.java
查看文件 

@@ -71,7 +71,7 @@ public class CgCtl extends BaseWebCtl {
 
 	@Autowired

 	private XkzglbService xkzglbService;

 	/**

-	 * 待办发文维护首页

+	 *  一览首页

 	 * 

 	 * @return

 	 */

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrck/ctl/CkCtl.java
查看文件 

@@ -75,7 +75,7 @@ public class CkCtl extends BaseWebCtl {
 
 	private XkzglbService xkzglbService;

 

 	/**

-	 * 待办发文维护首页

+	 * 一览页面

 	 * 

 	 * @return

 	 */

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrdc/ctl/DcCtl.java
查看文件 

@@ -72,7 +72,7 @@ public class DcCtl extends BaseWebCtl {
 
 	private XkzglbService xkzglbService;

 

 	/**

-	 * 待办发文维护首页

+	 * 一览页面

 	 * 

 	 * @return

 	 */

+ 2 - 94
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java
查看文件 

@@ -431,22 +431,7 @@ public class GkjyrCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 		};

-		/*

-		 * String user1 = (String) Utils.getSession().getAttribute("user");

-		 * String user2 = SecUtils.getCurrUser().getId(); if (user2 != null) {

-		 * if (!user2.equals(user1)) { SearchCondition.jyrpage = 1;

-		 * SearchCondition.gkjyr = ""; SearchCondition.fddbr = "";

-		 * SearchCondition.gkjyxkzh = ""; SearchCondition.szdid = "";

-		 * SearchCondition.szgkid = ""; SearchCondition.szgqid = "";

-		 * SearchCondition.whfzbh = ""; SearchCondition.sfcswhzy = "";

-		 * SearchCondition.sfcyxkz = ""; SearchCondition.bwyt = "";

-		 * SearchCondition.qyxz = ""; SearchCondition.xkzstartDate = null;

-		 * SearchCondition.xkzendDate = null; SearchCondition.fzstartDate =

-		 * null; SearchCondition.fzendDate = null; SearchCondition.jyrxkzsfdq =

-		 * ""; }

-		 * 

-		 * } Utils.getSession().setAttribute("user", user2);

-		 */

+		

 

 		if (page.getPage() < 1) {

 			Object jyrpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jyrpage");

@@ -488,19 +473,6 @@ public class GkjyrCtl extends BaseWebCtl {
 
 			}

 		}

 

-		/*

-		 * if (isPOST(request)) { SearchCondition.jyrpage = page.getPage();

-		 * SearchCondition.gkjyr = gkjyr; SearchCondition.fddbr = fddbr;

-		 * SearchCondition.gkjyxkzh = gkjyxkzh; SearchCondition.szdid = szdid;

-		 * SearchCondition.szgkid = szgkid; SearchCondition.szgqid = szgqid;

-		 * SearchCondition.whfzbh = whfzbh; SearchCondition.sfcswhzy = sfcswhzy;

-		 * SearchCondition.sfcyxkz = sfcyxkz; SearchCondition.bwyt = bwyt;

-		 * SearchCondition.qyxz = qyxz; SearchCondition.xkzstartDate =

-		 * xkzstartDate; SearchCondition.xkzendDate = xkzendDate;

-		 * SearchCondition.fzstartDate = fzstartDate; SearchCondition.fzendDate

-		 * = fzendDate; SearchCondition.jyrxkzsfdq = jyrxkzsfdq; }

-		 */

-

 		if (isPOST(request)) {

 			cacheSCmap.put("jyrpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

@@ -525,71 +497,7 @@ public class GkjyrCtl extends BaseWebCtl {
 
 		model.addAttribute("fzendDate", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fzendDate"));

 		model.addAttribute("xkzstartDate", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzstartDate"));

 		model.addAttribute("xkzendDate", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzendDate"));

-		/*

-		 * SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");

-		 * if(StringUtils

-		 * .isNotEmpty((String)CacheSearchCondition.cacheSCmapVal(cacheSCmap,

-		 * "fzstartDate"))){ model.addAttribute("fzstartDate",

-		 * CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fzstartDate")); }

-		 */

-

-		/*

-		 * model.addAttribute("gkjyrlist", voList); model.addAttribute("gkjyr",

-		 * isPOST(request) ? gkjyr : SearchCondition.gkjyr);

-		 * model.addAttribute("szgk", isPOST(request) ? szgkid :

-		 * SearchCondition.szgkid); model.addAttribute("szd", isPOST(request) ?

-		 * szdid : SearchCondition.szdid); model.addAttribute("fddbr",

-		 * isPOST(request) ? fddbr : SearchCondition.fddbr);

-		 * model.addAttribute("szgq", isPOST(request) ? szgqid :

-		 * SearchCondition.szgqid); model.addAttribute("gkjyxkzh",

-		 * isPOST(request) ? gkjyxkzh : SearchCondition.gkjyxkzh);

-		 * model.addAttribute("menuid", menuid); model.addAttribute("sfcswhzy",

-		 * isPOST(request) ? sfcswhzy : SearchCondition.sfcswhzy);

-		 * model.addAttribute("sfcyxkz", isPOST(request) ? sfcyxkz :

-		 * SearchCondition.sfcyxkz); model.addAttribute("bwyt", isPOST(request)

-		 * ? bwyt : SearchCondition.bwyt); model.addAttribute("whfzbh",

-		 * isPOST(request) ? whfzbh : SearchCondition.whfzbh);

-		 * model.addAttribute("jyrxkzsfdq", isPOST(request) ? jyrxkzsfdq :

-		 * SearchCondition.jyrxkzsfdq); if (fzstartDate != null) {

-		 * model.addAttribute("fzstartDate", new

-		 * SimpleDateFormat("yyyy-MM-dd").format(isPOST(request) ? fzstartDate :

-		 * SearchCondition.fzstartDate)); } else if (SearchCondition.fzstartDate

-		 * != null) { model.addAttribute("fzstartDate", new

-		 * SimpleDateFormat("yyyy-MM-dd").format(isPOST(request) ? xkzstartDate

-		 * : SearchCondition.fzstartDate)); } if (fzendDate != null) {

-		 * model.addAttribute("fzendDate", new

-		 * SimpleDateFormat("yyyy-MM-dd").format(isPOST(request) ? fzendDate :

-		 * SearchCondition.fzendDate)); } else if (SearchCondition.fzendDate !=

-		 * null) { model.addAttribute("fzendDate", new

-		 * SimpleDateFormat("yyyy-MM-dd").format(isPOST(request) ? xkzstartDate

-		 * : SearchCondition.fzendDate)); } if (xkzstartDate != null) {

-		 * model.addAttribute("xkzstartDate", new

-		 * SimpleDateFormat("yyyy-MM-dd").format(isPOST(request) ? xkzstartDate

-		 * : SearchCondition.xkzstartDate)); } else if

-		 * (SearchCondition.xkzstartDate != null) {

-		 * model.addAttribute("xkzstartDate", new

-		 * SimpleDateFormat("yyyy-MM-dd").format(isPOST(request) ? xkzstartDate

-		 * : SearchCondition.xkzstartDate)); } if (xkzendDate != null) {

-		 * model.addAttribute("xkzendDate", new

-		 * SimpleDateFormat("yyyy-MM-dd").format(isPOST(request) ? xkzendDate :

-		 * SearchCondition.xkzendDate)); } else if (SearchCondition.xkzendDate

-		 * != null) { model.addAttribute("xkzendDate", new

-		 * SimpleDateFormat("yyyy-MM-dd").format(isPOST(request) ? xkzendDate :

-		 * SearchCondition.xkzendDate)); }

-		 */

-

-		/*

-		 * if (isPOST(request)) { SearchCondition.jyrpage = page.getPage();

-		 * SearchCondition.gkjyr = gkjyr; SearchCondition.fddbr = fddbr;

-		 * SearchCondition.gkjyxkzh = gkjyxkzh; SearchCondition.szdid = szdid;

-		 * SearchCondition.szgkid = szgkid; SearchCondition.szgqid = szgqid;

-		 * SearchCondition.whfzbh = whfzbh; SearchCondition.sfcswhzy = sfcswhzy;

-		 * SearchCondition.sfcyxkz = sfcyxkz; SearchCondition.bwyt = bwyt;

-		 * SearchCondition.qyxz = qyxz; SearchCondition.xkzstartDate =

-		 * xkzstartDate; SearchCondition.xkzendDate = xkzendDate;

-		 * SearchCondition.fzstartDate = fzstartDate; SearchCondition.fzendDate

-		 * = fzendDate; }

-		 */

+	

 

 		// 翻页共通

 		putPageInfo(model, page, list);

+ 14 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/qytz/ctl/QytzCtl.java
查看文件 

@@ -70,6 +70,20 @@ public class QytzCtl extends BaseWebCtl {
 
 	@Autowired

 	private XkzglbService xkzglbService;

 

+	/**

+	 * 一览页面

+	 * @param page

+	 * @param model

+	 * @param request

+	 * @param szdid

+	 * @param tzrmc

+	 * @param menuid

+	 * @param szgkid

+	 * @param szgqid

+	 * @param jyr

+	 * @return

+	 * @throws JsonProcessingException

+	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("qytzxx:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String szdid, final String tzrmc, final String menuid, final String szgkid, final String szgqid, final String jyr) throws JsonProcessingException {

+ 15 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/ry/ctl/RyCtl.java
查看文件 

@@ -76,6 +76,21 @@ public class RyCtl extends BaseWebCtl {
 
 	@Autowired

 	private GkjyrService gkjyrService;

 

+	/**

+	 * 一览页面

+	 * @param page

+	 * @param model

+	 * @param request

+	 * @param xm

+	 * @param szgkid

+	 * @param szgqid

+	 * @param jyr

+	 * @param szdid

+	 * @param menuid

+	 * @param rylxid

+	 * @return

+	 * @throws JsonProcessingException

+	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("ryjtzxx:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xm, final String szgkid, final String szgqid, final String jyr, final String szdid, final String menuid, final String rylxid) throws JsonProcessingException {

+ 14 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/sssb/ctl/SssbCtl.java
查看文件 

@@ -77,6 +77,20 @@ public class SssbCtl extends BaseWebCtl {
 
 	@Autowired

 	private GkjyrService gkjyrService;

 

+	/**

+	 * 一览页面

+	 * @param page

+	 * @param model

+	 * @param request

+	 * @param ssmc

+	 * @param szgkid

+	 * @param jyr

+	 * @param szgqid

+	 * @param szdid

+	 * @param menuid

+	 * @return

+	 * @throws JsonProcessingException

+	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("sssbxx:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String ssmc, final String szgkid, final String jyr, final String szgqid, final String szdid, final String menuid) throws JsonProcessingException {

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java
查看文件 

@@ -70,7 +70,7 @@ public class XkzfzCtl extends BaseWebCtl {
 
 	private GkjyrService gkjyrService;

 

 	/**

-	 * 待办发文维护首页

+	 * 附证首页

 	 * 

 	 * @return

 	 */

+ 6 - 6
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java
查看文件 

@@ -92,14 +92,14 @@ public class LhbgCtl extends BaseWebCtl {
 
 	private XzglbmxxService xzglbmxxService;

 

 	/**

-	 * 

-	 * @param page

+	 * 一览页面

+	 * @param page 分页

 	 * @param model

 	 * @param lczt

-	 * @param szdid

-	 * @param szgkid

-	 * @param szgqid

-	 * @param gkjyr

+	 * @param szdid 所在地ID

+	 * @param szgkid 所在港口ID

+	 * @param szgqid　所在港区ID

+	 * @param gkjyr　经营人

 	 * @param fddbr

 	 * @param bgdd

 	 * @param menuid

+ 15 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/dcttltj/ctl/DcttltjCtl.java
查看文件 

@@ -32,6 +32,21 @@ import com.xt.jygl.gkyxtjyfx.dcttltj.vo.DcttltjVo;
 
 public class DcttltjCtl extends BaseWebCtl {

 	@Autowired

 	private DcsbService dcsbService;

+	/**

+	 * 一览页面

+	 * @param model

+	 * @param startDate 开始时间

+	 * @param endDate 

+	 * @param menuid

+	 * @param nwmid 内外贸ID

+	 * @param szdid 所在地ID

+	 * @param szgkid 所在港口ID

+	 * @param szgqid 所在港区ID

+	 * @param jcgid 进出港ID

+	 * @param dydlid 第一大类

+	 * @param dedlid 第二大类

+	 * @return

+	 */

 	@RequestMapping(value = "/main")

 	public String main(Model model, Date startDate, Date endDate, String menuid,String nwmid,String szdid,String szgkid,String szgqid,String jcgid,String dydlid,String dedlid) {

 		Calendar cal = Calendar.getInstance();

+ 8 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkjcssjsfx/ctl/GkjcssjsfxCtl.java
查看文件 

@@ -22,6 +22,14 @@ public class GkjcssjsfxCtl extends BaseWebCtl {
 
 	@Autowired

 	private TzjhglService tzjhglService;

 

+	/**

+	 * 一览页面

+	 * @param model

+	 * @param menuid

+	 * @param xmlxid 项目类型ID

+	 * @param tzlxid 投资类型ID

+	 * @return

+	 */

 	@RequestMapping(value = "/main")

 	public String main(Model model, String menuid, String xmlxid, String tzlxid) {

 		List<GkjcssjsfxVo> list = new ArrayList<GkjcssjsfxVo>();

+ 15 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkttlfx/ctl/HwttlfzCtl.java
查看文件 

@@ -47,6 +47,21 @@ public class HwttlfzCtl extends BaseWebCtl {
 
 	@Autowired

 	private DcsbybbService dcsbybbService;

 

+	/**

+	 *  一览页面

+	 * @param model

+	 * @param zcl 

+	 * @param menuid

+	 * @param tonghuanbi 同环比 

+	 * @param startDate 报告时间

+	 * @param szdid 所在地ID

+	 * @param szgkid 所在港口ID

+	 * @param szgqid 所在港区ID

+	 * @param sfdwkf 

+	 * @param dydlid 第一大类

+	 * @param dedlid 第二大类

+	 * @return

+	 */

 	@RequestMapping(value = "/main")

 	public String main(Model model, String zcl, String menuid, String tonghuanbi, String startDate, String szdid, String szgkid, String szgqid, String sfdwkf,String dydlid,String dedlid) {

 		Date beginTime = null;

+ 8 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/ctl/HxhbtjCtl.java
查看文件 

@@ -29,6 +29,14 @@ public class HxhbtjCtl extends BaseCtl {
 
 	@Autowired

 	private GkService gkService;

 

+	/**

+	 * 统计一览页面

+	 * @param model

+	 * @param rq 日期

+	 * @param szgkid 所在港区ID

+	 * @param menuid

+	 * @return

+	 */

 	@SuppressWarnings("unused")

 	@RequestMapping(value = "/main")

 	public String main(Model model, final String rq, final String szgkid, final String menuid) {

+ 210 - 5
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/ctl/HzttltjCtl.java
查看文件 

@@ -1,12 +1,23 @@
 
 package com.xt.jygl.gkyxtjyfx.hzttltj.ctl;

 

+import java.math.BigDecimal;

+import java.text.SimpleDateFormat;

+import java.util.ArrayList;

+import java.util.Calendar;

 import java.util.Date;

+import java.util.List;

 

+import net.sf.json.JSONArray;

+

+import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.stereotype.Controller;

 import org.springframework.ui.Model;

 import org.springframework.web.bind.annotation.RequestMapping;

 

 import com.xt.jygl.common.BaseWebCtl;

+import com.xt.jygl.gkyxtjyfx.hzttltj.service.HzttlService;

+import com.xt.jygl.gkyxtjyfx.hzttltj.vo.HzttlVo;

+import com.xtframe.util.StringUtils;

 

 /**

  * 货种运输统计

@@ -17,11 +28,205 @@ import com.xt.jygl.common.BaseWebCtl;
 
 @Controller

 @RequestMapping(value = "/hzttltj")

 public class HzttltjCtl extends BaseWebCtl {

-	

-	

+	@Autowired

+	private HzttlService hzttlService;

+

 	@RequestMapping(value = "/main")

-	public String main(Model model, Date startDate, Date endDate, String menuid,String nwmid,String dydlid,String dedlid) {

-		return null;

+	public String main(Model model, String startDate, String endDate, String menuid, String dydlid, String dedlid) {

+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");

+		Date date = new Date();

+		if (StringUtils.isEmpty(startDate)) {

+			startDate = sdf.format(date).substring(0, 5) + "01";

+			endDate = sdf.format(date);

+		}

+

+		// 判断查询哪列值

+		int id = 0;

+		if (StringUtils.isEmpty(dydlid) && StringUtils.isEmpty(dedlid)) {

+			id = 1;

+		} else if ("7201".equals(dydlid)) {

+			id = 4;

+			if ("720101".equals(dedlid)) {

+				id = 5;

+			}

+		} else if ("7202".equals(dydlid)) {

+			id = 6;

+			if ("720201".equals(dedlid)) {

+				id = 7;

+			} else if ("720202".equals(dedlid)) {

+				id = 8;

+			} else if ("720203".equals(dedlid)) {

+				id = 9;

+			}

+		} else if ("7203".equals(dydlid)) {

+			id = 10;

+			if ("720301".equals(dedlid)) {

+				id = 11;

+			}

+		} else if ("7204".equals(dydlid)) {

+			id = 12;

+			if ("720401".equals(dedlid)) {

+				id = 13;

+			} else if ("720402".equals(dedlid)) {

+				id = 14;

+			}

+		} else if ("7205".equals(dydlid)) {

+			id = 15;

+			if ("720501".equals(dedlid)) {

+				id = 16;

+			}

+		} else if ("7206".equals(dydlid)) {

+			id = 17;

+		} else if ("7207".equals(dydlid)) {

+			id = 18;

+			if ("720701".equals(dedlid)) {

+				id = 19;

+			}

+		} else if ("7208".equals(dydlid)) {

+			id = 20;

+			if ("720801".equals(dedlid)) {

+				id = 21;

+			}

+		} else if ("7209".equals(dydlid)) {

+			id = 22;

+		} else if ("7210".equals(dydlid)) {

+			id = 23;

+		} else if ("7211".equals(dydlid)) {

+			id = 24;

+			if ("721101".equals(dedlid)) {

+				id = 25;

+			} else if ("721102".equals(dedlid)) {

+				id = 26;

+			} else if ("721103".equals(dedlid)) {

+				id = 27;

+			} else if ("721104".equals(dedlid)) {

+				id = 28;

+			}

+		} else if ("7212".equals(dydlid)) {

+			id = 29;

+		} else if ("7213".equals(dydlid)) {

+			id = 30;

+			if ("721301".equals(dedlid)) {

+				id = 31;

+			} else if ("721302".equals(dedlid)) {

+				id = 32;

+			}

+		} else if ("7214".equals(dydlid)) {

+			id = 33;

+		} else if ("7215".equals(dydlid)) {

+			id = 34;

+			if ("721501".equals(dedlid)) {

+				id = 35;

+			} else if ("721502".equals(dedlid)) {

+				id = 36;

+			} else if ("721503".equals(dedlid)) {

+				id = 37;

+			}

+		} else if ("7216".equals(dydlid)) {

+			id = 38;

+			if ("721601".equals(dedlid)) {

+				id = 39;

+			}

+		} else if ("7217".equals(dydlid)) {

+			id = 40;

+			if ("721701".equals(dedlid)) {

+				id = 41;

+			} else if ("721702".equals(dedlid)) {

+				id = 42;

+			} else if ("721703".equals(dedlid)) {

+				id = 43;

+			}

+		}

+		List<Object> list = hzttlService.findBytjmonth(startDate, endDate);

+		List<HzttlVo> volist = new ArrayList<HzttlVo>();

+		Object[] sum = new Object[388];

+		if (list != null && list.size() > 0) {

+			for (int i = 0; i < list.size(); i++) {

+				Object[] e = (Object[]) list.get(i);

+				if (e != null) {

+					String month = e[0].toString();

+					String ymonth = "";

+					String yyear = "";

+					try {

+						ymonth = sdf.format(getLastDate(sdf.parse(month)));

+						yyear = sdf.format(getLastYear(sdf.parse(month)));

+					} catch (Exception e1) {

+						e1.printStackTrace();

+					}

+

+					BigDecimal a = new BigDecimal(0.0000);

+					BigDecimal b = new BigDecimal(0.0000);

+					BigDecimal c = new BigDecimal(0.0000);

+					HzttlVo vo = new HzttlVo();

+					vo.setTjmonth(month);

+					vo.setTtl(e[id].toString());

+					a = (BigDecimal) e[id];

+					if (a.compareTo(new BigDecimal(0)) > 0) {

+						// 环比

+						Object[] hbhzttl = (Object[]) hzttlService.findBytjmonth(ymonth);

+						if (hbhzttl != null) {

+							c = (BigDecimal) hbhzttl[id];

+							BigDecimal b4 = a.subtract(c);

+							b4 = b4.divide(a, 0, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));

+							vo.setHb(b4.toString());

+

+						} else {

+							vo.setHb("0");

+						}

+						//同比

+						Object[] tbhzttl = (Object[]) hzttlService.findBytjmonth(yyear);

+						if (tbhzttl != null) {

+							b = (BigDecimal) tbhzttl[id];

+							BigDecimal b3 = a.subtract(b);

+							b3=b3.divide(a, 0, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));

+							vo.setTb(b3.toString());

+						} else {

+							vo.setTb("0");

+						}

+						volist.add(vo);

+					}else{

+						vo.setTb("0");

+						vo.setHb("0");

+					}

+					for (int j = 1; j < 388; 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;

+					}

+				}

+			}

+		}

+		for (int i = 0; i < sum.length; i++) {

+			if (sum[i] != null) {

+				model.addAttribute("a" + i, sum[i].toString());

+			}

+		}

+

+		model.addAttribute("dydlid", dydlid);

+		model.addAttribute("dedlid", dedlid);

+		model.addAttribute("startDate", startDate);

+		model.addAttribute("endDate", endDate);

+		model.addAttribute("list", JSONArray.fromObject(volist).toString());

+		return "/gkyxtjyfx/hzttltj/hzttltj";

+	}

+

+	// 上一月份

+	private static Date getLastDate(Date date) {

+		Calendar cal = Calendar.getInstance();

+		cal.setTime(date);

+		cal.add(Calendar.MONTH, -1);

+		return cal.getTime();

+	}

+

+	// 上一年份

+	private static Date getLastYear(Date date) {

+		Calendar cal = Calendar.getInstance();

+		cal.setTime(date);

+		cal.add(Calendar.YEAR, -1);

+		return cal.getTime();

 	}

-	

 }

+ 129 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/ctl/JzxttltjCtl.java
查看文件 

@@ -0,0 +1,129 @@
 
+package com.xt.jygl.gkyxtjyfx.hzttltj.ctl;

+

+import java.math.BigDecimal;

+import java.text.SimpleDateFormat;

+import java.util.ArrayList;

+import java.util.Calendar;

+import java.util.Date;

+import java.util.List;

+

+import net.sf.json.JSONArray;

+

+import org.springframework.beans.factory.annotation.Autowired;

+import org.springframework.stereotype.Controller;

+import org.springframework.ui.Model;

+import org.springframework.web.bind.annotation.RequestMapping;

+

+import com.xt.jygl.common.BaseWebCtl;

+import com.xt.jygl.gkyxtjyfx.hzttltj.vo.HzttlVo;

+import com.xtframe.util.StringUtils;

+

+/**

+ * 集装箱吞吐量统计

+ * 

+ *

+ */

+@Controller

+@RequestMapping(value = "/jzxttltj")

+public class JzxttltjCtl extends BaseWebCtl {

+	@Autowired

+	private com.xt.jygl.gkyxtjyfx.hzttltj.service.jzxttltjService jzxttltjService;

+

+	@RequestMapping(value = "/main")

+	public String main(Model model, String startDate, String endDate, String menuid, String hx) {

+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");

+		Date date = new Date();

+		if (StringUtils.isEmpty(startDate)) {

+			startDate = sdf.format(date).substring(0, 5) + "01";

+			endDate = sdf.format(date);

+		}

+

+		int id = 0;

+		if (StringUtils.isEmpty(hx)) {

+			id = 40;

+		} else if ("1".equals(hx)) {

+			id = 1;

+		} else if ("2".equals(hx)) {

+			id = 14;

+		} else if ("3".equals(hx)) {

+			id = 27;

+		}

+

+		List<Object> list = jzxttltjService.findBytjmonth(startDate, endDate);

+		List<HzttlVo> volist = new ArrayList<HzttlVo>();

+		

+		if (list != null && list.size() > 0) {

+			for (int i = 0; i < list.size(); i++) {

+				Object[] e = (Object[]) list.get(i);

+				if (e != null) {

+					String month = e[0].toString();

+					String ymonth = "";

+					String yyear = "";

+					try {

+						ymonth = sdf.format(getLastDate(sdf.parse(month)));

+						yyear = sdf.format(getLastYear(sdf.parse(month)));

+					} catch (Exception e1) {

+						e1.printStackTrace();

+					}

+

+					BigDecimal a = new BigDecimal(0.0000);

+					BigDecimal b = new BigDecimal(0.0000);

+					BigDecimal c = new BigDecimal(0.0000);

+					HzttlVo vo = new HzttlVo();

+					vo.setTjmonth(month);

+					vo.setTtl(e[id].toString());

+					a = (BigDecimal) e[id];

+					if (a.compareTo(new BigDecimal(0)) > 0) {

+						// 环比

+						Object[] hbhzttl = (Object[]) jzxttltjService.findBytjmonth(ymonth);

+						if (hbhzttl != null) {

+							c = (BigDecimal) hbhzttl[id];

+							BigDecimal b4 = a.subtract(c);

+							b4 = b4.divide(a, 0, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));

+							vo.setHb(b4.toString());

+

+						} else {

+							vo.setHb("0");

+						}

+						//同比

+						Object[] tbhzttl = (Object[]) jzxttltjService.findBytjmonth(yyear);

+						if (tbhzttl != null) {

+							b = (BigDecimal) tbhzttl[id];

+							BigDecimal b3 = a.subtract(b);

+							b3=b3.divide(a, 0, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));

+							vo.setTb(b3.toString());

+						} else {

+							vo.setTb("0");

+						}

+						volist.add(vo);

+					}else{

+						vo.setTb("0");

+						vo.setHb("0");

+					}

+					

+				}

+			}

+		}

+		model.addAttribute("hx", hx);

+		model.addAttribute("startDate", startDate);

+		model.addAttribute("endDate", endDate);

+		model.addAttribute("list", JSONArray.fromObject(volist).toString());

+		return "/gkyxtjyfx/hzttltj/jzxttltj";

+	}

+

+	// 上一月份

+	private static Date getLastDate(Date date) {

+		Calendar cal = Calendar.getInstance();

+		cal.setTime(date);

+		cal.add(Calendar.MONTH, -1);

+		return cal.getTime();

+	}

+

+	// 上一年份

+	private static Date getLastYear(Date date) {

+		Calendar cal = Calendar.getInstance();

+		cal.setTime(date);

+		cal.add(Calendar.YEAR, -1);

+		return cal.getTime();

+	}

+}

+ 88 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/ctl/JzxxltjCtl.java
查看文件 

@@ -0,0 +1,88 @@
 
+package com.xt.jygl.gkyxtjyfx.hzttltj.ctl;

+

+import java.math.BigDecimal;

+import java.text.SimpleDateFormat;

+import java.util.ArrayList;

+import java.util.Date;

+import java.util.List;

+

+import net.sf.json.JSONArray;

+

+import org.springframework.beans.factory.annotation.Autowired;

+import org.springframework.stereotype.Controller;

+import org.springframework.ui.Model;

+import org.springframework.web.bind.annotation.RequestMapping;

+

+import com.xt.jygl.common.BaseWebCtl;

+import com.xt.jygl.gkyxtjyfx.hzttltj.vo.JzxxlVo;

+import com.xtframe.util.StringUtils;

+

+/**

+ * 集装箱吞吐量统计

+ * 

+ *

+ */

+@Controller

+@RequestMapping(value = "/jzxxltj")

+public class JzxxltjCtl extends BaseWebCtl {

+	@Autowired

+	private com.xt.jygl.gkyxtjyfx.hzttltj.service.jzxttltjService jzxttltjService;

+

+	@RequestMapping(value = "/main")

+	public String main(Model model, String startDate, String endDate, String menuid) {

+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");

+		Date date = new Date();

+		if (StringUtils.isEmpty(startDate)) {

+			startDate = sdf.format(date).substring(0, 5) + "01";

+			endDate = sdf.format(date);

+		}

+

+		List<Object> list = jzxttltjService.findBytjmonth(startDate, endDate);

+		List<JzxxlVo> volist = new ArrayList<JzxxlVo>();

+

+		if (list != null && list.size() > 0) {

+			for (int i = 0; i < list.size(); i++) {

+				Object[] e = (Object[]) list.get(i);

+				if (e != null) {

+					JzxxlVo vo = new JzxxlVo();

+					vo.setTjmonth(e[0].toString());

+					BigDecimal a = new BigDecimal(0);

+					BigDecimal b = new BigDecimal(0);

+					BigDecimal c = new BigDecimal(0.0000);

+					BigDecimal d = new BigDecimal(0);

+					a = (BigDecimal) e[40];// 总箱合计

+					vo.setZxl(a.toString());

+					// 空箱合计

+					b = (BigDecimal) e[41];

+					b = b.add((BigDecimal) e[42]);

+					b = b.add((BigDecimal) e[43]);

+					b = b.add((BigDecimal) e[44]);

+					b = b.add((BigDecimal) e[45]);

+					vo.setKxxl(b.toString());

+					

+					// 重箱合计

+					d = (BigDecimal) e[46];

+					d = d.add((BigDecimal) e[47]);

+					d = d.add((BigDecimal) e[48]);

+					d = d.add((BigDecimal) e[49]);

+					d = d.add((BigDecimal) e[50]);

+					vo.setZxxl(d.toString());

+

+					if (a.compareTo(new BigDecimal(0)) > 0) {

+						c = b.divide(a, 0, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));

+						vo.setZbl(c.toString());

+					} else {

+						vo.setZbl("0");

+					}

+					volist.add(vo);

+				}

+			}

+		}

+		model.addAttribute("startDate", startDate);

+		model.addAttribute("endDate", endDate);

+		model.addAttribute("list", JSONArray.fromObject(volist).toString());

+		return "/gkyxtjyfx/hzttltj/jzxxltj";

+	}

+

+	

+}

+ 9 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/dao/HzttlDao.java
查看文件 

@@ -1,10 +1,19 @@
 
 package com.xt.jygl.gkyxtjyfx.hzttltj.dao;

 

+import java.util.List;

+

+import org.springframework.data.jpa.repository.Query;

+

 import com.xt.jygl.gkyxtjyfx.hzttltj.entity.HzttlEntity;

 import com.xtframe.sec.common.SecRepository;

 

 public interface HzttlDao extends SecRepository<HzttlEntity, String> {

 

 	

+	@Query(value = "select * from  GK_SHARE_JSJY_GY_FHLTTL where tj_month = ?1", nativeQuery = true)

+	Object findBytjmonth(String tjmonth);

+	

 	

+	@Query(value = "select * from  GK_SHARE_JSJY_GY_FHLTTL where tj_month >= ?1 and tj_month <= ?2", nativeQuery = true)

+	List<Object> findBytjmonth(String smonth,String emonth);

 }

+ 19 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/dao/JzxttltjDao.java
查看文件 

@@ -0,0 +1,19 @@
 
+package com.xt.jygl.gkyxtjyfx.hzttltj.dao;

+

+import java.util.List;

+

+import org.springframework.data.jpa.repository.Query;

+

+import com.xt.jygl.gkyxtjyfx.hzttltj.entity.JzxttlhjEntity;

+import com.xtframe.sec.common.SecRepository;

+

+public interface JzxttltjDao extends SecRepository<JzxttlhjEntity, String> {

+

+	

+	@Query(value = "select * from  GK_SHARE_JSJY_HJ_JZXTTL where tj_month = ?1", nativeQuery = true)

+	Object findBytjmonth(String tjmonth);

+	

+	

+	@Query(value = "select * from  GK_SHARE_JSJY_HJ_JZXTTL where tj_month >= ?1 and tj_month <= ?2", nativeQuery = true)

+	List<Object> findBytjmonth(String smonth,String emonth);

+}

+ 5 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/service/HzttlService.java
查看文件 

@@ -1,7 +1,12 @@
 
 package com.xt.jygl.gkyxtjyfx.hzttltj.service;

 

+import java.util.List;

+

 

 public interface HzttlService  {

 

+	public Object findBytjmonth(String tjmonth);

+	

+	public List<Object> findBytjmonth(String smonth,String emonth);

 	

 }

+ 14 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/service/impl/HzttlServiceImpl.java
查看文件 

@@ -1,5 +1,7 @@
 
 package com.xt.jygl.gkyxtjyfx.hzttltj.service.impl;

 

+import java.util.List;

+

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.stereotype.Service;

 

@@ -23,6 +25,18 @@ public class HzttlServiceImpl extends JyglBaseService<HzttlEntity, String> imple
 
 		return this.dao;

 	}

 

+	@Override

+	public Object findBytjmonth(String tjmonth) {

+		

+		return dao.findBytjmonth(tjmonth);

+	}

+

+	@Override

+	public List<Object> findBytjmonth(String smonth, String emonth) {

+		

+		return dao.findBytjmonth(smonth,emonth);

+	}

+

 

 

 }

+ 42 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/service/impl/jzxttltjServiceImpl.java
查看文件 

@@ -0,0 +1,42 @@
 
+package com.xt.jygl.gkyxtjyfx.hzttltj.service.impl;

+

+import java.util.List;

+

+import org.springframework.beans.factory.annotation.Autowired;

+import org.springframework.stereotype.Service;

+

+import com.xt.jygl.common.service.JyglBaseService;

+import com.xt.jygl.gkyxtjyfx.hzttltj.dao.JzxttltjDao;

+import com.xt.jygl.gkyxtjyfx.hzttltj.entity.JzxttlhjEntity;

+import com.xt.jygl.gkyxtjyfx.hzttltj.service.jzxttltjService;

+import com.xtframe.core.support.SecurityMgr;

+import com.xtframe.sec.common.SecRepository;

+

+@Service

+public class jzxttltjServiceImpl extends JyglBaseService<JzxttlhjEntity, String> implements jzxttltjService {

+	@Autowired

+	private JzxttltjDao dao;

+	@Autowired

+	protected SecurityMgr securityMgr;

+

+	@Override

+	protected SecRepository<JzxttlhjEntity, String> getDao() {

+

+		return this.dao;

+	}

+

+	@Override

+	public Object findBytjmonth(String tjmonth) {

+		

+		return dao.findBytjmonth(tjmonth);

+	}

+

+	@Override

+	public List<Object> findBytjmonth(String smonth, String emonth) {

+		

+		return dao.findBytjmonth(smonth,emonth);

+	}

+

+

+

+}

+ 12 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/service/jzxttltjService.java
查看文件 

@@ -0,0 +1,12 @@
 
+package com.xt.jygl.gkyxtjyfx.hzttltj.service;

+

+import java.util.List;

+

+

+public interface jzxttltjService  {

+

+	public Object findBytjmonth(String tjmonth);

+	

+	public List<Object> findBytjmonth(String smonth,String emonth);

+	

+}

+ 28 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/vo/HzttlVo.java
查看文件 

@@ -4,6 +4,34 @@ import com.xtframe.sec.common.BaseVo;
 
 

 public class HzttlVo extends BaseVo {

 	

+	private String tjmonth;

+	private String tb;

+	private String hb;

+	private String ttl;

+	public String getTjmonth() {

+		return tjmonth;

+	}

+	public void setTjmonth(String tjmonth) {

+		this.tjmonth = tjmonth;

+	}

+	public String getTb() {

+		return tb;

+	}

+	public void setTb(String tb) {

+		this.tb = tb;

+	}

+	public String getHb() {

+		return hb;

+	}

+	public void setHb(String hb) {

+		this.hb = hb;

+	}

+	public String getTtl() {

+		return ttl;

+	}

+	public void setTtl(String ttl) {

+		this.ttl = ttl;

+	}

 	

 

 }

+ 47 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hzttltj/vo/JzxxlVo.java
查看文件 

@@ -0,0 +1,47 @@
 
+package com.xt.jygl.gkyxtjyfx.hzttltj.vo;

+

+import com.xtframe.sec.common.BaseVo;

+

+public class JzxxlVo extends BaseVo {

+	

+	private String tjmonth;

+	private String kxxl;

+	private String zxl;

+	private String zxxl;

+	private String zbl;

+	

+	

+	public String getZxxl() {

+		return zxxl;

+	}

+	public void setZxxl(String zxxl) {

+		this.zxxl = zxxl;

+	}

+	public String getTjmonth() {

+		return tjmonth;

+	}

+	public void setTjmonth(String tjmonth) {

+		this.tjmonth = tjmonth;

+	}

+	public String getKxxl() {

+		return kxxl;

+	}

+	public void setKxxl(String kxxl) {

+		this.kxxl = kxxl;

+	}

+	public String getZxl() {

+		return zxl;

+	}

+	public void setZxl(String zxl) {

+		this.zxl = zxl;

+	}

+	public String getZbl() {

+		return zbl;

+	}

+	public void setZbl(String zbl) {

+		this.zbl = zbl;

+	}

+	

+	

+

+}