Home Explore Help
Register Sign In
hs
/
jsgkj
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

ld_xuhx 8 years ago
parent
6c3c49e4cf
commit
fefb989f4c
8 changed files with 361 additions and 312 deletions
Split View Show Diff Stats
  1. 287 253
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/gkjcssjsfx/gkjcssjsfx.jsp
  2. 42 42
      gkjsjy/trunk/WebContent/WEB-INF/pages/index/indexmain.jsp
  3. 1 1
      gkjsjy/trunk/src/com/cxfws/sjtjfx/service/IGkjcssjsfxWebService.java
  4. 3 3
      gkjsjy/trunk/src/com/cxfws/sjtjfx/service/impl/GkjcssjsfxWebService.java
  5. 4 4
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/dao/TzjhglDao.java
  6. 2 2
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/service/TzjhglService.java
  7. 4 4
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/service/impl/TzjhglServiceImpl.java
  8. 18 3
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkjcssjsfx/ctl/GkjcssjsfxCtl.java

+ 287 - 253
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/gkjcssjsfx/gkjcssjsfx.jsp
View File 

@@ -1,284 +1,318 @@
 
 <!DOCTYPE html >

-<html >

+<html>

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

 	pageEncoding="UTF-8"%>

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

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

+<%@ 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" />

+<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/gkjcssjsfx/gkjcssjsfxmain.js"></script>

+<script type="text/javascript"

+	src="${app }/static/biz/js/gkyxtjyfx/gkjcssjsfx/gkjcssjsfxmain.js"></script>

 <script type="text/javascript">

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

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

 		gkjcssjsfx.main.init();

-		gkjcssjsfx.main.xmlx='${xmlxid}';

-		gkjcssjsfx.main.tzlx='${tzlxid}';

-		initXmlxSelect('xmlxsel',gkjcssjsfx.main.xmlx,'80%');

-		initTzlxSelect('tzlxsel',gkjcssjsfx.main.tzlx,'80%')

+		gkjcssjsfx.main.xmlx = '${xmlxid}';

+		gkjcssjsfx.main.tzlx = '${tzlxid}';

+		initXmlxSelect('xmlxsel', gkjcssjsfx.main.xmlx, '80%');

+		initTzlxSelect('tzlxsel', gkjcssjsfx.main.tzlx, '80%')

 	});

-	

-  $(function () {

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

-	  var list = '${tzjhgllist}';

-	  var aqname=[];

-	  var aqsum=[];

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

-    	  aqname[n]=value.szd;

-    	  aqsum[n]=value.ztz; 

-      });

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

-	        chart: {

-	            zoomType: 'xy'

-	        },

-	        plotOptions:{

-	        	series:{pointWidth:16}

-	        },

-	        credits:{//右下角的文本  

-	            enabled: true,  

-	            position: {//位置设置  

-	                align: 'right',  

-	                x: -10,  

-	                y: -10  

-	            },  

-	            href: "",//点击文本时的链接  

-	            style: {  

-	                color:'blue'  

-	            },  

-	            text: ""//显示的内容  

-	        }, 

-	        title: {

-	            text: '　'

-	        },

-	        lang :{ 

-	        contextButtonTitle:"图表菜单",

-	        resetRoom:"重置",

-	        printChart:"打印图片",

-            downloadJPEG: "下载JPEG 图片", 

-            downloadPDF: "下载PDF文档", 

-            downloadPNG: "下载PNG 图片", 

-            downloadSVG: "下载SVG 矢量图",

-            exportButtonTitle: "导出图片",

-	        },

-	        xAxis: [{

-	            categories: aqname,

-	            labels: {

-	            	rotation: 0,

-	            	style: {

-	            	color: '#262626',//刻度颜色

-	            	fontSize:'12px', //刻度字体大小

-	            	fontFamily:'宋体'

-	            	}

-	            	}

-	        }],

-	        yAxis: [{ // Primary yAxis

-	            labels: {

-	                format: '{value}',

-	                style: {

-	                    color: '#262626'

-	                }

-	            },

-	            title: {

-	                text: '',

-	                style: {

-	                    color: '#262626'

-	                }

-	            }

-	        }, { // Secondary yAxis

-	            title: {

-	                text: '',

-	                style: {

-	                    color: '#262626'

-	                }

-	            },

-	            labels: {

-	                format: '{value}',

-	                style: {

-	                    color: '#262626'

-	                }

-	            },

-	            opposite: true

-	        }],

-	        tooltip: {

-	            shared: true

-	        },

-	        legend: {

-	            align: 'left',

-	            x: 50,

-	            verticalAlign: 'top',

-	            y: -15,

-	            floating: true,

-	            backgroundColor: 'transparent'

-	        },

-	        series: [{

-	            name: '<font style="font-size:12px;color:#5e5d5d;">总投资</font>',

-	            color: '#5F49E4',

-	            type: 'column',

-	            yAxis: 1,

-	            data: eval('['+aqsum+']'),

-	            tooltip: {

-	                valueSuffix: '万元'

-	            }

 

-	        }]

-	    });

+	$(function() {

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

+		var list = '${tzjhgllist}';

+		var aqname = [];

+		var aqsum = [];

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

+			aqname[n] = value.szd;

+			aqsum[n] = value.ztz;

+		});

+		$('#container')

