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

# Conflicts:
#	src/main/java/com/minpay/db/table/model/Dw95598Gdlx.java
#	src/main/java/com/minpay/db/table/model/Dw95598GdlxExample.java
#	src/main/java/com/minpay/db/table/model/DwFileDetail05.java
#	src/main/java/com/minpay/db/table/model/DwFileDetail05Example.java
#	src/main/java/com/minpay/reportManage/action/DataWareManageAction.java
#	src/main/java/com/minpay/reportManage/action/Report95598Action.java
#	src/main/resources/com/minpay/db/table/mapper/Dw95598GdlxMapper.xml
#	src/main/resources/com/minpay/db/table/mapper/DwFileDetail05Mapper.xml
#	src/main/webapp/admin/95598/reportManage95598.html
#	src/main/webapp/admin/95598/typeManage.html

src/main/java/com/minpay/reportManage/action/Report95598Action.java

@@ -53,6 +53,9 @@ public class Report95598Action implements IMINAction {
             	} else {
             		resMap.put("title", dw95598Gdlx.getName());
             	}
+        		resMap.put("title", dw95598Gdlx.getName());
+            	resMap.put("id", dw95598Gdlx.getId());
+            	resMap.put("level", dw95598Gdlx.getLevel());
             	resMap.put("spread", true);
             	children.add(resMap);
 			}
@@ -127,6 +130,7 @@ public class Report95598Action implements IMINAction {
         		dw95598Gdlx.setName(nodeName);
         	}
         	
