From 4597919ba0c3778cfbbae91b4ec3267d9a09e6a7 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 7 Mar 2018 18:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=A2=9E/=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=88=86=E7=B1=BB=E6=80=A7=E8=B4=A8?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/basics/ServiceDictInfoDao.xml |  28 +-
 .../dao/configuration/ServiceDictInfoDao.xml  | 303 ------------------
 2 files changed, 23 insertions(+), 308 deletions(-)
 delete mode 100644 src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml

diff --git a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
index fa5903350..d783f0415 100644
--- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
@@ -29,7 +29,15 @@
 		<result property="name" column="name"/>
 	    </association>
   </resultMap>
-  
+  <resultMap id="dictResultSimpleMap" type="com.nis.domain.basics.ServiceDictInfo" >
+    <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
+    <result column="item_type" property="itemType" jdbcType="INTEGER" />
+    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
+    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
+    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
+    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+  </resultMap>
     <sql id="serviceDictInfoColumns">
 		s.service_dict_id AS serviceDictId,
 		s.item_type AS itemType,
@@ -44,6 +52,16 @@
 		s.editor_id AS "serviceDictEditor.id",
 		s.edit_time AS editTime
 	</sql>
+    <sql id="serviceDictInfoColumnsSimple">
+		s.service_dict_id AS serviceDictId,
+		s.item_type AS itemType,
+		s.item_code AS itemCode,
+		s.item_value AS itemValue,
+		s.item_desc AS itemDesc,
+		s.parent_id AS "parent.serviceDictId",
+		s.is_leaf AS isLeaf,
+		s.is_valid AS isValid
+	</sql>
   
   
   
@@ -260,14 +278,14 @@
   UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId}
   </update>
   
-  <select id="findItemDict" resultMap="dictResultMap">
+  <select id="findItemDict" resultMap="dictResultSimpleMap">
    select 
-   <include refid="serviceDictInfoColumns" />
+   <include refid="serviceDictInfoColumnsSimple" />
    from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType} and s.is_valid=#{isValid};
    </select>
-  <select id="findAllItemDict" resultMap="dictResultMap">
+  <select id="findAllItemDict" resultMap="dictResultSimpleMap">
    select 
-   <include refid="serviceDictInfoColumns" />
+   <include refid="serviceDictInfoColumnsSimple" />
    from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType};
    </select>
    
