Merge branch 'master' of http://git.minpay.cc/dianwang/dianwangAdm

# Conflicts:
#	src/main/java/com/minpay/common/service/impl/ReportServiceImpl.java
#	src/main/java/com/minpay/db/table/own/mapper/ReportServiceMapper.java
#	src/main/resources/com/minpay/db/table/own/mapper/ReportServiceMapper.xml
#	src/main/webapp/admin/login.html

src/main/webapp/WEB-INF/config.properties

@@ -1,11 +1,11 @@
 dataSource.driverClassName=com.mysql.jdbc.Driver
 
-dataSource.url=jdbc:mysql://123.138.111.28:3506/dianwang?useUnicode=true&characterEncoding=UTF8
-dataSource.username=dw_user
-dataSource.password=123456
-#dataSource.url=jdbc:mysql://127.0.0.1:3306/dianwang?useUnicode=true&characterEncoding=UTF8
-#dataSource.username=root
-#dataSource.password=12345
+#dataSource.url=jdbc:mysql://123.138.111.28:3506/dianwang?useUnicode=true&characterEncoding=UTF8
+#dataSource.username=dw_user
+#dataSource.password=123456
+dataSource.url=jdbc:mysql://127.0.0.1:3306/dianwang?useUnicode=true&characterEncoding=UTF8
+dataSource.username=root
+dataSource.password=12345
 
 
 config.MINDebug=false

src/main/webapp/WEB-INF/database.xml

@@ -1,68 +1,112 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="
-	http://www.springframework.org/schema/beans
-	http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-	http://www.springframework.org/schema/aop 
-	http://www.springframework.org/schema/aop/spring-aop-3.0.xsd 
-	http://www.springframework.org/schema/tx 
-	http://www.springframework.org/schema/tx/spring-tx-3.0.xsd" >
+
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+
+	http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+
 
 	
+
 	<bean id="dataSource" name="dataSource" class="org.apache.commons.dbcp.BasicDataSource" 
+
 		scope="singleton"> 
+
 		<property name="driverClassName" value="${dataSource.driverClassName}" /> 
+
 		<property name="url" value="${dataSource.url}" /> 
+
 		<property name="username" value="${dataSource.username}"/> 
+
 		<property name="password" value="${dataSource.password}"/> 
+
 		<property name="validationQuery" value="SELECT 1 from dual"/> 
-		<property name="testOnBorrow" value="true"/> 
+
+		<property name="testOnBorrow" value="false"/> 
+
 		<property name="testWhileIdle" value ="true"/> 
-		<property name="timeBetweenEvictionRunsMillis" value="30000" /> 
+
+		<property name="timeBetweenEvictionRunsMillis" value="60000" /> 
+		<!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->  
+        <property name="minEvictableIdleTimeMillis" value="300000" />  
+						 
+		<!--每次检测时，需要检测多少个数据连接，一般设置为与最大连接数一样，这样就可以检测完所有的连接-->  
 		<property name="numTestsPerEvictionRun" value="20" /> 
-		<property name="initialSize" value="10"/>  
-   		<property name="maxActive" value="10"/> 
-   		<property name="maxWait" value="7000"/>  
-	</bean>
-	 
-	<!--
-	<bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean"> 
-		<property name="jndiName"> <value>jdbc/pay_ds</value> </property> 
+
+		<property name="initialSize" value="10"/>
+
+   		<property name="maxActive" value="20"/>
+
+   		<property name="maxWait" value="60000"/>  
+		 <!--是否在数据库连接请求量大的时候，如总数50，当前已请求了49个，所剩不多了，检测那些执行时间久的连接-->  
+		<property name="removeAbandoned" value="true"/> 
+		<!--归还连接时执行validationQuery检测连接是否有效-->  
+        <property name="testOnReturn" value="true" /> 
+
 	</bean>
-    -->  
-	
-	<!-- beware that mapper-config.xml is not needed if you use injected mappers -->
+
 	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean"
+
 		scope="singleton" lazy-init="true">
+
 		<property name="configLocation"
+
 			value="classpath:com/startup/minpay/frame/jdbc/mybatisConfigure.xml"></property>
+
 		<property name="dataSource" ref="dataSource" />
+
 		<property name="mapperLocations">
+
 			<list>