+				.highcharts(

+						{

+							chart : {

+								zoomType : 'xy'

+							},

+							plotOptions : {

+								series : {

+									pointWidth : 16

+								}

+							},

+							credits : {//右下角的文本  

+								enabled : true,

+								position : {//位置设置  

+									align : 'right',

+									x : -10,

+									y : -10

+								},

+								href : "",//点击文本时的链接  

+								style : {

+									color : 'blue'

+								},

+								text : ""//显示的内容  

+							},

+							title : {

+								text : '　'

+							},

+							lang : {

+								contextButtonTitle : "图表菜单",

+								resetRoom : "重置",

+								printChart : "打印图片",

+								downloadJPEG : "下载JPEG 图片",

+								downloadPDF : "下载PDF文档",

+								downloadPNG : "下载PNG 图片",

+								downloadSVG : "下载SVG 矢量图",

+								exportButtonTitle : "导出图片",

+							},

+							xAxis : [ {

+								categories : aqname,

+								labels : {

+									rotation : 0,

+									style : {

+										color : '#262626',//刻度颜色

+										fontSize : '12px', //刻度字体大小

+										fontFamily : '宋体'

+									}

+								}

+							} ],

+							yAxis : [ { // Primary yAxis

+								labels : {

+									format : '{value}',

+									style : {

+										color : '#262626'

+									}

+								},

+								title : {

+									text : '',

+									style : {

+										color : '#262626'

+									}

+								}

+							}, { // Secondary yAxis

+								title : {

+									text : '',

+									style : {

+										color : '#262626'

+									}

+								},

+								labels : {

+									format : '{value}',

+									style : {

+										color : '#262626'

+									}

+								},

+								opposite : true

+							} ],

+							tooltip : {

+								shared : true

+							},

+							legend : {

+								align : 'left',

+								x : 50,

+								verticalAlign : 'top',

+								y : -15,

+								floating : true,

+								backgroundColor : 'transparent'

+							},

+							series : [ {

+								name : '<font style="font-size:12px;color:#5e5d5d;">总投资</font>',

+								color : '#5F49E4',

+								type : 'column',

+								yAxis : 1,

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

+								tooltip : {

+									valueSuffix : '万元'

+								}

+

+							} ]

+						});

 	});

-  /**

-   * highcharts 主题

-   */

+	/**

+	 * highcharts 主题

+	 */

 

-  // Load the fonts

- /*  Highcharts.createElement('link', {

-  	href: 'http://fonts.googleapis.com/css?family=Signika:400,700',

-  	rel: 'stylesheet',

-  	type: 'text/css'

-  }, null, document.getElementsByTagName('head')[0]); */

+	// Load the fonts

+	/*  Highcharts.createElement('link', {

+	 	href: 'http://fonts.googleapis.com/css?family=Signika:400,700',

+	 	rel: 'stylesheet',

+	 	type: 'text/css'

+	 }, null, document.getElementsByTagName('head')[0]); */

 

-  // Add the background image to the container

-  /* Highcharts.wrap(Highcharts.Chart.prototype, 'getContainer', function (proceed) {

-  	proceed.call(this);

-  	this.container.style.background = 'url(http://www.highcharts.com/samples/graphics/sand.png)';

-  }); */

+	// Add the background image to the container

+	/* Highcharts.wrap(Highcharts.Chart.prototype, 'getContainer', function (proceed) {

+		proceed.call(this);

+		this.container.style.background = 'url(http://www.highcharts.com/samples/graphics/sand.png)';

+	}); */

 

