From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/help/HelpCenterMapper.xml |  250 +++++++++++++++++++++++++-------------------------
 1 files changed, 125 insertions(+), 125 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/help/HelpCenterMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/help/HelpCenterMapper.xml
index 78e974e..0c861bc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/help/HelpCenterMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/help/HelpCenterMapper.xml
@@ -1,125 +1,125 @@
-<?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.yeshi.fanli.dao.mybatis.help.HelpCenterMapper">
-  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.help.HelpCenter">
-    <id column="h_id" property="id" jdbcType="BIGINT"/>
-    <result column="h_title" property="title" jdbcType="VARCHAR"/>
-    <result column="h_weight" property="weight" jdbcType="INTEGER"/>
-    <result column="h_createtime" property="createtime" jdbcType="TIMESTAMP"/>
-    <result column="h_updatetime" property="updatetime" jdbcType="TIMESTAMP"/>
-    
-    <association property="helpClass" column="h_cid"
-			javaType="com.yeshi.fanli.entity.bus.help.HelpClass">
-			<id column="h_cid" property="id" jdbcType="BIGINT" />
-			<id column="hc_name" property="name" jdbcType="VARCHAR" />
-	</association>
-    
-  </resultMap>
-  <sql id="Base_Column_List">h_id,h_title,h_weight,h_cid,h_createtime,h_updatetime</sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
-    <include refid="Base_Column_List"/>from yeshi_ec_help_center where h_id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_help_center where h_id = #{id,jdbcType=BIGINT}</delete>
-  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_help_center (h_id,h_title,h_weight,h_cid,h_createtime,h_updatetime) values (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{weight,jdbcType=INTEGER},#{helpClass.id,jdbcType=BIGINT},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>
-  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_help_center
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">h_id,</if>
-      <if test="title != null">h_title,</if>
-      <if test="weight != null">h_weight,</if>
-      <if test="helpClass != null">h_cid,</if>
-      <if test="createtime != null">h_createtime,</if>
-      <if test="updatetime != null">h_updatetime,</if>
-    </trim>values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">#{id,jdbcType=BIGINT},</if>
-      <if test="title != null">#{title,jdbcType=VARCHAR},</if>
-      <if test="weight != null">#{weight,jdbcType=INTEGER},</if>
-      <if test="helpClass != null">#{helpClass.id,jdbcType=BIGINT},</if>
-      <if test="createtime != null">#{createtime,jdbcType=TIMESTAMP},</if>
-      <if test="updatetime != null">#{updatetime,jdbcType=TIMESTAMP},</if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter">update yeshi_ec_help_center set h_title = #{title,jdbcType=VARCHAR},h_weight = #{weight,jdbcType=INTEGER},h_cid = #{helpClass.id,jdbcType=BIGINT},h_createtime = #{createtime,jdbcType=TIMESTAMP},h_updatetime = #{updatetime,jdbcType=TIMESTAMP} where h_id = #{id,jdbcType=BIGINT}</update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter">update yeshi_ec_help_center
-    <set>
-      <if test="title != null">h_title=#{title,jdbcType=VARCHAR},</if>
-      <if test="weight != null">h_weight=#{weight,jdbcType=INTEGER},</if>
-      <if test="helpClass != null">h_cid=#{helpClass.id,jdbcType=BIGINT},</if>
-      <if test="createtime != null">h_createtime=#{createtime,jdbcType=TIMESTAMP},</if>
-      <if test="updatetime != null">h_updatetime=#{updatetime,jdbcType=TIMESTAMP},</if>
-    </set> where h_id = #{id,jdbcType=BIGINT}
-  </update>
-  
-   <select id="query" resultMap="BaseResultMap">
-    SELECT *  FROM yeshi_ec_help_center	 ht
-    LEFT JOIN  yeshi_ec_help_class hc ON ht.h_cid = hc.hc_id
-    	WHERE 	<![CDATA[1>0]]>
-	   <if test='key != null and key != ""'>
-	   	   AND ht.h_title like '%${key}%'
-	   </if>
-	   <if test='cid != null'>
-	   	   AND ht.h_cid = #{cid}
-	   </if>
-	   
-	   <if test='orderMode == 1'>
-	    	ORDER BY  ht.h_weight  DESC 
-	   </if>
-	   <if test='orderMode == 2'>
-	    	ORDER BY  ht.h_weight 
-	   </if>
-	  
-	   <if test='orderMode == 3'>
-	    	ORDER BY  ht.h_createtime  DESC 
-	   </if>
-	   
-	    <if test='orderMode == 4'>
-	    	ORDER BY ht.h_createtime
-	   </if>
-	   
-	    <if test='orderMode == 5'>
-	    	ORDER BY  ht.h_updatetime  DESC 
-	   </if>
-	   
-	    <if test='orderMode == 6'>
-	    	ORDER BY  ht.h_updatetime 
-	   </if>
-		LIMIT ${start},${count}
-   </select>
-
-   <select id="countQuery" resultType="java.lang.Long">
-    SELECT  count(h_id)  FROM yeshi_ec_help_center	
-    	WHERE 	<![CDATA[1>0]]>
-	   <if test='key != null and key != ""'>
-	   	   AND h_title like '%${key}%'
-	   </if>
-	   <if test='cid != null'>
-	   	   AND h_cid  = #{cid}
-	   </if>
-	</select>
-	
-	 <select id="queryIdAndTitle" resultMap="BaseResultMap">
-  	<!-- 鏍规嵁鏉′欢鏌ヨ鎵�鏈夋爣绛� -->
-    SELECT  h_id, h_title FROM yeshi_ec_help_center	
-    	WHERE 1=1
-	   <if test='key != null and key != ""'>
-	   	   AND h_title like '%${key}%'
-	   </if>
-	   <if test='cid != null'>
-	   	   AND h_cid  = #{cid}
-	   </if>
-	    ORDER BY  h_weight  DESC, h_createtime
-
-		LIMIT ${start},${count}
-   </select>
-	
-   <delete id="deleteBatchById" parameterType="int">
-		<!-- 鎵归噺鍒犻櫎  -->
-		delete from yeshi_ec_help_center where h_id in
-		<foreach item="item" collection="idList" open="(" separator=","
-			close=")">
-			#{item}
-		</foreach>
-	</delete>
-  
-</mapper>
+<?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.yeshi.fanli.dao.mybatis.help.HelpCenterMapper">
+  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.help.HelpCenter">
+    <id column="h_id" property="id" jdbcType="BIGINT"/>
+    <result column="h_title" property="title" jdbcType="VARCHAR"/>
+    <result column="h_weight" property="weight" jdbcType="INTEGER"/>
+    <result column="h_createtime" property="createtime" jdbcType="TIMESTAMP"/>
+    <result column="h_updatetime" property="updatetime" jdbcType="TIMESTAMP"/>
+    
+    <association property="helpClass" column="h_cid"
+			javaType="com.yeshi.fanli.entity.bus.help.HelpClass">
+			<id column="h_cid" property="id" jdbcType="BIGINT" />
+			<id column="hc_name" property="name" jdbcType="VARCHAR" />
+	</association>
+    
+  </resultMap>
+  <sql id="Base_Column_List">h_id,h_title,h_weight,h_cid,h_createtime,h_updatetime</sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+    <include refid="Base_Column_List"/>from yeshi_ec_help_center where h_id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_help_center where h_id = #{id,jdbcType=BIGINT}</delete>
+  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_help_center (h_id,h_title,h_weight,h_cid,h_createtime,h_updatetime) values (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{weight,jdbcType=INTEGER},#{helpClass.id,jdbcType=BIGINT},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>
+  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_help_center
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">h_id,</if>
+      <if test="title != null">h_title,</if>
+      <if test="weight != null">h_weight,</if>
+      <if test="helpClass != null">h_cid,</if>
+      <if test="createtime != null">h_createtime,</if>
+      <if test="updatetime != null">h_updatetime,</if>
+    </trim>values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">#{id,jdbcType=BIGINT},</if>
+      <if test="title != null">#{title,jdbcType=VARCHAR},</if>
+      <if test="weight != null">#{weight,jdbcType=INTEGER},</if>
+      <if test="helpClass != null">#{helpClass.id,jdbcType=BIGINT},</if>
+      <if test="createtime != null">#{createtime,jdbcType=TIMESTAMP},</if>
+      <if test="updatetime != null">#{updatetime,jdbcType=TIMESTAMP},</if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter">update yeshi_ec_help_center set h_title = #{title,jdbcType=VARCHAR},h_weight = #{weight,jdbcType=INTEGER},h_cid = #{helpClass.id,jdbcType=BIGINT},h_createtime = #{createtime,jdbcType=TIMESTAMP},h_updatetime = #{updatetime,jdbcType=TIMESTAMP} where h_id = #{id,jdbcType=BIGINT}</update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter">update yeshi_ec_help_center
+    <set>
+      <if test="title != null">h_title=#{title,jdbcType=VARCHAR},</if>
+      <if test="weight != null">h_weight=#{weight,jdbcType=INTEGER},</if>
+      <if test="helpClass != null">h_cid=#{helpClass.id,jdbcType=BIGINT},</if>
+      <if test="createtime != null">h_createtime=#{createtime,jdbcType=TIMESTAMP},</if>
+      <if test="updatetime != null">h_updatetime=#{updatetime,jdbcType=TIMESTAMP},</if>
+    </set> where h_id = #{id,jdbcType=BIGINT}
+  </update>
+  
+   <select id="query" resultMap="BaseResultMap">
+    SELECT *  FROM yeshi_ec_help_center	 ht
+    LEFT JOIN  yeshi_ec_help_class hc ON ht.h_cid = hc.hc_id
+    	WHERE 	<![CDATA[1>0]]>
+	   <if test='key != null and key != ""'>
+	   	   AND ht.h_title like '%${key}%'
+	   </if>
+	   <if test='cid != null'>
+	   	   AND ht.h_cid = #{cid}
+	   </if>
+	   
+	   <if test='orderMode == 1'>
+	    	ORDER BY  ht.h_weight  DESC 
+	   </if>
+	   <if test='orderMode == 2'>
+	    	ORDER BY  ht.h_weight 
+	   </if>
+	  
+	   <if test='orderMode == 3'>
+	    	ORDER BY  ht.h_createtime  DESC 
+	   </if>
+	   
+	    <if test='orderMode == 4'>
+	    	ORDER BY ht.h_createtime
+	   </if>
+	   
+	    <if test='orderMode == 5'>
+	    	ORDER BY  ht.h_updatetime  DESC 
+	   </if>
+	   
+	    <if test='orderMode == 6'>
+	    	ORDER BY  ht.h_updatetime 
+	   </if>
+		LIMIT ${start},${count}
+   </select>
+
+   <select id="countQuery" resultType="java.lang.Long">
+    SELECT  count(h_id)  FROM yeshi_ec_help_center	
+    	WHERE 	<![CDATA[1>0]]>
+	   <if test='key != null and key != ""'>
+	   	   AND h_title like '%${key}%'
+	   </if>
+	   <if test='cid != null'>
+	   	   AND h_cid  = #{cid}
+	   </if>
+	</select>
+	
+	 <select id="queryIdAndTitle" resultMap="BaseResultMap">
+  	<!-- 鏍规嵁鏉′欢鏌ヨ鎵�鏈夋爣绛� -->
+    SELECT  h_id, h_title FROM yeshi_ec_help_center	
+    	WHERE 1=1
+	   <if test='key != null and key != ""'>
+	   	   AND h_title like '%${key}%'
+	   </if>
+	   <if test='cid != null'>
+	   	   AND h_cid  = #{cid}
+	   </if>
+	    ORDER BY  h_weight  DESC, h_createtime
+
+		LIMIT ${start},${count}
+   </select>
+	
+   <delete id="deleteBatchById" parameterType="int">
+		<!-- 鎵归噺鍒犻櫎  -->
+		delete from yeshi_ec_help_center where h_id in
+		<foreach item="item" collection="idList" open="(" separator=","
+			close=")">
+			#{item}
+		</foreach>
+	</delete>
+  
+</mapper>

--
Gitblit v1.8.0