+
 				<value>classpath:com/minpay/db/table/mapper/*.xml</value>
+
 				<value>classpath:com/minpay/db/table/own/mapper/*.xml</value>
-				<!-- <value>classpath:com/minpay/db/procedure/mapper/*.xml</value> -->
+
 			</list>
+
 		</property>
+
 		<property name="typeAliasesPackage" value="com.minpay.db" />
+
 	</bean>
+
 	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer"
+
 		scope="singleton" lazy-init="true">
+
 		<property name="basePackage" value="com.min.xxpro.db" />
+
 	</bean>
+
 	<bean id="transactionFactory"
+
 		class="org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory"
+
 		scope="singleton"  lazy-init="true"/>
+
 	<bean id="databaseManager" class="com.startup.minpay.frame.jdbc.MINDataBaseManager"
+
 		scope="singleton">
+
 		<constructor-arg>
+
 			<ref bean="sqlSessionFactory" />
+
 		</constructor-arg>
+
 		<constructor-arg>
+
 			<ref bean="transactionFactory" />
+
 		</constructor-arg>
+
 	</bean>
 
+
+
 </beans>

src/main/webapp/admin/reprotManage/dataWare.html

@@ -74,7 +74,7 @@
 				data : {
 				},
 				success : function(data) {
-					var html = '<select id = "fileType"><option value = "">请选择</option>';
+					var html = '<select id = "fileType" lay-filter="test"><option value = "">请选择</option>';
 					var fileTypeList = data.data;
 					for (var i = 0; i < fileTypeList.length; i ++) {
 						var fileTypeInf = fileTypeList[i];
@@ -84,7 +84,7 @@
 					$("#fileTypeDiv").html(html);
 					form.render();
 					
-					form.on('select', function(data){
+					form.on('select(test)', function(data){
 						changeSelectCon(2,data.elem,"sel")
 					});      
 				},
@@ -180,21 +180,76 @@
     	  openMainTabPage(openPageId, "导入", "reprotManage/dataWareUpload.html?pageId="+openPageId, '', pageId, reloadSearch);
       }
       function downLoadExcel(){
-    	  
-    	  var date = $("#date").val();
-	  	  var type = $("#fileTypeDiv").find("select option:selected").val();
-	  	  if (isEmpty(date)) {
-	  		  $.ErrorAlert("请选择日期范围!");
-	  		  return;
-	  	  }
-	  	  if (isEmpty(type)) {
-	  		  $.ErrorAlert("请选择数据类型!");
-	  		  return;
-	  	  }
-		  var param = {};
-	  	  param.date = date;
-	  	  param.type = type;
-    	  exportExcel("../../DataWareManageAction/fileDataDownload", param);
+		$.request({
+			action : 'BranchFileTypeAction/branchFileTypeQuery',
+			data : {
+			},
+			success : function(data) {
+				var html = '<select><option value = "">请选择</option>';
+				var fileTypeList = data.data;
+				for (var i = 0; i < fileTypeList.length; i ++) {
+					var fileTypeInf = fileTypeList[i];
+					html += '<option value = "' + fileTypeInf.id +'">' + fileTypeInf.name + '</option>';
+				}
+				html += '</select>';
+				layer.open({
+				  type: 1,
+				  skin: 'layui-layer-rim', //加上边框
+				  area: ['500px', '400px'], //宽高
+				  content: '<form class="layui-form" style = "margin-top : 20px;">' +
+								'<div class="layui-inline" style = "margin-left : 20px;">' +
+									'<label class="f12-gray4">数据日期:</label>' +
+									'<div class="layui-input-inline" style="position: relative;">' +
+										'<input type="text" class="layui-input" name = "date" placeholder="请选择日期" readOnly/>' +
+									'</div>' +
+								'</div>' +
+								'<div class="layui-inline">' +
+									'<label class="f12-gray4">文件名称:</label>' +
+									'<div class="layui-inline">' +
+										html +
+									'</div>' +
+								'</div>' +
+							'</form>',
+				  btn: ['导出', '取消'],
+				  yes: function(index, layero){
+					  var date = $(".layui-layer").find("input[name='date']").val();
+				  	  var type = $(".layui-layer").find("select option:selected").val();
+				  	  if (isEmpty(date)) {
+				  		  $.ErrorAlert("请选择日期范围!");
+				  		  return;
+				  	  }
+				  	  if (isEmpty(type)) {
+				  		  $.ErrorAlert("请选择数据类型!");
+				  		  return;
+				  	  }
+					  var param = {};
+				  	  param.date = date;
+				  	  param.type = type;
+			    	  exportExcel("../../DataWareManageAction/fileDataDownload", param); 
+				  },
+				  btn2: function(index, layero){
+				  },
+				  success: function(layero, index){
+					form.render();
+					var time = $(".layui-layer").attr("time");
+					$(".layui-layer").find("input[name='date']").attr("id","date" + time);
+					layui.use(['laydate'], function(){
+			    	  var laydate = layui.laydate;
+			    	  laydate.render({ 
+			    		  elem: '#date' + time
+			    		  ,type: 'date'
+			    		  ,range: true
+					  });
+					})
+				  }
+				});
+				
+				
+			},
+			error : function(data2) {
+				$.ErrorAlert(data2.MINErrorMessage);
+			}
+		});
       }
       
       function showDetail(data){

src/main/webapp/css/modify.css

@@ -325,7 +325,7 @@ body .layui-layer-page{
 	border-radius: 4px;
 }
 body .layui-layer-page .layui-layer-title{
-	background: #00A0E8;
+	background: #012e29;
 	border-radius: 4px 4px 0 0;
 	font-size: 14px;
 	color: rgba(255,255,255,0.85);