+	Highcharts.theme = {

+		colors : [ "#f45b5b", "#8085e9", "#8d4654", "#7798BF", "#aaeeee",

+				"#ff0066", "#eeaaee", "#55BF3B", "#DF5353", "#7798BF",

+				"#aaeeee" ],

+		chart : {

+			backgroundColor : null,

+			style : {

+				fontFamily : "Signika, serif"

+			}

+		},

+		title : {

+			style : {

+				color : 'black',

+				fontSize : '16px',

+				fontWeight : 'bold'

+			}

+		},

+		subtitle : {

+			style : {

+				color : 'black'

+			}

+		},

+		tooltip : {

+			borderWidth : 0

+		},

+		legend : {

+			itemStyle : {

+				fontWeight : 'bold',

+				fontSize : '13px'

+			}

+		},

+		xAxis : {

+			labels : {

+				style : {

+					color : '#6e6e70'

+				}

+			}

+		},

+		yAxis : {

+			labels : {

+				style : {

+					color : '#6e6e70'

+				}

+			}

+		},

+		plotOptions : {

+			series : {

+				shadow : true

+			},

+			candlestick : {

+				lineColor : '#404048'

+			},

+			map : {

+				shadow : false

+			}

+		},

 

-  Highcharts.theme = {

-  	colors: ["#f45b5b", "#8085e9", "#8d4654", "#7798BF", "#aaeeee", "#ff0066", "#eeaaee",

-  		"#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],

-  	chart: {

-  		backgroundColor: null,

-  		style: {

-  			fontFamily: "Signika, serif"

-  		}

-  	},

-  	title: {

-  		style: {

-  			color: 'black',

-  			fontSize: '16px',

-  			fontWeight: 'bold'

-  		}

-  	},

-  	subtitle: {

-  		style: {

-  			color: 'black'

-  		}

-  	},

-  	tooltip: {

-  		borderWidth: 0

-  	},

-  	legend: {

-  		itemStyle: {

-  			fontWeight: 'bold',

-  			fontSize: '13px'

-  		}

-  	},

-  	xAxis: {

-  		labels: {

-  			style: {

-  				color: '#6e6e70'

-  			}

-  		}

-  	},

-  	yAxis: {

-  		labels: {

-  			style: {

-  				color: '#6e6e70'

-  			}

-  		}

-  	},

-  	plotOptions: {

-  		series: {

-  			shadow: true

-  		},

-  		candlestick: {

-  			lineColor: '#404048'

-  		},

-  		map: {

-  			shadow: false

-  		}

-  	},

+		// Highstock specific

+		navigator : {

+			xAxis : {

+				gridLineColor : '#D0D0D8'

+			}

+		},

+		rangeSelector : {

+			buttonTheme : {

+				fill : 'white',

+				stroke : '#C0C0C8',

+				'stroke-width' : 1,

+				states : {

+					select : {

+						fill : '#D0D0D8'

+					}

+				}

+			}

+		},

+		scrollbar : {

+			trackBorderColor : '#C0C0C8'

+		},

 

-  	// Highstock specific

-  	navigator: {

-  		xAxis: {

-  			gridLineColor: '#D0D0D8'

-  		}

-  	},

-  	rangeSelector: {

-  		buttonTheme: {

-  			fill: 'white',

-  			stroke: '#C0C0C8',

-  			'stroke-width': 1,

-  			states: {

-  				select: {

-  					fill: '#D0D0D8'

-  				}

-  			}

-  		}

-  	},

-  	scrollbar: {

-  		trackBorderColor: '#C0C0C8'

-  	},

+		// General

+		background2 : '#E0E0E8'

 

-  	// General

-  	background2: '#E0E0E8'

-  	

-  };

+	};

 

-  // Apply the theme

-  Highcharts.setOptions(Highcharts.theme);

+	// Apply the theme

+	Highcharts.setOptions(Highcharts.theme);

 </script>

 </head>

-<body >

-<div style="margin-top:20px;background-color:#f4f4f5;border: 1px solid #d0d1d6;height:70px"  >

-<form action="${app }/gkjcssjsfx/main" id="gkjcssjsfxform" method="post"> 	

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

-		<tr>

-				<th width="20%"></th>	

-				<th width="20%"></th>

-				<th width="20%"></th>

-				<th width="10%"></th>

-				<th width="10%"></th>

-				<th width="20%"></th>

-		</tr>

-                <tr align="center">

-                <td align="right" ><font style="font-size:14px;color:#196794;font-family:微软雅黑;">项目类型：&nbsp;</font></td>

-              	<td align="left" ><span id="xmlxsel"></span></td>

-              	<td align="right" ><font style="font-size:14px;color:#196794;font-family:微软雅黑;">投资类型：&nbsp;</font></td>

-              	<td align="left"><span id="tzlxsel"></span></td>

-                <td align="right">

-               	<a class="btn btn-default btn-sm" href="#" onclick="gkjcssjsfx.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;">

-项目投资统计图</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 class="table_ud">

+<body>

+	<div style="margin-top:20px;background-color:#f4f4f5;border: 1px solid #d0d1d6;height:70px"  >

+		<form action="${app }/gkjcssjsfx/main" id="gkjcssjsfxform"

+			method="post">

+			<input type="hidden" name="first" value="1">

+			<table class="search_table" cellpadding="0" cellspacing="0"

+				align="center">

+				<tr>

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

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

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

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

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

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

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

+				</tr>

+				<tr align="center">

+					<td align="right"><font

+						style="font-size: 14px; color: #196794; font-family: 微软雅黑;">项目类型：&nbsp;</font></td>

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

+					<td align="right"><font

+						style="font-size: 14px; color: #196794; font-family: 微软雅黑;">投资类型：&nbsp;</font></td>

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

+					<td align="right"><font

+						style="font-size: 14px; color: #196794; font-family: 微软雅黑;">起止时间：&nbsp;</font></td>

+					<td align="left">

+						<table style="width: 90%;">

+							<tr>

+								<td><input id="d4311" class="Wdate" style="width: 100%;"

+									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><span>~</span></td>

+								<td><input id="d4312" class="Wdate" style="width: 100%;"

+									name="endDate" value="${endDate }" type="text"

+									onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})">

+								</td>

+							</tr>

+						</table>

+					</td>

+					<td align="right"><a class="btn btn-default btn-sm" href="#"

+						onclick="gkjcssjsfx.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;">

+			项目投资统计图</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 class="table_ud">

 			<tr>

-			<c:if test="${flag!=1 }">

-				<th >所在港口</th>

-			</c:if>

-			<c:if test="${flag!=0 }">

-				<th >所在港区</th>

-			</c:if>

-				<th >总投资（万元）</th>

+				<c:if test="${flag!=1 }">

+					<th>所在港口</th>

+				</c:if>

+				<c:if test="${flag!=0 }">

+					<th>所在港区</th>

+				</c:if>

+				<th>总投资（万元）</th>

 			</tr>

 			<c:forEach items="${tzjhgltj}" var="tzjhgltjlist">

-			<tr>

-				<td>${tzjhgltjlist.szd}</td>

-				<td>${tzjhgltjlist.ztz}</td>

-			</tr>

+				<tr>

+					<td>${tzjhgltjlist.szd}</td>

+					<td>${tzjhgltjlist.ztz}</td>

+				</tr>

 			</c:forEach>

 		</table>

 	</div>

+ 42 - 42
gkjsjy/trunk/WebContent/WEB-INF/pages/index/indexmain.jsp
View File 

@@ -136,30 +136,30 @@
 
 			<div id="province" style="display:none;">
 
 				<img alt=""  usemap="#provincemap" style="position:relative;width:100%; top: 0;left: 0;overflow: hidden;"  src="${app }/static/biz/image/index/map.jpg">
 
 				<map name="provincemap" id="provincemap">
 