diff --git a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml
deleted file mode 100644
index 2e20d46fd..000000000
--- a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml
+++ /dev/null
@@ -1,303 +0,0 @@
-<?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.nis.web.dao.configuration.ServiceDictInfoDao" >
-  
-  <resultMap id="dictResultMap" type="com.nis.domain.configuration.ServiceDictInfo" >
-    <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
-    <result column="item_type" property="itemType" jdbcType="INTEGER" />
-    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
-    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
-    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
-    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
-    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
-    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
-     <!-- 父id -->
-	    <association property="parent" javaType="com.nis.domain.configuration.ServiceDictInfo">
-	     <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
-	    <result column="item_type" property="itemType" jdbcType="INTEGER" />
-	    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
-	    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
-	    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
-	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
-	    </association>
-	 <!-- 创建人员 -->
-        <association property="serviceDictCreator" javaType="com.nis.domain.SysUser">
-	     <id property="id" column="id"/>
-		<result property="loginId" column="login_id"/>
-		<result property="name" column="name"/>
-	    </association>
-	 <!-- 修改人员 -->
-        <association property="serviceDictEditor" javaType="com.nis.domain.SysUser">
-	     <id property="id" column="id"/>
-		<result property="loginId" column="login_id"/>
-		<result property="name" column="name"/>
-	    </association>
-  </resultMap>
-  <resultMap id="dictResultSimpleMap" type="com.nis.domain.configuration.ServiceDictInfo" >
-	    <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
-	    <result column="item_type" property="itemType" jdbcType="INTEGER" />
-	    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
-	    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
-	    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
-	    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
-	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
-  </resultMap>
-    <sql id="serviceDictInfoColumns">
-		s.service_dict_id AS serviceDictId,
-		s.item_type AS itemType,
-		s.item_code AS itemCode,
-		s.item_value AS itemValue,
-		s.item_desc AS itemDesc,
-		s.parent_id AS "parent.serviceDictId",
-		s.is_leaf AS isLeaf,
-		s.is_valid AS isValid,
-		s.creator_id AS "serviceDictCreator.id",
-		s.create_time AS createTime,
-		s.editor_id AS "serviceDictEditor.id",
-		s.edit_time AS editTime
-	</sql>
-    <sql id="serviceDictInfoColumnsSimple">
-		s.service_dict_id AS serviceDictId,
-		s.item_type AS itemType,
-		s.item_code AS itemCode,
-		s.item_value AS itemValue,
-		s.item_desc AS itemDesc,
-		s.is_leaf AS isLeaf,
-		s.is_valid AS isValid
-	</sql>
-  
-  
-  
-  <!-- 查询顶层分页列表 (==)-->
-    <select id="findTopDictList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
-	SELECT * FROM service_dict_info WHERE  is_valid=1 AND parent_id = 0
-	
-	<if test="itemValue != null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
-    </if>
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
-    </if>
-    <if test="itemType != null and itemType != '' " >
-      AND item_type = #{itemType}
-    </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
-    </if> 
-    
-    <choose>
-		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-			ORDER BY ${page.orderBy}
-		</when>
-		<otherwise>
-			ORDER BY create_time desc
-		</otherwise>
-	</choose>
-    
-  </select>
-  
-   <!-- 查询顶层分页列表 (!=)-->
-<select id="findTopDictListN" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
-	SELECT * FROM service_dict_info WHERE  is_valid=1 AND parent_id = 0
-	
-	<if test="itemValue != null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
-    </if>
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
-    </if>
-    <if test="itemType != null and itemType != '' " >
-      AND item_type != #{itemType}
-    </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
-    </if> 
-    
-    <choose>
-		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-			ORDER BY ${page.orderBy}
-		</when>
-		<otherwise>
-			ORDER BY create_time desc
-		</otherwise>
-	</choose>
-    
-  </select>
-   
-  
-  
-  
-  
-  <!-- 查出所有 -->
-      <select id="findAllDictList" resultType="serviceDictInfo">
-		SELECT
-			<include refid="serviceDictInfoColumns"/>
-		FROM service_dict_info s
-		<include refid="menuJoins"/>
-		WHERE s.is_valid =1 
-	</select>
-
-	<!-- 查询所有非叶子配置 -->
-	<select id="findAllNoLeafDictList" resultType="com.nis.domain.configuration.ServiceDictInfo" parameterType="java.lang.Integer">
-	SELECT 
-	<include refid="serviceDictInfoColumns"/>
-	FROM service_dict_info s
-	WHERE s.is_valid = 1 AND s.is_leaf = 0 AND item_type = #{itemType}
-	</select>
-
-  
-    <!-- 条件查询分页(==) -->
-        <select id="findDictSearchList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
-	SELECT * FROM service_dict_info WHERE  is_valid=1  
-	
-	<if test="itemType != null and itemType != '' " >
-      AND item_type like '%${itemType}%'
-    </if>
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
-    </if>
-    <if test="itemValue!= null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
-    </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
-       
-    </if> 
-    
-    <choose>
-		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-			ORDER BY ${page.orderBy}
-		</when>
-		<otherwise>
-			ORDER BY create_time desc
-		</otherwise>
-	</choose>
-    
-  </select>
-  
-      <!-- 条件查询分页(!=) -->
-        <select id="findDictSearchListN" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
-	SELECT * FROM service_dict_info WHERE  is_valid=1  
-	
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
-    </if>
-    <if test="itemValue!= null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
-    </if>
-    <if test="itemType != null and itemType != '' " >
-      AND item_type != ${itemType}
-    </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
-       
-    </if> 
-    
-    <choose>
-		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-			ORDER BY ${page.orderBy}
-		</when>
-		<otherwise>
-			ORDER BY create_time desc
-		</otherwise>
-	</choose>
-    
-  </select>
-
-  
-  <!-- 根据主键查询字典详细信息 -->
-  
-  <select id="getDictById" resultType="com.nis.domain.configuration.ServiceDictInfo">
-  select 
-  <include refid="serviceDictInfoColumns"/>
-  from service_dict_info s where s.service_dict_id = #{serviceDictId}
-  </select>
-  
-    <!-- 根据上级id选出所有下级 -->
-  
-  <select id="getDictByParentId" resultMap="dictResultMap">
-  select *
-  from service_dict_info s where parent_id = #{parentId}
-  </select>
-  
-  
-    <!-- 根据itemCode查询字典对象列表 -->
-  
-  <select id="findByItemCode" resultType="com.nis.domain.configuration.ServiceDictInfo">
-  select 
-  <include refid="serviceDictInfoColumns"/>
-  from service_dict_info s where s.item_code = #{itemCode}
-  </select>
-  
-  
-  
-  <!-- 新增字典信息 -->
-  
-     <insert id="insertDict" parameterType="com.nis.domain.configuration.ServiceDictInfo" useGeneratedKeys="true" keyProperty="id" >
-    insert into service_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time)
-    values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER}, 
-             #{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, 
-             #{parent.serviceDictId,jdbcType=INTEGER}, #{isLeaf,jdbcType=INTEGER}, #{isValid,jdbcType=INTEGER}, 
-             #{serviceDictCreator.id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
-             #{serviceDictEditor.id,jdbcType=INTEGER}, #{editTime,jdbcType=TIMESTAMP})
-  </insert>
-  
-
-  
-  <!-- 修改 -->
-  	<update id="update">
-		UPDATE service_dict_info s SET 
-	    s.service_dict_id = #{serviceDictId},
-		s.item_type = #{itemType},
-		s.item_code = #{itemCode},
-		s.item_value = #{itemValue},
-		s.item_desc = #{itemDesc},
-		s.parent_id = #{parent.serviceDictId},
-		s.is_leaf = #{isLeaf},
-		s.creator_id = #{serviceDictCreator.id},
-		s.editor_id = #{serviceDictEditor.id},
-		s.edit_time = #{editTime}
-		WHERE s.service_dict_id = #{serviceDictId}
-	</update>
-  
-  <!-- 删除 -->
-  
-  <update id="delete">
-  UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId}
-  </update>
-  
-  <select id="findItemDict" resultMap="dictResultSimpleMap">
-   select 
-   <include refid="serviceDictInfoColumnsSimple" />
-   from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType} and s.is_valid=#{isValid};
-   </select>
-  <select id="findAllItemDict" resultMap="dictResultSimpleMap">
-   select 
-   <include refid="serviceDictInfoColumnsSimple" />
-   from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType};
-   </select>
-   
-   	<sql id="menuJoins">
-		LEFT JOIN service_dict_info p ON p.service_dict_id = s.parent_id
-    </sql>
-
-   
-   
-   
-   
-   
- 
-</mapper>
\ No newline at end of file