Browse Source

Accept Merge Request #245 提交到测试环境 : (dev -> test)

Merge Request: 提交到测试环境
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/245
浅川 8 years ago
parent
commit
6fb695f73e

+ 1 - 1
generatorConfig.xml

@@ -8,6 +8,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="AFT" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="AFT" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="AFT" type="XMLMAPPER" />
-    <table schema="aft" tableName="branch_office_info"/>
+    <table schema="aft" tableName="marketing_management"/>
   </context>
 </generatorConfiguration>

+ 13 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -580,7 +580,19 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/member");
 		return modelview;
 	}
-
+	
+	/**
+	 *  营销管理
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@RequestMapping(value="/admin/marketing")
+	public ModelAndView marketing(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/admin/marketing");
+		return modelview;
+	}
+	
 	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
 		if (!banners.isEmpty()) {

+ 96 - 0
src/main/java/com/goafanti/common/dao/MarketingManagementMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.MarketingManagement;
+import com.goafanti.common.model.MarketingManagementExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface MarketingManagementMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    long countByExample(MarketingManagementExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    int deleteByExample(MarketingManagementExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    int insert(MarketingManagement record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    int insertSelective(MarketingManagement record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    List<MarketingManagement> selectByExample(MarketingManagementExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    MarketingManagement selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    int updateByExampleSelective(@Param("record") MarketingManagement record, @Param("example") MarketingManagementExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    int updateByExample(@Param("record") MarketingManagement record, @Param("example") MarketingManagementExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    int updateByPrimaryKeySelective(MarketingManagement record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    int updateByPrimaryKey(MarketingManagement record);
+}

+ 333 - 0
src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml

@@ -0,0 +1,333 @@
+<?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.goafanti.common.dao.MarketingManagementMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.MarketingManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="product_id" jdbcType="VARCHAR" property="productId" />
+    <result column="show_page" jdbcType="VARCHAR" property="showPage" />
+    <result column="cover_img" jdbcType="VARCHAR" property="coverImg" />
+    <result column="start_date" jdbcType="TIMESTAMP" property="startDate" />
+    <result column="end_date" jdbcType="TIMESTAMP" property="endDate" />
+    <result column="category" jdbcType="INTEGER" property="category" />
+    <result column="effective" jdbcType="INTEGER" property="effective" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    <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">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    <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">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    id, product_id, show_page, cover_img, start_date, end_date, category, effective
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.MarketingManagementExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from marketing_management
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from marketing_management
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    delete from marketing_management
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.MarketingManagementExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    delete from marketing_management
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.MarketingManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    insert into marketing_management (id, product_id, show_page, 
+      cover_img, start_date, end_date, 
+      category, effective)
+    values (#{id,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, #{showPage,jdbcType=VARCHAR}, 
+      #{coverImg,jdbcType=VARCHAR}, #{startDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, 
+      #{category,jdbcType=INTEGER}, #{effective,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.MarketingManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    insert into marketing_management
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="productId != null">
+        product_id,
+      </if>
+      <if test="showPage != null">
+        show_page,
+      </if>
+      <if test="coverImg != null">
+        cover_img,
+      </if>
+      <if test="startDate != null">
+        start_date,
+      </if>
+      <if test="endDate != null">
+        end_date,
+      </if>
+      <if test="category != null">
+        category,
+      </if>
+      <if test="effective != null">
+        effective,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="productId != null">
+        #{productId,jdbcType=VARCHAR},
+      </if>
+      <if test="showPage != null">
+        #{showPage,jdbcType=VARCHAR},
+      </if>
+      <if test="coverImg != null">
+        #{coverImg,jdbcType=VARCHAR},
+      </if>
+      <if test="startDate != null">
+        #{startDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endDate != null">
+        #{endDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="category != null">
+        #{category,jdbcType=INTEGER},
+      </if>
+      <if test="effective != null">
+        #{effective,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.MarketingManagementExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    select count(*) from marketing_management
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    update marketing_management
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productId != null">
+        product_id = #{record.productId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.showPage != null">
+        show_page = #{record.showPage,jdbcType=VARCHAR},
+      </if>
+      <if test="record.coverImg != null">
+        cover_img = #{record.coverImg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.startDate != null">
+        start_date = #{record.startDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.endDate != null">
+        end_date = #{record.endDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.category != null">
+        category = #{record.category,jdbcType=INTEGER},
+      </if>
+      <if test="record.effective != null">
+        effective = #{record.effective,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    update marketing_management
+    set id = #{record.id,jdbcType=VARCHAR},
+      product_id = #{record.productId,jdbcType=VARCHAR},
+      show_page = #{record.showPage,jdbcType=VARCHAR},
+      cover_img = #{record.coverImg,jdbcType=VARCHAR},
+      start_date = #{record.startDate,jdbcType=TIMESTAMP},
+      end_date = #{record.endDate,jdbcType=TIMESTAMP},
+      category = #{record.category,jdbcType=INTEGER},
+      effective = #{record.effective,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.MarketingManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    update marketing_management
+    <set>
+      <if test="productId != null">
+        product_id = #{productId,jdbcType=VARCHAR},
+      </if>
+      <if test="showPage != null">
+        show_page = #{showPage,jdbcType=VARCHAR},
+      </if>
+      <if test="coverImg != null">
+        cover_img = #{coverImg,jdbcType=VARCHAR},
+      </if>
+      <if test="startDate != null">
+        start_date = #{startDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endDate != null">
+        end_date = #{endDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="category != null">
+        category = #{category,jdbcType=INTEGER},
+      </if>
+      <if test="effective != null">
+        effective = #{effective,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.MarketingManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 26 14:34:04 CST 2017.
+    -->
+    update marketing_management
+    set product_id = #{productId,jdbcType=VARCHAR},
+      show_page = #{showPage,jdbcType=VARCHAR},
+      cover_img = #{coverImg,jdbcType=VARCHAR},
+      start_date = #{startDate,jdbcType=TIMESTAMP},
+      end_date = #{endDate,jdbcType=TIMESTAMP},
+      category = #{category,jdbcType=INTEGER},
+      effective = #{effective,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 269 - 0
src/main/java/com/goafanti/common/model/MarketingManagement.java

@@ -0,0 +1,269 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class MarketingManagement {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column marketing_management.id
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column marketing_management.product_id
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    private String productId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column marketing_management.show_page
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    private String showPage;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column marketing_management.cover_img
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    private String coverImg;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column marketing_management.start_date
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    private Date startDate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column marketing_management.end_date
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    private Date endDate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column marketing_management.category
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    private Integer category;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column marketing_management.effective
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    private Integer effective;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column marketing_management.id
+     *
+     * @return the value of marketing_management.id
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column marketing_management.id
+     *
+     * @param id the value for marketing_management.id
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column marketing_management.product_id
+     *
+     * @return the value of marketing_management.product_id
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public String getProductId() {
+        return productId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column marketing_management.product_id
+     *
+     * @param productId the value for marketing_management.product_id
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column marketing_management.show_page
+     *
+     * @return the value of marketing_management.show_page
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public String getShowPage() {
+        return showPage;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column marketing_management.show_page
+     *
+     * @param showPage the value for marketing_management.show_page
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void setShowPage(String showPage) {
+        this.showPage = showPage;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column marketing_management.cover_img
+     *
+     * @return the value of marketing_management.cover_img
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public String getCoverImg() {
+        return coverImg;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column marketing_management.cover_img
+     *
+     * @param coverImg the value for marketing_management.cover_img
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void setCoverImg(String coverImg) {
+        this.coverImg = coverImg;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column marketing_management.start_date
+     *
+     * @return the value of marketing_management.start_date
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column marketing_management.start_date
+     *
+     * @param startDate the value for marketing_management.start_date
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column marketing_management.end_date
+     *
+     * @return the value of marketing_management.end_date
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column marketing_management.end_date
+     *
+     * @param endDate the value for marketing_management.end_date
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column marketing_management.category
+     *
+     * @return the value of marketing_management.category
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public Integer getCategory() {
+        return category;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column marketing_management.category
+     *
+     * @param category the value for marketing_management.category
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void setCategory(Integer category) {
+        this.category = category;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column marketing_management.effective
+     *
+     * @return the value of marketing_management.effective
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public Integer getEffective() {
+        return effective;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column marketing_management.effective
+     *
+     * @param effective the value for marketing_management.effective
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void setEffective(Integer effective) {
+        this.effective = effective;
+    }
+}

+ 823 - 0
src/main/java/com/goafanti/common/model/MarketingManagementExample.java

@@ -0,0 +1,823 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MarketingManagementExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public MarketingManagementExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdIsNull() {
+            addCriterion("product_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdIsNotNull() {
+            addCriterion("product_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdEqualTo(String value) {
+            addCriterion("product_id =", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdNotEqualTo(String value) {
+            addCriterion("product_id <>", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdGreaterThan(String value) {
+            addCriterion("product_id >", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdGreaterThanOrEqualTo(String value) {
+            addCriterion("product_id >=", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdLessThan(String value) {
+            addCriterion("product_id <", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdLessThanOrEqualTo(String value) {
+            addCriterion("product_id <=", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdLike(String value) {
+            addCriterion("product_id like", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdNotLike(String value) {
+            addCriterion("product_id not like", value, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdIn(List<String> values) {
+            addCriterion("product_id in", values, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdNotIn(List<String> values) {
+            addCriterion("product_id not in", values, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdBetween(String value1, String value2) {
+            addCriterion("product_id between", value1, value2, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductIdNotBetween(String value1, String value2) {
+            addCriterion("product_id not between", value1, value2, "productId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageIsNull() {
+            addCriterion("show_page is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageIsNotNull() {
+            addCriterion("show_page is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageEqualTo(String value) {
+            addCriterion("show_page =", value, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageNotEqualTo(String value) {
+            addCriterion("show_page <>", value, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageGreaterThan(String value) {
+            addCriterion("show_page >", value, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageGreaterThanOrEqualTo(String value) {
+            addCriterion("show_page >=", value, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageLessThan(String value) {
+            addCriterion("show_page <", value, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageLessThanOrEqualTo(String value) {
+            addCriterion("show_page <=", value, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageLike(String value) {
+            addCriterion("show_page like", value, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageNotLike(String value) {
+            addCriterion("show_page not like", value, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageIn(List<String> values) {
+            addCriterion("show_page in", values, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageNotIn(List<String> values) {
+            addCriterion("show_page not in", values, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageBetween(String value1, String value2) {
+            addCriterion("show_page between", value1, value2, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowPageNotBetween(String value1, String value2) {
+            addCriterion("show_page not between", value1, value2, "showPage");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgIsNull() {
+            addCriterion("cover_img is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgIsNotNull() {
+            addCriterion("cover_img is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgEqualTo(String value) {
+            addCriterion("cover_img =", value, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgNotEqualTo(String value) {
+            addCriterion("cover_img <>", value, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgGreaterThan(String value) {
+            addCriterion("cover_img >", value, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgGreaterThanOrEqualTo(String value) {
+            addCriterion("cover_img >=", value, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgLessThan(String value) {
+            addCriterion("cover_img <", value, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgLessThanOrEqualTo(String value) {
+            addCriterion("cover_img <=", value, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgLike(String value) {
+            addCriterion("cover_img like", value, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgNotLike(String value) {
+            addCriterion("cover_img not like", value, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgIn(List<String> values) {
+            addCriterion("cover_img in", values, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgNotIn(List<String> values) {
+            addCriterion("cover_img not in", values, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgBetween(String value1, String value2) {
+            addCriterion("cover_img between", value1, value2, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverImgNotBetween(String value1, String value2) {
+            addCriterion("cover_img not between", value1, value2, "coverImg");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateIsNull() {
+            addCriterion("start_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateIsNotNull() {
+            addCriterion("start_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateEqualTo(Date value) {
+            addCriterion("start_date =", value, "startDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateNotEqualTo(Date value) {
+            addCriterion("start_date <>", value, "startDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateGreaterThan(Date value) {
+            addCriterion("start_date >", value, "startDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("start_date >=", value, "startDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateLessThan(Date value) {
+            addCriterion("start_date <", value, "startDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateLessThanOrEqualTo(Date value) {
+            addCriterion("start_date <=", value, "startDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateIn(List<Date> values) {
+            addCriterion("start_date in", values, "startDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateNotIn(List<Date> values) {
+            addCriterion("start_date not in", values, "startDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateBetween(Date value1, Date value2) {
+            addCriterion("start_date between", value1, value2, "startDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartDateNotBetween(Date value1, Date value2) {
+            addCriterion("start_date not between", value1, value2, "startDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateIsNull() {
+            addCriterion("end_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateIsNotNull() {
+            addCriterion("end_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateEqualTo(Date value) {
+            addCriterion("end_date =", value, "endDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateNotEqualTo(Date value) {
+            addCriterion("end_date <>", value, "endDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateGreaterThan(Date value) {
+            addCriterion("end_date >", value, "endDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("end_date >=", value, "endDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateLessThan(Date value) {
+            addCriterion("end_date <", value, "endDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateLessThanOrEqualTo(Date value) {
+            addCriterion("end_date <=", value, "endDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateIn(List<Date> values) {
+            addCriterion("end_date in", values, "endDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateNotIn(List<Date> values) {
+            addCriterion("end_date not in", values, "endDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateBetween(Date value1, Date value2) {
+            addCriterion("end_date between", value1, value2, "endDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndDateNotBetween(Date value1, Date value2) {
+            addCriterion("end_date not between", value1, value2, "endDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIsNull() {
+            addCriterion("category is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIsNotNull() {
+            addCriterion("category is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryEqualTo(Integer value) {
+            addCriterion("category =", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotEqualTo(Integer value) {
+            addCriterion("category <>", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryGreaterThan(Integer value) {
+            addCriterion("category >", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryGreaterThanOrEqualTo(Integer value) {
+            addCriterion("category >=", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryLessThan(Integer value) {
+            addCriterion("category <", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryLessThanOrEqualTo(Integer value) {
+            addCriterion("category <=", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIn(List<Integer> values) {
+            addCriterion("category in", values, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotIn(List<Integer> values) {
+            addCriterion("category not in", values, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryBetween(Integer value1, Integer value2) {
+            addCriterion("category between", value1, value2, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotBetween(Integer value1, Integer value2) {
+            addCriterion("category not between", value1, value2, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveIsNull() {
+            addCriterion("effective is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveIsNotNull() {
+            addCriterion("effective is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveEqualTo(Integer value) {
+            addCriterion("effective =", value, "effective");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveNotEqualTo(Integer value) {
+            addCriterion("effective <>", value, "effective");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveGreaterThan(Integer value) {
+            addCriterion("effective >", value, "effective");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveGreaterThanOrEqualTo(Integer value) {
+            addCriterion("effective >=", value, "effective");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveLessThan(Integer value) {
+            addCriterion("effective <", value, "effective");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveLessThanOrEqualTo(Integer value) {
+            addCriterion("effective <=", value, "effective");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveIn(List<Integer> values) {
+            addCriterion("effective in", values, "effective");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveNotIn(List<Integer> values) {
+            addCriterion("effective not in", values, "effective");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveBetween(Integer value1, Integer value2) {
+            addCriterion("effective between", value1, value2, "effective");
+            return (Criteria) this;
+        }
+
+        public Criteria andEffectiveNotBetween(Integer value1, Integer value2) {
+            addCriterion("effective not between", value1, value2, "effective");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table marketing_management
+     *
+     * @mbg.generated do_not_delete_during_merge Tue Sep 26 14:34:04 CST 2017
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table marketing_management
+     *
+     * @mbg.generated Tue Sep 26 14:34:04 CST 2017
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -55,7 +55,7 @@ app.name=AFT
 template.cacheable=false
 
 static.host=//sb.jishutao.com/1.0.44
-portal.host=//sf.jishutao.com/portal/2.0.1
+portal.host=//sf.jishutao.com/portal/2.0.2
 avatar.host=//sb.jishutao.com
 avatar.upload.host=//sb.jishutao.com/upload
 

+ 16 - 0
src/main/webapp/WEB-INF/views/admin/marketing.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>营销管理</title>
+	<link th:href="${staticHost+'/admin/marketing.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/marketing.js'}"></script>
+	</div>
+</body>
+</html>

+ 24 - 15
src/main/webapp/WEB-INF/views/common.html

@@ -24,6 +24,7 @@
   					<img th:src="${portalHost+'/img/Logo111.png'}" alt="" title="技淘"/>
   				</a>
   			</div>
+  			<div class="logo_right"></div>
   			<div class="nav">
   				<ul>
   					<li th:classappend="${mainM=='service'}? 'active'">
@@ -77,7 +78,7 @@
   					<img th:src="${portalHost+'/img/index_resiter.png'}" alt="" />
   				</a>
   				<a href="javascript:;"  class="head_login">登录</a>
-  				<a href="">关于我们</a>
+  				<a href="">关于我们</a><div></div>
   			</div>
   			<div class="nav_right" th:if="${isLogin}">
   				<a th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}" th:text="${userName}">个人中心</a>
@@ -181,22 +182,30 @@
 						<p>实名认证</p>
 					</a>
 				</li>
-				<li th:classappend="${!isLogin}? 'head_login'"><a href=""> <img
-						th:src="${portalHost+'/img/index_fix1.png'}" alt="" />
-						<p>发布需求</p>
-				</a></li>
-				<li th:if="${isLogin}"><a th:href="${basePath + '/user/account/demand.html#techDemand'}"> <img
-						th:src="${portalHost+'/img/index_fix1.png'}" alt="" />
+				<li th:if="${!isLogin}" class="head_login">
+						<a href=""> 
+							<img th:src="${portalHost+'/img/index_fix1.png'}" alt="" />
+							<p>发布需求</p>
+						</a>
+				</li>
+				<li th:if="${isLogin}">
+					<a th:href="${basePath + '/user/account/demand.html#techDemand'}"> 
+						<img th:src="${portalHost+'/img/index_fix1.png'}" alt="" />
 						<p>发布需求</p>
-				</a></li>
-				<li th:classappend="${!isLogin}? 'head_login'"><a href=""> <img
-						th:src="${portalHost+'/img/index_fix2.png'}" alt="" />
+					</a>
+				</li>
+				<li th:if="${!isLogin}" class="head_login">
+					<a href=""> 
+						<img th:src="${portalHost+'/img/index_fix2.png'}" alt="" />
 						<p>发布技术</p>
-				</a></li>
-				<li th:if="${isLogin}"><a th:href="${basePath + '/user/account/achievement.html#techAchievement'}"> <img
-						th:src="${portalHost+'/img/index_fix2.png'}" alt="" />
+					</a>
+				</li>
+				<li th:if="${isLogin}">
+					<a th:href="${basePath + '/user/account/achievement.html#techAchievement'}"> 
+						<img th:src="${portalHost+'/img/index_fix2.png'}" alt="" />
 						<p>发布技术</p>
-				</a></li>
+					</a>
+				</li>
 				<li><a onclick="_MEIQIA('showPanel')">
 						<img th:src="${portalHost+'/img/index_fix3.png'}" alt="" />
 						<p>联系客服</p>
@@ -227,7 +236,7 @@
 					<form id="form_login">
 						<div class="login_uesr">
 							<label for="uesname"><img th:src="${portalHost+'/img/login_use.png'}" /></label> <input
-								type="text" name="mobile" id="Lo_user" placeholder="用户名/邮箱/手机" /> <img
+								type="text" name="mobile" id="Lo_user" placeholder="请输入手机号码" /> <img
 								th:src="${portalHost+'/img/login_del.png'}" class="log_del" />
 						</div>
 						<div class="login_pass">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/financial/investmentDetail.html

@@ -83,7 +83,7 @@
         			</div>        			
         			<h4 th:text="${bo.companyName}"></h4>
         			<p>所在地:   <span th:text=${bo.companyLocation}></span></p>
-        			<a href="">在线咨询</a>       			
+        			<a onclick="_MEIQIA('showPanel')">在线咨询</a>       			
         		</div>
         		<div class="institutions_bottom">
         			<h4>相关机构</h4>

+ 5 - 5
src/main/webapp/WEB-INF/views/portal/service/propertyRight.html

@@ -139,7 +139,7 @@
   	</div>
   	<div class="container">
   		<div class="intellectual">
-  			<a href="">立即咨询</a>
+  			<a onclick="_MEIQIA('showPanel')">立即咨询</a>
   		</div>
   		<div class="intellectual_right">
   			<h4>知识产权贯标</h4>
@@ -148,15 +148,15 @@
   		</div>  		
   	</div>
   	<div class="process">
+  		<h5>专业服务流程</h5>
+  		<img th:src="${portalHost+'/img/property_10.png'}" alt="" />
   		<div class="container">
-  			<h5>专业服务流程</h5>
-  			<img th:src="${portalHost+'/img/property_10.jpg'}" alt="" />
   			<div class="advantage">
   				<h5>我们的服务优势</h5>
   				<ul>
   					<li>
   						<h6>专业强</h6>
-  						<p>16年专业服务经验,服务企业30000多家,获得国家技术转移示范机构等多项荣誉资质</p>
+  						<p>16年专业服务经验,服务企业30000多家,获得国家技术转移示范机构等多项荣誉资质</p>
   						<time>- <span>01</span> -</time>
   					</li>
   					<li>
@@ -166,7 +166,7 @@
   					</li>
   					<li>
   						<h6>一站式服务</h6>
-  						<p>专利申请、s授权、下证、缴费提醒全程提醒</p>
+  						<p>专利申请、授权、下证、缴费提醒全程提醒</p>
   						<time>- <span>03</span> -</time>
   					</li>
   					<li>

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html

@@ -51,7 +51,7 @@
 							<img th:src="${portalHost+'/img/tech_tr.png'}" alt=""/>
 							<img th:src="${portalHost+'/img/tech_trbs.png'}" alt=""/>
 						</span>
-						<h3>专业能力保障</h3>
+						<h3>专业能力保障</h3>
 						<p>专业优秀的服务团队,提供高效率、高质量的服务,加上系统的资料整理流程和模块,有效保证了高成功率。</p>
 					</div>
 					<div>
@@ -59,7 +59,7 @@
 							<img th:src="${portalHost+'/img/tech_th.png'}" alt=""/>
 							<img th:src="${portalHost+'/img/tech_tss.png'}" alt=""/>
 						</span>
-						<h3>专业跟踪服务</h3>
+						<h3>专业跟踪服务</h3>
 						<p>在规范的客户信息数据库基础上,对客户进行后期项目跟踪,进行后端信息资源对接,协助企业构建科技管理体系。
 						</p>
 					</div>

+ 20 - 18
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html

@@ -181,40 +181,42 @@
 	<div class="channel">
 		<div class="container">
 			<h5>业务速通</h5>
-			<ul>
-				<li th:classappend="${!isLogin}? 'head_login'">
+			<ul th:if="${!isLogin}">
+				<li class="head_login">
 					<a href=""> 
 						<p>发布技术</p>
 					</a>
 				</li>
-				<li th:if="${isLogin}">
-					<a th:href="${basePath + '/user/account/achievement.html#techAchievement'}">
-						<p>发布技术</p>
+				<li class="head_login">
+					<a href=""> 
+						<p>发布需求</p>
 					</a>
 				</li>
-				<li th:classappend="${!isLogin}? 'head_login'">
+				<li><a href="">技术评估</a></li>
+				<li class="head_login">
 					<a href=""> 
-						<p>发布需求</p>
+						<p>专利申请</p>
+					</a>
+				</li>
+				<li><a href="">专利征集</a></li>
+			</ul>
+			<ul th:if="${isLogin}">
+				<li>
+					<a th:href="${basePath + '/user/account/achievement.html#techAchievement'}">
+						<p>发布技术</p>
 					</a>
 				</li>
-				<li th:if="${isLogin}">
+				<li>
 					<a th:href="${basePath + '/user/account/demand.html#techDemand'}">
 						<p>发布需求</p>
 					</a>
-				</li>
-				
+				</li>				
 				<li><a href="">技术评估</a></li>
-				<li th:classappend="${!isLogin}? 'head_login'">
-					<a href=""> 
-						<p>>专利申请</p>
-					</a>
-				</li>
-				<li th:if="${isLogin}">
+				<li>
 					<a th:href="${basePath + '/user/account/services.html#patent'}">
-						<p>>专利申请</p>
+						<p>专利申请</p>
 					</a>
 				</li>
-				
 				<li><a href="">专利征集</a></li>
 			</ul>
 		</div>

+ 1 - 1
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -21,7 +21,7 @@
 					<div class="regist">
 						<div class="zhuce_input">
 							<img th:src="${portalHost+'/img/name.jpg'}" alt=""/>
-							<input type="text" name="userName" placeholder="用户名/邮箱/手机"  id="username"/>
+							<input type="text" name="userName" placeholder="请输入手机号码"  id="username"/>
 							<img th:src="${portalHost+'/img/login_del.png'}" class="log_del"/>
 						</div>
 						<div class="zhuce_input">