-					<!-- <area id="czgk" shape="circle" coords="381,188,11" onclick="index.main.getData('E8FFA9E619AA4A1BB560876281FBC27C','','czgk')"  href="#" > -->
 
-					<area id="cznhgk" shape="circle" coords="722,575,11" onclick="index.main.getData('6806736F9463483B97DEAAD549A8DAC4','','cznhgk')"  href="#" >
 
-					<area id="czgk" shape="circle" coords="691,620,11" onclick="index.main.getData('E8FFA9E619AA4A1BB560876281FBC27C','','czgk')"  href="#" >
 
-					<area id="hagk" shape="circle" coords="597,325,11" onclick="index.main.getData('C92E3C8D6AF845C6B41117A280C64CCF','','hagk')"  href="#" >
 
-					<area id="jygk" shape="circle" coords="754,554,11" onclick="index.main.getData('B79F862FE3EB4C769D25B5DB0FB0B7BC','','jygk')"  href="#" >
 
-					<area id="lyggk" shape="circle" coords="682,145,11" onclick="index.main.getData('583C76313E4149339C46D588F32D32DF','','lyggk')"  href="#" >
 
-					<area id="lygnhgk" shape="circle" coords="616,168,11" onclick="index.main.getData('85FAB5FE87464F0FB9031F39AE47F217','','lygnhgk')"  href="#" >
 
-					<area id="njgk" shape="circle" coords="568,518,11" onclick="index.main.getData('8A6FCE4E301642DBAC708114C60EA252','','njgk')"  href="#" >
 
-					<area id="njnhgk" shape="circle" coords="575,576,11" onclick="index.main.getData('5D094A81394540E5A81076459134F8D0','','njnhgk')"  href="#" >
 
-					<area id="ntgk" shape="circle" coords="838,548,11" onclick="index.main.getData('6343A57E7C8B4CE98AC56981B5F78580','','ntgk')"  href="#" >
 
-					<area id="ntnhgk" shape="circle" coords="825,507,11" onclick="index.main.getData('0224947E09A044BCB4BF4611B00497EC','','ntnhgk')"  href="#" >
 
-					<area id="szgk" shape="circle" coords="828,579,11" onclick="index.main.getData('9CB496AD12DF4C899086AFC1D8A95B13','','szgk')"  href="#" >
 
-					<area id="sznhgk" shape="circle" coords="804,673,11" onclick="index.main.getData('A0994A1F80DB42D7AC7C6916588263F0','','sznhgk')"  href="#" >
 
-					<area id="tzgk" shape="circle" coords="732,527,11" onclick="index.main.getData('44A778FA40564317AF661CEC78D8E21D','','tzgk')"  href="#" >
 
-					<area id="tznhgk" shape="circle" coords="710,454,11" onclick="index.main.getData('BCC103BAFB0042DCA39F8684A37314D6','','tznhgk')"  href="#" >
 
-					<area id="wxgk" shape="circle" coords="738,604,11" onclick="index.main.getData('7D6837A76EF240658CCBBAC01C970862','','wxgk')"  href="#" >
 
-					<area id="sqgk" shape="circle" coords="529,287,11" onclick="index.main.getData('579F3A7E566E4A86924DBA290F22ECE1','','sqgk')"  href="#" >
 
-					<area id="xzgk" shape="circle" coords="381,188,11" onclick="index.main.getData('659D99470458492C89F45D6C757AFEAD','','xzgk')"  href="#" >
 
-					<area id="ycgk" shape="circle" coords="812,324,11" onclick="index.main.getData('2B5F56FB8EFC40538437442DC9F58C48','','ycgk')"  href="#" >
 
-					<area id="ycnhgk" shape="circle" coords="690,303,11" onclick="index.main.getData('2A13C4A53FEC4159BBA7800370FD09A6','','ycnhgk')"  href="#" >
 
-					<area id="yzgk" shape="circle" coords="668,485,11" onclick="index.main.getData('820E961344AA480DB4AAA9E43130918E','','yzgk')"  href="#" >
 
-					<area id="yznhgk" shape="circle" coords="643,427,11" onclick="index.main.getData('CB8C7F6DD3C1491C9F8F4461080F5273','','yznhgk')"  href="#" >
 
-					<area id="zjgk" shape="circle" coords="648,513,11" onclick="index.main.getData('BEA06E3449714B79A1CD28B5600A4AFC','','zjgk')"  href="#" >
 
-					<!-- <area id="zjnhgk" shape="circle" coords="676,546,11" onclick="index.main.getData('9B2ACF86744D467F8FB28AB7DF86E250','','zjnhgk')"  href="#" > -->
 
+					<!-- <area id="czgk" shape="circle" coords="381,188,11" onclick="index.main.getData('E8FFA9E619AA4A1BB560876281FBC27C','','czgk')"  href="javascript:void(0);" > -->
 
+					<area id="cznhgk" shape="circle" coords="722,575,11" onclick="index.main.getData('6806736F9463483B97DEAAD549A8DAC4','','cznhgk')"  href="javascript:void(0);" >
 
+					<area id="czgk" shape="circle" coords="691,620,11" onclick="index.main.getData('E8FFA9E619AA4A1BB560876281FBC27C','','czgk')"  href="javascript:void(0);" >
 
+					<area id="hagk" shape="circle" coords="597,325,11" onclick="index.main.getData('C92E3C8D6AF845C6B41117A280C64CCF','','hagk')"  href="javascript:void(0);" >
 
+					<area id="jygk" shape="circle" coords="754,554,11" onclick="index.main.getData('B79F862FE3EB4C769D25B5DB0FB0B7BC','','jygk')"  href="javascript:void(0);" >
 
