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/GoodsClassMapper.xml | 306 +++++++++++++++++++++++++-------------------------
1 files changed, 153 insertions(+), 153 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsClassMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsClassMapper.xml
index 37da2bc..68eb694 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsClassMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/GoodsClassMapper.xml
@@ -1,153 +1,153 @@
-<?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.GoodsClassMapper">
- <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.clazz.GoodsClass">
- <id column="id" property="id" jdbcType="BIGINT" />
- <result column="name" property="name" jdbcType="VARCHAR" />
- <result column="picture" property="picture" jdbcType="VARCHAR" />
- <result column="url" property="url" jdbcType="VARCHAR" />
- <result column="key" property="key" jdbcType="VARCHAR" />
- <result column="search_param" property="searchParam" jdbcType="VARCHAR" />
- <result column="orderby" property="orderby" jdbcType="INTEGER" />
- <result column="createtime" property="createtime" jdbcType="BIGINT" />
- <result column="ios_click" property="iosClick" jdbcType="BIGINT" />
- <result column="android_click" property="androidClick"
- jdbcType="BIGINT" />
- <result column="cs_state" property="state" jdbcType="INTEGER" />
- <result column="sex" property="sex" jdbcType="INTEGER" />
- </resultMap>
- <sql id="Base_Column_List">id,`name`,picture,`key`,search_param,orderby,createtime,ios_click,android_click,cs_state,sex
- </sql>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap"
- parameterType="java.lang.Long">select * from yeshi_ec_class where id =
- #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
- yeshi_ec_class where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsClass"
- useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_class
- (id,`name`,picture,url,`key`,search_param,orderby,createtime,ios_click,android_click,cs_state,sex)
- values
- (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{url,jdbcType=VARCHAR},#{key,jdbcType=VARCHAR},#{searchParam,jdbcType=VARCHAR},#{orderby,jdbcType=INTEGER},#{createtime,jdbcType=BIGINT},#{iosClick,jdbcType=BIGINT},#{androidClick,jdbcType=BIGINT},#{state,jdbcType=INTEGER},#{sex,jdbcType=INTEGER})
- </insert>
- <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsClass"
- useGeneratedKeys="true" keyProperty="id">
- insert into yeshi_ec_class
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="name != null">`name`,</if>
- <if test="picture != null">picture,</if>
- <if test="url != null">url,</if>
- <if test="key != null">`key`,</if>
- <if test="searchParam != null">search_param,</if>
- <if test="orderby != null">orderby,</if>
- <if test="createtime != null">createtime,</if>
- <if test="iosClick != null">ios_click,</if>
- <if test="androidClick != null">android_click,</if>
- <if test="state != null">cs_state,</if>
-
- <if test="sex != null">sex,</if>
- </trim>
- values
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="name != null">#{name,jdbcType=VARCHAR},</if>
- <if test="picture != null">#{picture,jdbcType=VARCHAR},</if>
- <if test="url != null">#{url,jdbcType=VARCHAR},</if>
- <if test="key != null">#{key,jdbcType=VARCHAR},</if>
- <if test="searchParam != null">#{searchParam,jdbcType=VARCHAR},</if>
- <if test="orderby != null">#{orderby,jdbcType=INTEGER},</if>
- <if test="createtime != null">#{createtime,jdbcType=BIGINT},</if>
- <if test="iosClick != null">#{iosClick,jdbcType=BIGINT},</if>
- <if test="androidClick != null">#{androidClick,jdbcType=BIGINT},</if>
- <if test="state != null">#{state,jdbcType=INTEGER},</if>
-
- <if test="sex != null">#{sex,jdbcType=INTEGER}</if>
- </trim>
- </insert>
- <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsClass">update
- yeshi_ec_class set `name` = #{name,jdbcType=VARCHAR},picture =
- #{picture,jdbcType=VARCHAR},url = #{url,jdbcType=VARCHAR},`key` =
- #{key,jdbcType=VARCHAR},search_param =
- #{searchParam,jdbcType=VARCHAR},orderby =
- #{orderby,jdbcType=INTEGER},createtime =
- #{createtime,jdbcType=BIGINT},ios_click =
- #{iosClick,jdbcType=BIGINT},android_click =
- #{androidClick,jdbcType=BIGINT},cs_state = #{state,jdbcType=INTEGER}
- ,sex =#{sex,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsClass">
- update yeshi_ec_class
- <set>
- <if test="name != null">`name`=#{name,jdbcType=VARCHAR},</if>
- <if test="picture != null">picture=#{picture,jdbcType=VARCHAR},</if>
- <if test="url != null">url=#{url,jdbcType=VARCHAR},</if>
- <if test="key != null">`key`=#{key,jdbcType=VARCHAR},</if>
- <if test="searchParam != null">search_param=#{searchParam,jdbcType=VARCHAR},</if>
- <if test="orderby != null">orderby=#{orderby,jdbcType=INTEGER},</if>
- <if test="createtime != null">createtime=#{createtime,jdbcType=BIGINT},</if>
- <if test="iosClick != null">ios_click=#{iosClick,jdbcType=BIGINT},</if>
- <if test="androidClick != null">android_click=#{androidClick,jdbcType=BIGINT},</if>
- <if test="state != null">cs_state=#{state,jdbcType=INTEGER},</if>
- <if test="sex !=null">sex =#{sex,jdbcType=INTEGER},</if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <select id="getKeysById" resultType="java.lang.String">SELECT ec.`key` FROM
- `yeshi_ec_class` ec WHERE ec.`id` = #{id};
- </select>
- <select id="listGoodsClassBySystemId" resultMap="BaseResultMap">SELECT
- c.id,c.name,c.picture,c.url FROM `yeshi_ec_class` c RIGHT JOIN
- `yeshi_ec_super_goodsclass` sp ON sp.`goodsclass_id` = c.`id` WHERE
- sp.`system_id` = #{systemId} ORDER BY c.`orderby`
- </select>
- <select id="getByAdjoinOrder" resultMap="BaseResultMap">
- SELECT
- <include refid="Base_Column_List" />
- FROM yeshi_ec_class fd WHERE 1=1
- <if test="type == -1">AND
- fd.`orderby` <![CDATA[<]]>
- #{order} ORDER BY fd.`orderby` desc
- </if>
- <if test="type == 1">AND
- fd.`orderby` <![CDATA[>]]>
- #{order} ORDER BY fd.`orderby`
- </if>
- LIMIT 1
- </select>
- <select id="getGoodsClassAll" resultMap="BaseResultMap">
- SELECT * FROM yeshi_ec_class c
- where 1=1
- <!-- 閫氱敤鐗� -->
- <if test="sex == 0">
- AND (c.`sex`= 120 OR c.`sex` = 0 OR c.`sex` = 10 OR c.`sex` = 20)
- </if>
- <!-- 濂崇増 -->
- <if test="sex == 1">
- AND (c.`sex`= 120 OR c.`sex` = 1 OR c.`sex` = 10 OR c.`sex` = 12)
- </if>
- <!-- 鐢风増 -->
- <if test="sex == 2">
- AND (c.`sex`= 120 OR c.`sex` = 2 OR c.`sex` = 20 OR c.`sex` = 12)
- </if>
- ORDER BY c.orderby
- </select>
- <select id="listByName" resultMap="BaseResultMap">SELECT * from yeshi_ec_class
- rs WHERE rs.name like '%#{name}%' LIMIT ${start},${count}</select>
- <select id="countByName" resultType="java.lang.Integer">
- SELECT IFNULL(COUNT(rs.id),0) FROM yeshi_ec_class rs
- <if test="systemId != null">RIGHT JOIN yeshi_ec_super_goodsclass sp ON
- sp.`goodsclass_id` = rs.`id`
- </if>
- WHERE rs.name LIKE '%#{name}%'
- <if test="systemId != null">AND sp.`system_id` = #{systemId}</if>
- </select>
- <select id="getMaxOrder" resultType="java.lang.Integer">SELECT
- IFNULL(MAX(orderby),0) FROM `yeshi_ec_class`
- </select>
- <select id="getEffectiveClass" resultMap="BaseResultMap">SELECT * FROM
- yeshi_ec_class rs WHERE rs.cs_state = 1 ORDER BY rs.`orderby`
- </select>
-</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.GoodsClassMapper">
+ <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.clazz.GoodsClass">
+ <id column="id" property="id" jdbcType="BIGINT" />
+ <result column="name" property="name" jdbcType="VARCHAR" />
+ <result column="picture" property="picture" jdbcType="VARCHAR" />
+ <result column="url" property="url" jdbcType="VARCHAR" />
+ <result column="key" property="key" jdbcType="VARCHAR" />
+ <result column="search_param" property="searchParam" jdbcType="VARCHAR" />
+ <result column="orderby" property="orderby" jdbcType="INTEGER" />
+ <result column="createtime" property="createtime" jdbcType="BIGINT" />
+ <result column="ios_click" property="iosClick" jdbcType="BIGINT" />
+ <result column="android_click" property="androidClick"
+ jdbcType="BIGINT" />
+ <result column="cs_state" property="state" jdbcType="INTEGER" />
+ <result column="sex" property="sex" jdbcType="INTEGER" />
+ </resultMap>
+ <sql id="Base_Column_List">id,`name`,picture,`key`,search_param,orderby,createtime,ios_click,android_click,cs_state,sex
+ </sql>
+ <select id="selectByPrimaryKey" resultMap="BaseResultMap"
+ parameterType="java.lang.Long">select * from yeshi_ec_class where id =
+ #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
+ yeshi_ec_class where id = #{id,jdbcType=BIGINT}
+ </delete>
+ <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsClass"
+ useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_class
+ (id,`name`,picture,url,`key`,search_param,orderby,createtime,ios_click,android_click,cs_state,sex)
+ values
+ (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{url,jdbcType=VARCHAR},#{key,jdbcType=VARCHAR},#{searchParam,jdbcType=VARCHAR},#{orderby,jdbcType=INTEGER},#{createtime,jdbcType=BIGINT},#{iosClick,jdbcType=BIGINT},#{androidClick,jdbcType=BIGINT},#{state,jdbcType=INTEGER},#{sex,jdbcType=INTEGER})
+ </insert>
+ <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsClass"
+ useGeneratedKeys="true" keyProperty="id">
+ insert into yeshi_ec_class
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="name != null">`name`,</if>
+ <if test="picture != null">picture,</if>
+ <if test="url != null">url,</if>
+ <if test="key != null">`key`,</if>
+ <if test="searchParam != null">search_param,</if>
+ <if test="orderby != null">orderby,</if>
+ <if test="createtime != null">createtime,</if>
+ <if test="iosClick != null">ios_click,</if>
+ <if test="androidClick != null">android_click,</if>
+ <if test="state != null">cs_state,</if>
+
+ <if test="sex != null">sex,</if>
+ </trim>
+ values
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="name != null">#{name,jdbcType=VARCHAR},</if>
+ <if test="picture != null">#{picture,jdbcType=VARCHAR},</if>
+ <if test="url != null">#{url,jdbcType=VARCHAR},</if>
+ <if test="key != null">#{key,jdbcType=VARCHAR},</if>
+ <if test="searchParam != null">#{searchParam,jdbcType=VARCHAR},</if>
+ <if test="orderby != null">#{orderby,jdbcType=INTEGER},</if>
+ <if test="createtime != null">#{createtime,jdbcType=BIGINT},</if>
+ <if test="iosClick != null">#{iosClick,jdbcType=BIGINT},</if>
+ <if test="androidClick != null">#{androidClick,jdbcType=BIGINT},</if>
+ <if test="state != null">#{state,jdbcType=INTEGER},</if>
+
+ <if test="sex != null">#{sex,jdbcType=INTEGER}</if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsClass">update
+ yeshi_ec_class set `name` = #{name,jdbcType=VARCHAR},picture =
+ #{picture,jdbcType=VARCHAR},url = #{url,jdbcType=VARCHAR},`key` =
+ #{key,jdbcType=VARCHAR},search_param =
+ #{searchParam,jdbcType=VARCHAR},orderby =
+ #{orderby,jdbcType=INTEGER},createtime =
+ #{createtime,jdbcType=BIGINT},ios_click =
+ #{iosClick,jdbcType=BIGINT},android_click =
+ #{androidClick,jdbcType=BIGINT},cs_state = #{state,jdbcType=INTEGER}
+ ,sex =#{sex,jdbcType=INTEGER} where id = #{id,jdbcType=BIGINT}
+ </update>
+ <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.clazz.GoodsClass">
+ update yeshi_ec_class
+ <set>
+ <if test="name != null">`name`=#{name,jdbcType=VARCHAR},</if>
+ <if test="picture != null">picture=#{picture,jdbcType=VARCHAR},</if>
+ <if test="url != null">url=#{url,jdbcType=VARCHAR},</if>
+ <if test="key != null">`key`=#{key,jdbcType=VARCHAR},</if>
+ <if test="searchParam != null">search_param=#{searchParam,jdbcType=VARCHAR},</if>
+ <if test="orderby != null">orderby=#{orderby,jdbcType=INTEGER},</if>
+ <if test="createtime != null">createtime=#{createtime,jdbcType=BIGINT},</if>
+ <if test="iosClick != null">ios_click=#{iosClick,jdbcType=BIGINT},</if>
+ <if test="androidClick != null">android_click=#{androidClick,jdbcType=BIGINT},</if>
+ <if test="state != null">cs_state=#{state,jdbcType=INTEGER},</if>
+ <if test="sex !=null">sex =#{sex,jdbcType=INTEGER},</if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+ <select id="getKeysById" resultType="java.lang.String">SELECT ec.`key` FROM
+ `yeshi_ec_class` ec WHERE ec.`id` = #{id};
+ </select>
+ <select id="listGoodsClassBySystemId" resultMap="BaseResultMap">SELECT
+ c.id,c.name,c.picture,c.url FROM `yeshi_ec_class` c RIGHT JOIN
+ `yeshi_ec_super_goodsclass` sp ON sp.`goodsclass_id` = c.`id` WHERE
+ sp.`system_id` = #{systemId} ORDER BY c.`orderby`
+ </select>
+ <select id="getByAdjoinOrder" resultMap="BaseResultMap">
+ SELECT
+ <include refid="Base_Column_List" />
+ FROM yeshi_ec_class fd WHERE 1=1
+ <if test="type == -1">AND
+ fd.`orderby` <![CDATA[<]]>
+ #{order} ORDER BY fd.`orderby` desc
+ </if>
+ <if test="type == 1">AND
+ fd.`orderby` <![CDATA[>]]>
+ #{order} ORDER BY fd.`orderby`
+ </if>
+ LIMIT 1
+ </select>
+ <select id="getGoodsClassAll" resultMap="BaseResultMap">
+ SELECT * FROM yeshi_ec_class c
+ where 1=1
+ <!-- 閫氱敤鐗� -->
+ <if test="sex == 0">
+ AND (c.`sex`= 120 OR c.`sex` = 0 OR c.`sex` = 10 OR c.`sex` = 20)
+ </if>
+ <!-- 濂崇増 -->
+ <if test="sex == 1">
+ AND (c.`sex`= 120 OR c.`sex` = 1 OR c.`sex` = 10 OR c.`sex` = 12)
+ </if>
+ <!-- 鐢风増 -->
+ <if test="sex == 2">
+ AND (c.`sex`= 120 OR c.`sex` = 2 OR c.`sex` = 20 OR c.`sex` = 12)
+ </if>
+ ORDER BY c.orderby
+ </select>
+ <select id="listByName" resultMap="BaseResultMap">SELECT * from yeshi_ec_class
+ rs WHERE rs.name like '%#{name}%' LIMIT ${start},${count}</select>
+ <select id="countByName" resultType="java.lang.Integer">
+ SELECT IFNULL(COUNT(rs.id),0) FROM yeshi_ec_class rs
+ <if test="systemId != null">RIGHT JOIN yeshi_ec_super_goodsclass sp ON
+ sp.`goodsclass_id` = rs.`id`
+ </if>
+ WHERE rs.name LIKE '%#{name}%'
+ <if test="systemId != null">AND sp.`system_id` = #{systemId}</if>
+ </select>
+ <select id="getMaxOrder" resultType="java.lang.Integer">SELECT
+ IFNULL(MAX(orderby),0) FROM `yeshi_ec_class`
+ </select>
+ <select id="getEffectiveClass" resultMap="BaseResultMap">SELECT * FROM
+ yeshi_ec_class rs WHERE rs.cs_state = 1 ORDER BY rs.`orderby`
+ </select>
+</mapper>
--
Gitblit v1.8.0