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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/jsxmaqsc/GkjsxmaqscDao.java

@@ -41,7 +41,7 @@ public interface GkjsxmaqscDao extends MyRepository<GkjsxmaqscEntity, Long> {
 	@Query(value = "SELECT G.GQMC,COUNT(J.ID) "
 			+ " FROM T_YJPT_GQ G "
 			+ " LEFT JOIN T_YJPT_JSXMAQSC J "
-			+ " ON J.SZGQ=G.ID AND  J.RECORD_STATUS!=9 AND ?2<=A.ADD_DATE AND A.ADD_DATE<=?3 "
+			+ " ON J.SZGQ=G.ID AND  J.RECORD_STATUS!=9 AND ?2<=J.ADD_DATE AND J.ADD_DATE<=?3 "
 			+ " WHERE G.RECORD_STATUS!=9 AND G.SZD like ?1  " + " GROUP BY G.GQMC ORDER BY G.GQMC", nativeQuery = true)
 	public List<Object[]> countSp(String szd,Date ks,Date js);
 

gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -1,17 +1,18 @@
 #***************************************  jdbc info  ********************************************#
 jdbc.driver                 = oracle.jdbc.driver.OracleDriver
 jdbc.url                      = jdbc:oracle:thin:@192.168.57.36:1521:orcl
-jdbc.username           = yjptpro
+jdbc.username           = yjptzj
 jdbc.password            = yjpt
 hibernate.dialect        = org.hibernate.dialect.Oracle10gDialect
 #********************************** qlyg jdbc info**********************************************#
-jdbc.qlyg.url               = jdbc:oracle:thin:@10.1.30.104:1521:JTTJJC
+jdbc.qlyg.url               = jdbc:oracle:thin:@192.168.57.36:1521:orcl
 jdbc.qlyg.username    = jsgk
 jdbc.qlyg.password     = jsgk
 #********************************** xzzx jdbc info**********************************************#
-jdbc.xzzx.url               = 
-jdbc.xzzx.username    =  
-jdbc.xzzx.password     =  
+jdbc.xzzx.url               = jdbc:oracle:thin:@192.168.57.36:1521:orcl
+jdbc.xzzx.username    = xzzx
+jdbc.xzzx.password     = xzzx
+
 #dbcp settings
 dbcp.maxIdle=30
 dbcp.minIdle=5
@@ -21,10 +22,12 @@ hibernate.hbm2ddl.auto=
 
 
 # local WebService
-web.service.url=localhost
+web.service.url=192.168.57.76
 web.service.port=8089
 
 # Province WebService 
+web.province.service.url=192.168.57.71
+web.province.service.port=8089
 
 #\u4f5c\u4e1a\u7533\u62a5\uff0c\u95f4\u9694\u7684\u65f6\u95f4\uff0c\u5fc5\u987b\u5b8c\u6210
 zysb.time=7

gkaq/yjpt-java/trunk/yjpt/WEB-INF/web.xml

@@ -12,22 +12,22 @@
 	<context-param>
 		<description>0:省级;1:市级</description>
 		<param-name>deploy_mode</param-name>
-		<param-value>0</param-value>
+		<param-value>1</param-value>
 	</context-param>
 	<context-param>
 		<description>区域代码</description>
 		<param-name>city_code</param-name>
-		<param-value>900</param-value>
+		<param-value>90011</param-value>
 	</context-param>
 	<context-param>
 		<description>是否使用地图资源系统(Y/N)</description>
 		<param-name>open_map</param-name>
-		<param-value>Y</param-value>
+		<param-value>N</param-value>
 	</context-param>
 	<context-param>
 		<description>是否与权力阳光同步(Y/N)</description>
 		<param-name>qlyg_sync</param-name>
-		<param-value>Y</param-value>
+		<param-value>N</param-value>
 	</context-param>
 	<context-param>
 		<description>是否在危险品审批中启用签章功能(Y/N)</description>
@@ -35,6 +35,11 @@
 		<param-value>N</param-value>
 	</context-param>
 	<context-param>
+		<description>是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制）(Y/N)</description>
+		<param-name>JyrDisbleEdit</param-name>
+		<param-value>Y</param-value>
+	</context-param>
+	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
 			classpath*:spring/applicationContext*.xml
@@ -73,7 +78,7 @@
 	<context-param>
 		<description>默认密码</description>
 		<param-name>default_password</param-name>
-		<param-value>123456</param-value>
+		<param-value>yjpt.123</param-value>
 	</context-param>
 	<context-param>
 		<description>上传文件大小(M)</description>
@@ -98,7 +103,7 @@
 	<context-param>
 		<description>是否jax-ws同步(Y/N)</description>
 		<param-name>jaxws_sync</param-name>
-		<param-value>Y</param-value>
+		<param-value>N</param-value>
 	</context-param>
 	<context-param>
 		<description>同步UserId</description>