+					<area id="lyggk" shape="circle" coords="682,145,11" onclick="index.main.getData('583C76313E4149339C46D588F32D32DF','','lyggk')"  href="javascript:void(0);" >
 
+					<area id="lygnhgk" shape="circle" coords="616,168,11" onclick="index.main.getData('85FAB5FE87464F0FB9031F39AE47F217','','lygnhgk')"  href="javascript:void(0);" >
 
+					<area id="njgk" shape="circle" coords="568,518,11" onclick="index.main.getData('8A6FCE4E301642DBAC708114C60EA252','','njgk')"  href="javascript:void(0);" >
 
+					<area id="njnhgk" shape="circle" coords="575,576,11" onclick="index.main.getData('5D094A81394540E5A81076459134F8D0','','njnhgk')"  href="javascript:void(0);" >
 
+					<area id="ntgk" shape="circle" coords="838,548,11" onclick="index.main.getData('6343A57E7C8B4CE98AC56981B5F78580','','ntgk')"  href="javascript:void(0);" >
 
+					<area id="ntnhgk" shape="circle" coords="825,507,11" onclick="index.main.getData('0224947E09A044BCB4BF4611B00497EC','','ntnhgk')"  href="javascript:void(0);" >
 
+					<area id="szgk" shape="circle" coords="828,579,11" onclick="index.main.getData('9CB496AD12DF4C899086AFC1D8A95B13','','szgk')"  href="javascript:void(0);" >
 
+					<area id="sznhgk" shape="circle" coords="804,673,11" onclick="index.main.getData('A0994A1F80DB42D7AC7C6916588263F0','','sznhgk')"  href="javascript:void(0);" >
 
+					<area id="tzgk" shape="circle" coords="732,527,11" onclick="index.main.getData('44A778FA40564317AF661CEC78D8E21D','','tzgk')"  href="javascript:void(0);" >
 
+					<area id="tznhgk" shape="circle" coords="710,454,11" onclick="index.main.getData('BCC103BAFB0042DCA39F8684A37314D6','','tznhgk')"  href="javascript:void(0);" >
 
+					<area id="wxgk" shape="circle" coords="738,604,11" onclick="index.main.getData('7D6837A76EF240658CCBBAC01C970862','','wxgk')"  href="javascript:void(0);" >
 
+					<area id="sqgk" shape="circle" coords="529,287,11" onclick="index.main.getData('579F3A7E566E4A86924DBA290F22ECE1','','sqgk')"  href="javascript:void(0);" >
 
+					<area id="xzgk" shape="circle" coords="381,188,11" onclick="index.main.getData('659D99470458492C89F45D6C757AFEAD','','xzgk')"  href="javascript:void(0);" >
 
+					<area id="ycgk" shape="circle" coords="812,324,11" onclick="index.main.getData('2B5F56FB8EFC40538437442DC9F58C48','','ycgk')"  href="javascript:void(0);" >
 
+					<area id="ycnhgk" shape="circle" coords="690,303,11" onclick="index.main.getData('2A13C4A53FEC4159BBA7800370FD09A6','','ycnhgk')"  href="javascript:void(0);" >
 
+					<area id="yzgk" shape="circle" coords="668,485,11" onclick="index.main.getData('820E961344AA480DB4AAA9E43130918E','','yzgk')"  href="javascript:void(0);" >
 
+					<area id="yznhgk" shape="circle" coords="643,427,11" onclick="index.main.getData('CB8C7F6DD3C1491C9F8F4461080F5273','','yznhgk')"  href="javascript:void(0);" >
 
+					<area id="zjgk" shape="circle" coords="648,513,11" onclick="index.main.getData('BEA06E3449714B79A1CD28B5600A4AFC','','zjgk')"  href="javascript:void(0);" >
 
+					<!-- <area id="zjnhgk" shape="circle" coords="676,546,11" onclick="index.main.getData('9B2ACF86744D467F8FB28AB7DF86E250','','zjnhgk')"  href="javascript:void(0);" > -->
 
 				</map>
 
 			</div>
 
 			
@@ -167,19 +167,19 @@
 
 			<div id="nanjing" style="display: none;">
 
 				<img alt=""  usemap="#nanjingmap" style="position:absolute;width:100%;height:100%; top: 0;left: 0;overflow: hidden;"  src="${app }/static/biz/image/index/nanjing.jpg">
 
 				<map name="nanjingmap" id="nanjingmap">
 
-					<area id="njqbgq" shape="rect" coords="65,380,158,404" onclick="index.main.getData('','834C35B30744460FA85F51AB14599BFC','njqbgq')"  href="#" >
 
-					<area id="njbqgq" shape="rect" coords="160,531,255,551" onclick="index.main.getData('','EB7A205AD9C34AC1A4FCFCBF6B3E4D53','njbqgq')"  href="#" >
 
-					<area id="njmzzgq" shape="rect" coords="429,411,525,431" onclick="index.main.getData('','C439A690717A483CB6F1AA040CCD7D3F','njmzzgq')"  href="#" >
 
-					<area id="njpkgq" shape="rect" coords="500,205,597,227" onclick="index.main.getData('','265C0DF8789B4274BA84A014058257E1','njpkgq')"  href="#" >
 
-					<area id="njxggq" shape="rect" coords="548,364,644,383" onclick="index.main.getData('','1BE948247BA24EDF9DBABBBCFBA1BD3A','njxggq')"  href="#" >
 
-					<area id="njsymgq" shape="rect" coords="672,308,768,328" onclick="index.main.getData('','759DF99526FD4F7F934EF2DEC3C6CFF3','njsymgq')"  href="#" >
 