+        	dw95598Gdlx.setName(nodeName);
         	db.updateByPrimaryKeySelective(Dw95598GdlxMapper.class, dw95598Gdlx);
         // 删除节点
         } else if ("del".equals(type)) {

src/main/resources/com/minpay/db/table/mapper/DwFileDetail07Mapper.xml

@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.minpay.db.table.mapper.DwFileDetail07Mapper" >
-  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.DwFileDetail07" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.minpay.db.table.mapper.DwFileDetail07Mapper">
+  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.DwFileDetail07">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="DFD7_ID" property="id" jdbcType="VARCHAR" />
-    <result column="DFD7_NO" property="no" jdbcType="VARCHAR" />
-    <result column="DFD7_TYPE" property="type" jdbcType="VARCHAR" />
-    <result column="DFD7_UNIT" property="unit" jdbcType="VARCHAR" />
-    <result column="DFD7_DEVICE" property="device" jdbcType="VARCHAR" />
-    <result column="DFD7_TIME" property="time" jdbcType="VARCHAR" />
-    <result column="DFD7_EVENTTYPE" property="eventtype" jdbcType="VARCHAR" />
-    <result column="DFD7_FA" property="fa" jdbcType="VARCHAR" />
-    <result column="DFD7_TRIPTYPE" property="triptype" jdbcType="VARCHAR" />
-    <result column="DFD7_CAUSE" property="cause" jdbcType="VARCHAR" />
-    <result column="DFD7_CHZDZQK" property="chzdzqk" jdbcType="VARCHAR" />
-    <result column="DFD7_HANDLE" property="handle" jdbcType="VARCHAR" />
-    <result column="DFD7_ERROBRIEF" property="errobrief" jdbcType="VARCHAR" />
+    <id column="DFD7_ID" jdbcType="VARCHAR" property="id" />
+    <result column="DFD7_NO" jdbcType="VARCHAR" property="no" />
+    <result column="DFD7_TYPE" jdbcType="VARCHAR" property="type" />
+    <result column="DFD7_UNIT" jdbcType="VARCHAR" property="unit" />
+    <result column="DFD7_DEVICE" jdbcType="VARCHAR" property="device" />
+    <result column="DFD7_TIME" jdbcType="VARCHAR" property="time" />
+    <result column="DFD7_EVENTTYPE" jdbcType="VARCHAR" property="eventtype" />
+    <result column="DFD7_FA" jdbcType="VARCHAR" property="fa" />
+    <result column="DFD7_TRIPTYPE" jdbcType="VARCHAR" property="triptype" />
+    <result column="DFD7_CAUSE" jdbcType="VARCHAR" property="cause" />
+    <result column="DFD7_CHZDZQK" jdbcType="VARCHAR" property="chzdzqk" />
+    <result column="DFD7_HANDLE" jdbcType="VARCHAR" property="handle" />
+    <result column="DFD7_ERROBRIEF" jdbcType="VARCHAR" property="errobrief" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -53,29 +53,29 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <sql id="Update_By_Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <where >
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -86,7 +86,7 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -94,25 +94,25 @@
     DFD7_ID, DFD7_NO, DFD7_TYPE, DFD7_UNIT, DFD7_DEVICE, DFD7_TIME, DFD7_EVENTTYPE, DFD7_FA, 
     DFD7_TRIPTYPE, DFD7_CAUSE, DFD7_CHZDZQK, DFD7_HANDLE, DFD7_ERROBRIEF
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.minpay.db.table.model.DwFileDetail07Example" >
+  <select id="selectByExample" parameterType="com.minpay.db.table.model.DwFileDetail07Example" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from dw_file_detail_07
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -122,7 +122,7 @@
     from dw_file_detail_07
     where DFD7_ID = #{id,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -130,17 +130,17 @@
     delete from dw_file_detail_07
     where DFD7_ID = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.DwFileDetail07Example" >
+  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.DwFileDetail07Example">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     delete from dw_file_detail_07
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.minpay.db.table.model.DwFileDetail07" >
+  <insert id="insert" parameterType="com.minpay.db.table.model.DwFileDetail07">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -156,157 +156,157 @@
       #{cause,jdbcType=VARCHAR}, #{chzdzqk,jdbcType=VARCHAR}, #{handle,jdbcType=VARCHAR}, 
       #{errobrief,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.minpay.db.table.model.DwFileDetail07" >
+  <insert id="insertSelective" parameterType="com.minpay.db.table.model.DwFileDetail07">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into dw_file_detail_07
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
         DFD7_ID,
       </if>
-      <if test="no != null" >
+      <if test="no != null">
         DFD7_NO,
       </if>
-      <if test="type != null" >
+      <if test="type != null">
         DFD7_TYPE,
       </if>
-      <if test="unit != null" >
+      <if test="unit != null">
         DFD7_UNIT,
       </if>
-      <if test="device != null" >
+      <if test="device != null">
         DFD7_DEVICE,
       </if>
-      <if test="time != null" >
+      <if test="time != null">
         DFD7_TIME,
       </if>
-      <if test="eventtype != null" >
+      <if test="eventtype != null">
         DFD7_EVENTTYPE,
       </if>
-      <if test="fa != null" >
+      <if test="fa != null">
         DFD7_FA,
       </if>
-      <if test="triptype != null" >
+      <if test="triptype != null">
         DFD7_TRIPTYPE,
       </if>
-      <if test="cause != null" >
+      <if test="cause != null">
         DFD7_CAUSE,
       </if>
-      <if test="chzdzqk != null" >
+      <if test="chzdzqk != null">
         DFD7_CHZDZQK,
       </if>
-      <if test="handle != null" >
+      <if test="handle != null">
         DFD7_HANDLE,
       </if>
-      <if test="errobrief != null" >
+      <if test="errobrief != null">
         DFD7_ERROBRIEF,
       </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="no != null" >
+      <if test="no != null">
         #{no,jdbcType=VARCHAR},
       </if>
-      <if test="type != null" >
+      <if test="type != null">
         #{type,jdbcType=VARCHAR},
       </if>
-      <if test="unit != null" >
+      <if test="unit != null">
         #{unit,jdbcType=VARCHAR},
       </if>
-      <if test="device != null" >
+      <if test="device != null">
         #{device,jdbcType=VARCHAR},
       </if>
-      <if test="time != null" >
+      <if test="time != null">
         #{time,jdbcType=VARCHAR},
       </if>
-      <if test="eventtype != null" >
+      <if test="eventtype != null">
         #{eventtype,jdbcType=VARCHAR},
       </if>
-      <if test="fa != null" >
+      <if test="fa != null">
         #{fa,jdbcType=VARCHAR},
       </if>
-      <if test="triptype != null" >
+      <if test="triptype != null">
         #{triptype,jdbcType=VARCHAR},
       </if>
-      <if test="cause != null" >
+      <if test="cause != null">
         #{cause,jdbcType=VARCHAR},
       </if>
-      <if test="chzdzqk != null" >
+      <if test="chzdzqk != null">
         #{chzdzqk,jdbcType=VARCHAR},
       </if>
-      <if test="handle != null" >
+      <if test="handle != null">
         #{handle,jdbcType=VARCHAR},
       </if>
-      <if test="errobrief != null" >
+      <if test="errobrief != null">
         #{errobrief,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.minpay.db.table.model.DwFileDetail07Example" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.minpay.db.table.model.DwFileDetail07Example" resultType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select count(*) from dw_file_detail_07
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update dw_file_detail_07
-    <set >
-      <if test="record.id != null" >
+    <set>
+      <if test="record.id != null">
         DFD7_ID = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.no != null" >
+      <if test="record.no != null">
         DFD7_NO = #{record.no,jdbcType=VARCHAR},
       </if>
-      <if test="record.type != null" >
+      <if test="record.type != null">
         DFD7_TYPE = #{record.type,jdbcType=VARCHAR},
       </if>
-      <if test="record.unit != null" >
+      <if test="record.unit != null">
         DFD7_UNIT = #{record.unit,jdbcType=VARCHAR},
       </if>
-      <if test="record.device != null" >
+      <if test="record.device != null">
         DFD7_DEVICE = #{record.device,jdbcType=VARCHAR},
       </if>
-      <if test="record.time != null" >
+      <if test="record.time != null">
         DFD7_TIME = #{record.time,jdbcType=VARCHAR},
       </if>
-      <if test="record.eventtype != null" >
+      <if test="record.eventtype != null">
         DFD7_EVENTTYPE = #{record.eventtype,jdbcType=VARCHAR},
       </if>
-      <if test="record.fa != null" >
+      <if test="record.fa != null">
         DFD7_FA = #{record.fa,jdbcType=VARCHAR},
       </if>
-      <if test="record.triptype != null" >
+      <if test="record.triptype != null">
         DFD7_TRIPTYPE = #{record.triptype,jdbcType=VARCHAR},
       </if>
-      <if test="record.cause != null" >
+      <if test="record.cause != null">
         DFD7_CAUSE = #{record.cause,jdbcType=VARCHAR},
       </if>
-      <if test="record.chzdzqk != null" >
+      <if test="record.chzdzqk != null">
         DFD7_CHZDZQK = #{record.chzdzqk,jdbcType=VARCHAR},
       </if>
-      <if test="record.handle != null" >
+      <if test="record.handle != null">
         DFD7_HANDLE = #{record.handle,jdbcType=VARCHAR},
       </if>
-      <if test="record.errobrief != null" >
+      <if test="record.errobrief != null">
         DFD7_ERROBRIEF = #{record.errobrief,jdbcType=VARCHAR},
       </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -325,57 +325,57 @@
       DFD7_CHZDZQK = #{record.chzdzqk,jdbcType=VARCHAR},
       DFD7_HANDLE = #{record.handle,jdbcType=VARCHAR},
       DFD7_ERROBRIEF = #{record.errobrief,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.DwFileDetail07" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.minpay.db.table.model.DwFileDetail07">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update dw_file_detail_07
-    <set >
-      <if test="no != null" >
+    <set>
+      <if test="no != null">
         DFD7_NO = #{no,jdbcType=VARCHAR},
       </if>
-      <if test="type != null" >
+      <if test="type != null">
         DFD7_TYPE = #{type,jdbcType=VARCHAR},
       </if>
-      <if test="unit != null" >
+      <if test="unit != null">
         DFD7_UNIT = #{unit,jdbcType=VARCHAR},
       </if>
-      <if test="device != null" >
+      <if test="device != null">
         DFD7_DEVICE = #{device,jdbcType=VARCHAR},
       </if>
-      <if test="time != null" >
+      <if test="time != null">
         DFD7_TIME = #{time,jdbcType=VARCHAR},
       </if>
-      <if test="eventtype != null" >
+      <if test="eventtype != null">
         DFD7_EVENTTYPE = #{eventtype,jdbcType=VARCHAR},
       </if>
-      <if test="fa != null" >
+      <if test="fa != null">
         DFD7_FA = #{fa,jdbcType=VARCHAR},
       </if>
-      <if test="triptype != null" >
+      <if test="triptype != null">
         DFD7_TRIPTYPE = #{triptype,jdbcType=VARCHAR},
       </if>
-      <if test="cause != null" >
+      <if test="cause != null">
         DFD7_CAUSE = #{cause,jdbcType=VARCHAR},
       </if>
-      <if test="chzdzqk != null" >
+      <if test="chzdzqk != null">
         DFD7_CHZDZQK = #{chzdzqk,jdbcType=VARCHAR},
       </if>
-      <if test="handle != null" >
+      <if test="handle != null">
         DFD7_HANDLE = #{handle,jdbcType=VARCHAR},
       </if>
-      <if test="errobrief != null" >
+      <if test="errobrief != null">
         DFD7_ERROBRIEF = #{errobrief,jdbcType=VARCHAR},
       </if>
     </set>
     where DFD7_ID = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.DwFileDetail07" >
+  <update id="updateByPrimaryKey" parameterType="com.minpay.db.table.model.DwFileDetail07">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.

src/main/webapp/admin/95598/reportManage95598.html

@@ -54,9 +54,13 @@
 			"<i class='iconfont up iconSelect_drop-down'/></i>");
 		$("#content").slideToggle();
 	});
+
 	var pageId = "260000";
 	// 终端投托运报表
 	var reportType = "95598YB";
+	var pageId = "240000";
+	// 终端投托运报表
+	var reportType = "FADZBB";f
 	
      var table;
      var form;
@@ -152,6 +156,7 @@
       function uploadExcel(){
     	  var openPageId = pageId + "-01";
     	  openMainTabPage(openPageId, "报表生成", "95598/reportProduce95598.html?pageId="+openPageId+"&reportType="+reportType, '', pageId, reloadSearch);
+    	  openMainTabPage(openPageId, "报表生成", "FA/reportProduceFA.html?pageId="+openPageId+"&reportType="+reportType, '', pageId, reloadSearch);
       }
       
       function showDetail(data){