-					<area id="njdcgq" shape="rect" coords="789,42,885,64" onclick="index.main.getData('','9CE798065DCF48989CE9D6095EA77868','njdcgq')"  href="#" >
 
-					<area id="njxswgq" shape="rect" coords="814,322,909,342" onclick="index.main.getData('','95FFD3B84247464FAB32389A2B802DFF','njxswgq')"  href="#" >
 
-					<area id="njxbgq" shape="rect" coords="969,221,1065,241" onclick="index.main.getData('','146BCA17B5794F7D8BA8E8EB7C4C7202','njxbgq')"  href="#" >
 
-					<area id="njxxgq" shape="rect" coords="977,417,1073,437" onclick="index.main.getData('','2B74E3B45CE04EB58440BFDD44A96387','njxxgq')"  href="#" >
 
-					<area id="njltgq" shape="rect" coords="1160,422,1256,442" onclick="index.main.getData('','4C7359F3F188412289C1B3590D64DA04','njltgq')"  href="#" >
 
-					<area id="njyzgq" shape="rect" coords="1381,316,1476,336" onclick="index.main.getData('','559C0BB5C11B43E9AC93B2C666B60373','njyzgq')"  href="#" >
 
-					<area id="njmdgq" shape="rect" coords="1318,490,1414,512" onclick="index.main.getData('','4B19E8F155784D31BEE44DCB8C459D96','njmdgq')"  href="#" >
 
+					<area id="njqbgq" shape="rect" coords="65,380,158,404" onclick="index.main.getData('','834C35B30744460FA85F51AB14599BFC','njqbgq')"  href="javascript:void(0);" >
 
+					<area id="njbqgq" shape="rect" coords="160,531,255,551" onclick="index.main.getData('','EB7A205AD9C34AC1A4FCFCBF6B3E4D53','njbqgq')"  href="javascript:void(0);" >
 
+					<area id="njmzzgq" shape="rect" coords="429,411,525,431" onclick="index.main.getData('','C439A690717A483CB6F1AA040CCD7D3F','njmzzgq')"  href="javascript:void(0);" >
 
+					<area id="njpkgq" shape="rect" coords="500,205,597,227" onclick="index.main.getData('','265C0DF8789B4274BA84A014058257E1','njpkgq')"  href="javascript:void(0);" >
 
+					<area id="njxggq" shape="rect" coords="548,364,644,383" onclick="index.main.getData('','1BE948247BA24EDF9DBABBBCFBA1BD3A','njxggq')"  href="javascript:void(0);" >
 
+					<area id="njsymgq" shape="rect" coords="672,308,768,328" onclick="index.main.getData('','759DF99526FD4F7F934EF2DEC3C6CFF3','njsymgq')"  href="javascript:void(0);" >
 
+					<area id="njdcgq" shape="rect" coords="789,42,885,64" onclick="index.main.getData('','9CE798065DCF48989CE9D6095EA77868','njdcgq')"  href="javascript:void(0);" >
 
+					<area id="njxswgq" shape="rect" coords="814,322,909,342" onclick="index.main.getData('','95FFD3B84247464FAB32389A2B802DFF','njxswgq')"  href="javascript:void(0);" >
 
+					<area id="njxbgq" shape="rect" coords="969,221,1065,241" onclick="index.main.getData('','146BCA17B5794F7D8BA8E8EB7C4C7202','njxbgq')"  href="javascript:void(0);" >
 
+					<area id="njxxgq" shape="rect" coords="977,417,1073,437" onclick="index.main.getData('','2B74E3B45CE04EB58440BFDD44A96387','njxxgq')"  href="javascript:void(0);" >
 
+					<area id="njltgq" shape="rect" coords="1160,422,1256,442" onclick="index.main.getData('','4C7359F3F188412289C1B3590D64DA04','njltgq')"  href="javascript:void(0);" >
 
+					<area id="njyzgq" shape="rect" coords="1381,316,1476,336" onclick="index.main.getData('','559C0BB5C11B43E9AC93B2C666B60373','njyzgq')"  href="javascript:void(0);" >
 
+					<area id="njmdgq" shape="rect" coords="1318,490,1414,512" onclick="index.main.getData('','4B19E8F155784D31BEE44DCB8C459D96','njmdgq')"  href="javascript:void(0);" >
 
 				</map>
 
 			</div>
 
 			
@@ -226,10 +226,10 @@
 
 			<div id="lianyungang" style="display: none;">
 
 				<img alt=""  usemap="#lianyungangmap" style="position:absolute;width:100%;height:100%; top: 0;left: 0;overflow: hidden;"  src="${app }/static/biz/image/index/lianyungang.jpg">
 
 				<map name="lianyungangmap" id="lianyungangmap" >
 
-					<area id="lygzygq" shape="rect" coords="1134,51,1230,63" onclick="index.main.getData('','3C00D41476874B64A29B75EB6547474D','lygzygq')"  href="#" >
 
-					<area id="lyggq" shape="rect" coords="1323,203,1420,214" onclick="index.main.getData('','C84C5CFAD0B0454C99A1D35F8D56673A','lyggq')"  href="#" >
 
-					<area id="lygghgq" shape="rect" coords="1491,564,1575,573" onclick="index.main.getData('','58CE3217EF0E4FEC959B8FDF8D4CCDB0','lygghgq')"  href="#" >
 
-					<area id="lygxygq" shape="rect" coords="1578,317,1673,331" onclick="index.main.getData('','E548CDE607064C2591DF924C57F40A33','lygxygq')"  href="#" >
 
+					<area id="lygzygq" shape="rect" coords="1134,51,1230,63" onclick="index.main.getData('','3C00D41476874B64A29B75EB6547474D','lygzygq')"  href="javascript:void(0);" >
 
+					<area id="lyggq" shape="rect" coords="1323,203,1420,214" onclick="index.main.getData('','C84C5CFAD0B0454C99A1D35F8D56673A','lyggq')"  href="javascript:void(0);" >
 
+					<area id="lygghgq" shape="rect" coords="1491,564,1575,573" onclick="index.main.getData('','58CE3217EF0E4FEC959B8FDF8D4CCDB0','lygghgq')"  href="javascript:void(0);" >
 
+					<area id="lygxygq" shape="rect" coords="1578,317,1673,331" onclick="index.main.getData('','E548CDE607064C2591DF924C57F40A33','lygxygq')"  href="javascript:void(0);" >
 
 				</map>
 
 			</div>
 
 			
@@ -261,7 +261,7 @@
 
 	          	<h4 id="title"></h4>
 
 	          </div>
 
 	          <div class="close">
 
-	          		<a href="#" title="关闭" onclick="guanbipop()" >×</a>
 
+	          		<a href="javascript:void(0);" title="关闭" onclick="guanbipop()" >×</a>
 
 	          </div>
 
 	     </div>
 
  <table class="apply" cellpadding="0" cellspacing="0">

+ 1 - 1
gkjsjy/trunk/src/com/cxfws/sjtjfx/service/IGkjcssjsfxWebService.java
View File 

@@ -8,5 +8,5 @@ import javax.jws.WebService;
 
 public interface IGkjcssjsfxWebService {

 	@WebMethod(operationName = "findGkjcssjsfx", action = "http://service.web.jsjty.com/findGkjcssjsfx")

 	@WebResult(name = "result", targetNamespace = "http://service.web.jsjty.com/")

-	public String findGkjcssjsfx(String xmlxid, String tzlxid);

+	public String findGkjcssjsfx(String xmlxid, String tzlxid,String startDate, String endDate);

 }

+ 3 - 3
gkjsjy/trunk/src/com/cxfws/sjtjfx/service/impl/GkjcssjsfxWebService.java
View File 

@@ -21,13 +21,13 @@ public class GkjcssjsfxWebService extends BaseWebCtl implements IGkjcssjsfxWebSe
 
 	@Autowired

 	private TzjhglService tzjhglService;

 	@Override

-	public String findGkjcssjsfx(String xmlxid, String tzlxid) {

+	public String findGkjcssjsfx(String xmlxid, String tzlxid,String startDate, String endDate) {

 		if (!this.checkUser()){

 			return BaseWebCtl.NOLOGIN;

 		}

 		List<GkjcssjsfxVo> list = new ArrayList<GkjcssjsfxVo>();

 		if ("900".equals(GlobalData.CITY_CODE)) {

-			List<Object> tzjhgllist = tzjhglService.tongjiproValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid);

+			List<Object> tzjhgllist = tzjhglService.tongjiproValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid,StringUtils.isEmpty(startDate) ? "" : startDate,StringUtils.isEmpty(endDate) ? "" : endDate);

 			for (Object entity : tzjhgllist) {

 				Object[] e = (Object[]) entity;

 				GkjcssjsfxVo vo = new GkjcssjsfxVo();

@@ -36,7 +36,7 @@ public class GkjcssjsfxWebService extends BaseWebCtl implements IGkjcssjsfxWebSe
 
 				list.add(vo);

 			}

 		} else {

-			List<Object> tzjhgllist = tzjhglService.tongjicityValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid);

+			List<Object> tzjhgllist = tzjhglService.tongjicityValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid,StringUtils.isEmpty(startDate) ? "" : startDate,StringUtils.isEmpty(endDate) ? "" : endDate);

 			for (Object entity : tzjhgllist) {

 				Object[] e = (Object[]) entity;

 				GkjcssjsfxVo vo = new GkjcssjsfxVo();

+ 4 - 4
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/dao/TzjhglDao.java
View File 

@@ -20,9 +20,9 @@ public interface TzjhglDao extends SecRepository<TzjhglEntity, String> {
 
 	@Query(value = "SELECT * from GK_BASIC_JSJY_GKJS_TZJH t  where t.xmid =?1 and t.jhnd=?2 and t.RECORD_STATUS<>9", nativeQuery = true)

 	public List<TzjhglEntity> findByXmidAndJhndCheck(String xmid, String jhnd);

 	

-	@Query(value = "select t2.gkmc,sum(ztz) from GK_BASIC_JSJY_GKJS_XMXXGL t1 left join GK_BASIC_JSJY_GK_GK t2 on t1.szgk=t2.id where t1.record_status!=9 and t1.xmlx like ?1% and t1.tzlx like ?2% group by t2.gkmc", nativeQuery = true)

-	List<Object> tongjiproValue(String xmlx,String tzlx);

+	@Query(value = "select t2.gkmc,sum(ztz) from GK_BASIC_JSJY_GKJS_XMXXGL t1 left join GK_BASIC_JSJY_GK_GK t2 on t1.szgk=t2.id where t1.record_status!=9 and t1.xmlx like ?1% and t1.tzlx like ?2% and to_char(t1.JCSJ, 'yyyy-MM') >=  ?3 and to_char(t1.JCSJ, 'yyyy-MM') <=  ?4 group by t2.gkmc", nativeQuery = true)

+	List<Object> tongjiproValue(String xmlx,String tzlx,String startDate, String endDate);

 	

-	@Query(value = "select t2.gqmc,sum(ztz) from GK_BASIC_JSJY_GKJS_XMXXGL t1 left join GK_BASIC_JSJY_GK_GQ t2 on t1.szgq=t2.id where t1.record_status!=9 and t1.xmlx like ?1% and t1.tzlx like ?2% group by t2.gqmc", nativeQuery = true)

-	List<Object> tongjicityValue(String xmlx,String tzlx);

+	@Query(value = "select t2.gqmc,sum(ztz) from GK_BASIC_JSJY_GKJS_XMXXGL t1 left join GK_BASIC_JSJY_GK_GQ t2 on t1.szgq=t2.id where t1.record_status!=9 and t1.xmlx like ?1% and t1.tzlx like ?2% and to_char(t1.JCSJ, 'yyyy-MM') >=  ?3 and to_char(t1.JCSJ, 'yyyy-MM') <=  ?4 group by t2.gqmc", nativeQuery = true)

+	List<Object> tongjicityValue(String xmlx,String tzlx,String startDate, String endDate);

 }

+ 2 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/service/TzjhglService.java
View File 

@@ -21,8 +21,8 @@ public interface TzjhglService {
 
 	List<TzjhglEntity> findByXmidAndJhndCheck(String xmid, String jhnd);

 	

 	//投资统计省级

-	public List<Object>  tongjiproValue(String xmlx,String tzlx);

+	public List<Object>  tongjiproValue(String xmlx,String tzlx,String startDate, String endDate);

 	

 	//投资统计市级

-	public List<Object>  tongjicityValue(String xmlx,String tzlx);

+	public List<Object>  tongjicityValue(String xmlx,String tzlx,String startDate, String endDate);

 }

+ 4 - 4
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/service/impl/TzjhglServiceImpl.java
View File 

@@ -39,12 +39,12 @@ public class TzjhglServiceImpl extends JyglBaseService<TzjhglEntity, String> imp
 
 	}

 

 	@Override

-	public List<Object> tongjiproValue(String xmlx,String tzlx) {

-		return dao.tongjiproValue(xmlx,tzlx);

+	public List<Object> tongjiproValue(String xmlx,String tzlx,String startDate, String endDate) {

+		return dao.tongjiproValue(xmlx,tzlx,startDate,endDate);

 	}

 	

 	@Override

-	public List<Object> tongjicityValue(String xmlx,String tzlx) {

-		return dao.tongjicityValue(xmlx,tzlx);

+	public List<Object> tongjicityValue(String xmlx,String tzlx,String startDate, String endDate) {

+		return dao.tongjicityValue(xmlx,tzlx,startDate,endDate);

 	}

 }

+ 18 - 3
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkjcssjsfx/ctl/GkjcssjsfxCtl.java
View File 

@@ -1,6 +1,8 @@
 
 package com.xt.jygl.gkyxtjyfx.gkjcssjsfx.ctl;

 

+import java.text.SimpleDateFormat;

 import java.util.ArrayList;

+import java.util.Date;

 import java.util.List;

 

 import net.sf.json.JSONArray;

@@ -31,11 +33,21 @@ public class GkjcssjsfxCtl extends BaseWebCtl {
 
 	 * @return

 	 */

 	@RequestMapping(value = "/main")

-	public String main(Model model, String menuid, String xmlxid, String tzlxid) {

+	public String main(Model model, String menuid, String xmlxid, String tzlxid, String startDate, String endDate, String first) {

+		//第一次请求进入页面时，将初始化的时间放入查询条件中，并返回页面共页面显示

+		if(first == null){

+			SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM");

+			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy");

+			Date dateStart = new Date();

+			startDate = sdf2.format(dateStart);

+			startDate += "-01";

+			endDate = sdf1.format(dateStart);

+		}

+		

 		List<GkjcssjsfxVo> list = new ArrayList<GkjcssjsfxVo>();

 		String flag = "";

 		if ("900".equals(GlobalData.CITY_CODE)) {

-			List<Object> tzjhgllist = tzjhglService.tongjiproValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid);

+			List<Object> tzjhgllist = tzjhglService.tongjiproValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid,StringUtils.isEmpty(startDate) ? "" : startDate,StringUtils.isEmpty(endDate) ? "" : endDate);

 			for (Object entity : tzjhgllist) {

 				Object[] e = (Object[]) entity;

 				GkjcssjsfxVo vo = new GkjcssjsfxVo();

@@ -45,7 +57,7 @@ public class GkjcssjsfxCtl extends BaseWebCtl {
 
 			}

 			flag = "0";

 		} else {

-			List<Object> tzjhgllist = tzjhglService.tongjicityValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid);

+			List<Object> tzjhgllist = tzjhglService.tongjicityValue(StringUtils.isEmpty(xmlxid) ? "" : xmlxid, StringUtils.isEmpty(tzlxid) ? "" : tzlxid,StringUtils.isEmpty(startDate) ? "" : startDate,StringUtils.isEmpty(endDate) ? "" : endDate);

 			for (Object entity : tzjhgllist) {

 				Object[] e = (Object[]) entity;

 				GkjcssjsfxVo vo = new GkjcssjsfxVo();

@@ -68,6 +80,9 @@ public class GkjcssjsfxCtl extends BaseWebCtl {
 
 

 		model.addAttribute("xmlxid", xmlxid);

 		model.addAttribute("tzlxid", tzlxid);

+		

+		model.addAttribute("startDate", startDate);

+		model.addAttribute("endDate", endDate);

 		return "/gkyxtjyfx/gkjcssjsfx/gkjcssjsfx";

 	}

 }