Просмотр исходного кода

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Conflicts:
	generatorConfig.xml
Michael лет назад: 8
Родитель
Сommit
f6bd076119
22 измененных файлов с 2228 добавлено и 32 удалено
  1. 1 1
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  2. 5 2
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  3. 98 0
      src/main/java/com/goafanti/admin/bo/BusinessVarietiesBo.java
  4. 89 0
      src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java
  5. 18 0
      src/main/java/com/goafanti/admin/service/AdminVarietiesService.java
  6. 0 11
      src/main/java/com/goafanti/admin/service/BusinessService.java
  7. 108 0
      src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java
  8. 16 0
      src/main/java/com/goafanti/common/dao/AdminVarietiesMapper.java
  9. 107 0
      src/main/java/com/goafanti/common/dao/BusinessVarietiesMapper.java
  10. 56 0
      src/main/java/com/goafanti/common/enums/AdminVarietiesStatus.java
  11. 7 2
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  12. 433 0
      src/main/java/com/goafanti/common/mapper/BusinessVarietiesMapper.xml
  13. 12 3
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  14. 24 0
      src/main/java/com/goafanti/common/model/AdminLocationBo.java
  15. 219 0
      src/main/java/com/goafanti/common/model/BusinessVarieties.java
  16. 963 0
      src/main/java/com/goafanti/common/model/BusinessVarietiesExample.java
  17. 14 1
      src/main/java/com/goafanti/common/model/Demand.java
  18. 11 0
      src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java
  19. 3 2
      src/main/java/com/goafanti/portal/controller/PortalSearchController.java
  20. 20 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  21. 16 10
      src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html
  22. 8 0
      src/test/java/com/goafanti/test/TestValueEvaluation.java

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -53,7 +53,7 @@ public interface AchievementService {
 
 	Pagination<AchievementSearchListBo> listAchievementSearchList(
 			String keyword,Integer dataCategory ,Integer category, Integer fieldA,String transferMode, Integer pageNo, Integer pageSize,
-			Integer timeSort,String upperPrice,String lowerPrice);
+			Integer timeSort,String upperPrice,String lowerPrice,Integer internationalFlag);
 
 	AchievementDetailBo selectAchievementSearchDetail(String uid, String id);
 	

+ 5 - 2
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -395,7 +395,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		List<AchievementKeyword> AchievementKeywordList = new ArrayList<>();
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
-		String techBrokerId = TokenManager.getAdminId();
+		String techBrokerId = TokenManager.hasRole(AFTConstants.TECHBROKER) ? TokenManager.getAdminId() : null;
 		for (AchievementImportBo bo : data) {
 			a = new Achievement();
 			BeanUtils.copyProperties(bo, a);
@@ -428,7 +428,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	public Pagination<AchievementSearchListBo> listAchievementSearchList(String keyword, Integer dataCategory,
 			Integer category, Integer fieldA, String transferMode, Integer pNo, Integer pSize, Integer dateSort,
-			String upperPrice, String lowerPrice) {
+			String upperPrice, String lowerPrice,Integer internationalFlag) {
 		Map<String, Object> params = new HashMap<>();
 		if (!StringUtils.isBlank(keyword)) {
 			params.put("keyword", keyword);
@@ -457,6 +457,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (lowerPrice != null) {
 			params.put("lowerPrice", lowerPrice);
 		}
+		if (null !=internationalFlag ) {
+			params.put("internationalFlag", internationalFlag);
+		}
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}

+ 98 - 0
src/main/java/com/goafanti/admin/bo/BusinessVarietiesBo.java

@@ -0,0 +1,98 @@
+package com.goafanti.admin.bo;
+
+
+import java.util.Date;
+
+public class BusinessVarietiesBo {
+	/*分类ID*/
+	private String id;
+	/*创建人*/
+	private String createId;
+	/*创建时间*/
+	private Date createTime;
+	/*更新时间*/
+	private Date updateTime;
+	/*删除标识*/
+	private Integer deleteSign;
+	/*分类编号*/
+	private String cid;
+	/*分类名称*/
+	private String cname;
+	/*父分类*/
+	private String superId;
+	/*分类层级*/
+	private Integer layer;
+	/*分类状态*/
+	private String status;
+	/*上级品类*/
+	private String superName;
+	public String getSuperName() {
+		return superName;
+	}
+	public void setSuperName(String superName) {
+		this.superName = superName;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getCreateId() {
+		return createId;
+	}
+	public void setCreateId(String createId) {
+		this.createId = createId;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	public Integer getDeleteSign() {
+		return deleteSign;
+	}
+	public void setDeleteSign(Integer deleteSign) {
+		this.deleteSign = deleteSign;
+	}
+	public String getCid() {
+		return cid;
+	}
+	public void setCid(String cid) {
+		this.cid = cid;
+	}
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	public String getSuperId() {
+		return superId;
+	}
+	public void setSuperId(String superId) {
+		this.superId = superId;
+	}
+	public Integer getLayer() {
+		return layer;
+	}
+	public void setLayer(Integer layer) {
+		this.layer = layer;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	
+	
+}
+

+ 89 - 0
src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java

@@ -0,0 +1,89 @@
+package com.goafanti.admin.controller;
+
+import javax.annotation.Resource;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+import com.goafanti.admin.service.AdminVarietiesService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.BusinessVarieties;
+import com.goafanti.common.utils.StringUtils;
+@RestController
+@RequestMapping("open/api/admin/Varieties")
+public class AdminVarietiesApiController extends BaseController{
+	@Resource
+	private AdminVarietiesService adminVarietiesService;
+	
+	/**
+	 * 新增品类
+	 */
+	@RequestMapping(value = "/addVarieties" , method = RequestMethod.GET)
+	public Result addVarieties(String cname,String superId) {
+		Result res=new Result();
+		if (StringUtils.isBlank(cname)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "登录帐号为空", "登录帐号"));
+			return res;
+		}
+		if (StringUtils.isBlank(superId)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "上级用户为空", "上级用户"));
+			return res;
+		}
+		res.setData(adminVarietiesService.insert(cname,superId));
+		
+		return res;
+		
+	}
+	/**
+	 * 搜索品类
+	 */
+	@RequestMapping(value="/vtList" ,method=RequestMethod.GET)
+	public Result vtList(String cname,String super_id,Integer layer,
+			String status,String pageNo, String pageSize) {
+		Result res = new Result();
+        Integer pNo = 1;
+        Integer pSize = 10;
+        if (StringUtils.isNumeric(pageSize)) {
+            pSize = Integer.parseInt(pageSize);
+        }
+        if (StringUtils.isNumeric(pageNo)) {
+            pNo = Integer.parseInt(pageNo);
+        }
+        res.setData(adminVarietiesService.listVarieties(cname, super_id, layer,
+        		status, pNo, pSize));
+		return res;
+	}
+	/**
+	 * 获取父类信息
+	 * 
+	 */
+	@RequestMapping(value = "/getSuperList" , method = RequestMethod.GET)
+	public Result getSuperList() {
+		Result res=new Result();
+		res.setData(adminVarietiesService.getSuperList());
+		return res;
+		
+	}
+	/**
+	 * 编辑品类
+	 */
+	@RequestMapping(value="/detailVarieties" ,method=RequestMethod.GET)
+	public Result detailVarieties(String  id) {
+		Result res = new Result();
+		res.setData(adminVarietiesService.editVarieties(id));
+		return res;
+	}
+	/*@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/editVarieties", method = RequestMethod.POST)
+	public Result editVarieties (@RequestParam(value = "roles[]", required = false) String[] roleIds,String data) {
+		
+	}*/
+
+}

+ 18 - 0
src/main/java/com/goafanti/admin/service/AdminVarietiesService.java

@@ -0,0 +1,18 @@
+package com.goafanti.admin.service;
+
+import java.util.List;
+
+import com.goafanti.admin.bo.BusinessVarietiesBo;
+import com.goafanti.core.mybatis.page.Pagination;
+
+public interface AdminVarietiesService {
+	
+	int insert(String cname, String superId);
+	
+	Pagination<BusinessVarietiesBo> listVarieties(String cname, String super_id, Integer layer, String status,
+			Integer pNo, Integer pSize);
+	
+	List<BusinessVarietiesBo> getSuperList();
+	
+	BusinessVarietiesBo editVarieties(String id);
+}

+ 0 - 11
src/main/java/com/goafanti/admin/service/BusinessService.java

@@ -1,11 +0,0 @@
-package com.goafanti.admin.service;
-
-
-
-import com.goafanti.admin.bo.BusinessBo;
-import com.goafanti.core.mybatis.page.Pagination;
-
-public interface BusinessService {
-	Pagination<BusinessBo> listBusiness(String cname,Integer super_id,Integer layer,
-			Integer status,Integer pNo,Integer pSize,Integer hot);
-}

+ 108 - 0
src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java

@@ -0,0 +1,108 @@
+package com.goafanti.admin.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.admin.bo.BusinessVarietiesBo;
+import com.goafanti.admin.service.AdminVarietiesService;
+import com.goafanti.common.dao.AdminVarietiesMapper;
+import com.goafanti.common.dao.BusinessVarietiesMapper;
+import com.goafanti.common.model.BusinessVarieties;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+
+@Service
+public class AdminVarietiesServiceImpl extends BaseMybatisDao<BusinessVarietiesMapper> implements AdminVarietiesService {
+	
+	@Autowired
+	private BusinessVarietiesMapper businessVarietiesMapper;
+	
+	public int insert(String cname, String superId) {
+		BusinessVarietiesBo buv=new BusinessVarietiesBo();
+		buv.setId(UUID.randomUUID().toString());
+		buv.setCname(cname);
+		buv.setSuperId(superId);
+		buv.setDeleteSign(0);
+		String str=businessVarietiesMapper.getCid(superId);
+		int i=Integer.valueOf(businessVarietiesMapper.getCount(superId));
+		if (3>=str.length()) {
+			 if(Integer.valueOf(i)<10){
+				buv.setCid("BZ0"+i);
+			}else {
+				buv.setCid("BZ"+i);
+			}
+		}else {
+			int w=i+1;
+			if(Integer.valueOf(i)<10){
+				buv.setCid(str+"0"+w);
+			}else {
+				buv.setCid(str+w);
+			}
+		}
+		buv.setLayer(str.length()/2-1);
+		buv.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");//测试
+		if (StringUtils.isNotBlank(TokenManager.getAdminId())) {
+			buv.setCreateId(TokenManager.getAdminId());
+		}
+		
+		
+		buv.setStatus("0");
+		BusinessVarieties bv=new BusinessVarieties();
+		BeanUtils.copyProperties(buv,bv);
+		return businessVarietiesMapper.insert(bv);
+		
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<BusinessVarietiesBo> listVarieties(String cname, String super_id, Integer layer, String status,
+			Integer pNo, Integer pSize) {
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		} 
+		return (Pagination<BusinessVarietiesBo>) findPage("findVarietiesListByPage", "findVarietiesListCount",
+				disposeParams(cname,super_id,layer,status),pNo,pSize);
+	}
+
+	private Map<String, Object> disposeParams(String cname, String super_name, Integer layer, String status) {
+		Map<String, Object> params = new HashMap<>();
+
+		if (null != cname) {
+			params.put("cname", cname);
+		}
+
+		if (null != super_name) {
+			params.put("super_name", super_name);
+		}
+
+		if (null != layer) {
+			params.put("layer", layer);
+		}
+		if (null != status) {
+			params.put("status", status);
+		}
+
+		
+		return params;
+	}
+	public List<BusinessVarietiesBo> getSuperList() {
+		
+		return businessVarietiesMapper.getSuperList();
+	}
+	@Override
+	public BusinessVarietiesBo editVarieties(String id) {
+		
+		return businessVarietiesMapper.editVarieties(id);
+	}
+}

+ 16 - 0
src/main/java/com/goafanti/common/dao/AdminVarietiesMapper.java

@@ -0,0 +1,16 @@
+package com.goafanti.common.dao;
+
+import java.util.List;
+
+import com.goafanti.admin.bo.BusinessVarietiesBo;
+import com.goafanti.common.model.BusinessVarieties;
+
+public interface AdminVarietiesMapper {
+   
+	Integer insert(BusinessVarieties bv);
+
+	
+
+   
+
+}

+ 107 - 0
src/main/java/com/goafanti/common/dao/BusinessVarietiesMapper.java

@@ -0,0 +1,107 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.admin.bo.BusinessVarietiesBo;
+import com.goafanti.common.model.BusinessVarieties;
+import com.goafanti.common.model.BusinessVarietiesExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessVarietiesMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    long countByExample(BusinessVarietiesExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    int deleteByExample(BusinessVarietiesExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    int insert(BusinessVarieties record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    int insertSelective(BusinessVarieties record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    List<BusinessVarieties> selectByExample(BusinessVarietiesExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    BusinessVarieties selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    int updateByExampleSelective(@Param("record") BusinessVarieties record, @Param("example") BusinessVarietiesExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    int updateByExample(@Param("record") BusinessVarieties record, @Param("example") BusinessVarietiesExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    int updateByPrimaryKeySelective(BusinessVarieties record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    int updateByPrimaryKey(BusinessVarieties record);
+    
+    String getCount(String superId);
+	
+	String getCid(String superId);
+	
+	List<BusinessVarietiesBo> getSuperList();
+	
+	BusinessVarietiesBo editVarieties(@Param("id")String id);
+    
+    
+}

+ 56 - 0
src/main/java/com/goafanti/common/enums/AdminVarietiesStatus.java

@@ -0,0 +1,56 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum AdminVarietiesStatus {
+	ONGOING(0,"正常"),
+	DISUSE(1,"停用");
+	
+	private AdminVarietiesStatus(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, AdminVarietiesStatus> status = new HashMap<Integer, AdminVarietiesStatus>();
+
+	static {
+		for (AdminVarietiesStatus value : AdminVarietiesStatus.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static AdminVarietiesStatus getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return DISUSE;
+	}
+
+	public static AdminVarietiesStatus getStatus(String code) {
+		if (StringUtils.isNumeric(code)) {
+			return getStatus(Integer.parseInt(code));
+		}
+		return DISUSE;
+	}
+
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+
+	private Integer	code;
+	private String	desc;
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}
+	
+

+ 7 - 2
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1195,7 +1195,9 @@
   	<if test="lowerPrice != null and lowerPrice != ''">
   		and a.transfer_price &gt; #{lowerPrice,jdbcType=VARCHAR}
   	</if> 	
-  	
+  	<if test="internationalFlag != null ">
+  		and a.international_flag = #{internationalFlag,jdbcType=INTEGER}
+  	</if>
   	and a.release_status = 1
   	and a.audit_status = 3 
   	<if test="dateSort == 0">
@@ -1234,7 +1236,10 @@
   	</if>
   	<if test="lowerPrice != null and lowerPrice != ''">
   		and a.transfer_price &gt; #{lowerPrice,jdbcType=VARCHAR}
-  	</if> 	
+  	</if> 
+  	<if test="internationalFlag != null ">
+  		and a.international_flag = #{internationalFlag,jdbcType=INTEGER}
+  	</if>	
   	
   	and a.release_status = 1
   	and a.audit_status = 3 

+ 433 - 0
src/main/java/com/goafanti/common/mapper/BusinessVarietiesMapper.xml

@@ -0,0 +1,433 @@
+<?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.BusinessVarietiesMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.BusinessVarieties">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 10:03:07 CST 2017.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="create_id" jdbcType="VARCHAR" property="createId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="delete_sign" jdbcType="INTEGER" property="deleteSign" />
+    <result column="cid" jdbcType="VARCHAR" property="cid" />
+    <result column="cname" jdbcType="VARCHAR" property="cname" />
+    <result column="super_id" jdbcType="VARCHAR" property="superId" />
+    <result column="layer" jdbcType="INTEGER" property="layer" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+  </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 Thu Nov 30 10:03:07 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 Thu Nov 30 10:03:07 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 Thu Nov 30 10:03:07 CST 2017.
+    -->
+    id, create_id, create_time, update_time, delete_sign, cid, cname, super_id, layer, 
+    status
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.BusinessVarietiesExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 10:03:07 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_varieties
+    <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 Thu Nov 30 10:03:07 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from business_varieties
+    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 Thu Nov 30 10:03:07 CST 2017.
+    -->
+    delete from business_varieties
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.BusinessVarietiesExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 10:03:07 CST 2017.
+    -->
+    delete from business_varieties
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.BusinessVarieties">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 10:03:07 CST 2017.
+    -->
+    insert into business_varieties (id, create_id, create_time, 
+      update_time, delete_sign, cid, 
+      cname, super_id, layer, 
+      status)
+    values (#{id,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR},now(), 
+      #{updateTime,jdbcType=TIMESTAMP}, #{deleteSign,jdbcType=INTEGER}, #{cid,jdbcType=VARCHAR}, 
+      #{cname,jdbcType=VARCHAR}, #{superId,jdbcType=VARCHAR}, #{layer,jdbcType=INTEGER}, 
+      #{status,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.BusinessVarieties">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 10:03:07 CST 2017.
+    -->
+    insert into business_varieties
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="deleteSign != null">
+        delete_sign,
+      </if>
+      <if test="cid != null">
+        cid,
+      </if>
+      <if test="cname != null">
+        cname,
+      </if>
+      <if test="superId != null">
+        super_id,
+      </if>
+      <if test="layer != null">
+        layer,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="createId != null">
+        #{createId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteSign != null">
+        #{deleteSign,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        #{cid,jdbcType=VARCHAR},
+      </if>
+      <if test="cname != null">
+        #{cname,jdbcType=VARCHAR},
+      </if>
+      <if test="superId != null">
+        #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="layer != null">
+        #{layer,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.BusinessVarietiesExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 10:03:07 CST 2017.
+    -->
+    select count(*) from business_varieties
+    <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 Thu Nov 30 10:03:07 CST 2017.
+    -->
+    update business_varieties
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.deleteSign != null">
+        delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      </if>
+      <if test="record.cid != null">
+        cid = #{record.cid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cname != null">
+        cname = #{record.cname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.superId != null">
+        super_id = #{record.superId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.layer != null">
+        layer = #{record.layer,jdbcType=INTEGER},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=VARCHAR},
+      </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 Thu Nov 30 10:03:07 CST 2017.
+    -->
+    update business_varieties
+    set id = #{record.id,jdbcType=VARCHAR},
+      create_id = #{record.createId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      cid = #{record.cid,jdbcType=VARCHAR},
+      cname = #{record.cname,jdbcType=VARCHAR},
+      super_id = #{record.superId,jdbcType=VARCHAR},
+      layer = #{record.layer,jdbcType=INTEGER},
+      status = #{record.status,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.BusinessVarieties">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 10:03:07 CST 2017.
+    -->
+    update business_varieties
+    <set>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteSign != null">
+        delete_sign = #{deleteSign,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        cid = #{cid,jdbcType=VARCHAR},
+      </if>
+      <if test="cname != null">
+        cname = #{cname,jdbcType=VARCHAR},
+      </if>
+      <if test="superId != null">
+        super_id = #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="layer != null">
+        layer = #{layer,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.BusinessVarieties">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 10:03:07 CST 2017.
+    -->
+    update business_varieties
+    set create_id = #{createId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      delete_sign = #{deleteSign,jdbcType=INTEGER},
+      cid = #{cid,jdbcType=VARCHAR},
+      cname = #{cname,jdbcType=VARCHAR},
+      super_id = #{superId,jdbcType=VARCHAR},
+      layer = #{layer,jdbcType=INTEGER},
+      status = #{status,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="getCount" resultType="string">
+  	select count(1) from business_varieties
+  	where super_id=#{superId,jdbcType=VARCHAR} 
+  	</select>
+  	
+  	<select id="getCid" resultType="string">
+  	select cid from business_varieties
+  	where id=#{ superId,jdbcType=VARCHAR} 
+  	</select>
+  	
+  	<select id="findVarietiesListByPage" resultType="com.goafanti.admin.bo.BusinessVarietiesBo">
+ 		select b.id,b.create_id,b.create_time,b.update_time,b.delete_sign,
+  				b.cid,b.cname,b.super_id,b.layer,b.status
+  		from business_varieties b
+  		where b.delete_sign=0 
+  		<if test="cname != null">
+		and cname = #{cname,jdbcType=VARCHAR}
+		</if>
+		<if test="super_id != null">
+		and super_id = #{super_id,jdbcType=VARCHAR}
+		</if>
+		<if test="layer != null">
+		and layer = #{layer,jdbcType=INTEGER}
+		</if>
+		<if test="status != null">
+		and status = #{status,jdbcType=VARCHAR}
+		</if>
+		<if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
+  <select id="findVarietiesListCount" resultType="com.goafanti.admin.bo.BusinessVarietiesBo">
+ 		select 
+  			count(1)
+  		from business_varieties b
+  		where b.delete_sign=0 
+  		<if test="cname != null">
+		and b.cname = #{cname,jdbcType=VARCHAR}
+		</if>
+		<if test="super_id != null">
+		and b.super_id = #{super_id,jdbcType=VARCHAR}
+		</if>
+		<if test="layer != null">
+		and b.layer = #{layer,jdbcType=INTEGER}
+		</if>
+		<if test="status != null">
+		and b.status = #{status,jdbcType=VARCHAR}
+		</if>
+		
+  </select>
+  
+  <select id="getSuperList"  resultType="com.goafanti.admin.bo.BusinessVarietiesBo">
+  		select b.id,b.create_id,b.create_time,b.update_time,b.delete_sign,
+  				b.cid,b.cname,b.super_id,b.layer,b.status
+  		from business_varieties b
+  		where b.delete_sign=0
+  </select>
+  <select id="editVarieties" parameterType="string" resultType="com.goafanti.admin.bo.BusinessVarietiesBo">
+  		select b.id,b.create_id,b.create_time,b.update_time,b.delete_sign,
+  				b.cid,b.cname,b.super_id,b.layer,b.status
+  		from business_varieties b
+  		where b.delete_sign=0
+  		<if test="id != null">
+		and b.id = #{id,jdbcType=VARCHAR}
+	</if>
+  </select>
+</mapper>

+ 12 - 3
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -73,7 +73,7 @@
       employer_address, employer_contacts, employer_contacts_mobile, 
       employer_contacts_mailbox, contacts, status, 
       release_status, release_date, create_time, 
-      principal_id, deleted_sign, audit_status, tech_broker_id,boutique)
+      principal_id, deleted_sign, audit_status, tech_broker_id,boutique,remark)
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{infoSources,jdbcType=INTEGER}, 
       #{industryCategoryA,jdbcType=INTEGER}, #{industryCategoryB,jdbcType=INTEGER}, #{industryCategoryC,jdbcType=INTEGER}, 
@@ -86,7 +86,7 @@
       #{employerContactsMailbox,jdbcType=VARCHAR}, #{contacts,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
       #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, 
       #{principalId,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER},
-      #{techBrokerId,jdbcType=VARCHAR},#{boutique,jdbcType=INTEGER})
+      #{techBrokerId,jdbcType=VARCHAR},#{boutique,jdbcType=INTEGER},#{remark,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Demand" >
     insert into demand
@@ -205,6 +205,9 @@
       <if test="boutique != null" >
         boutique,
       </if>
+      <if test="remark != null" >
+        remark,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -321,6 +324,9 @@
       <if test="boutique != null" >
         #{boutique,jdbcType=INTEGER},
       </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Demand" >
@@ -437,6 +443,9 @@
       <if test="boutique != null">
       	boutique = #{boutique,jdbcType=INTEGER},
       </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -880,7 +889,7 @@
   		d.budget_cost as budgetCost, d.fixed_cycle as fixedCycle, d.people_number as peopleNumber,
   		d.fixed_scheme as fixedScheme, d.cost_escrow as costEscrow, d.employer_id as employerId,
   		oi.postal_address as address, u.email as mailbox,  d.contacts, d.audit_status as auditStatus,
-  		d.tech_broker_id as techBrokerId,
+  		d.tech_broker_id as techBrokerId,d.remark
   		d.employer_address as employerAddress, d.employer_contacts_mobile as employerContactsMobile,
   		d.employer_contacts_mailbox as employerContactsMailbox, d.employer_name as employerName,
   		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg

+ 24 - 0
src/main/java/com/goafanti/common/model/AdminLocationBo.java

@@ -0,0 +1,24 @@
+package com.goafanti.common.model;
+
+public class AdminLocationBo {
+	private Integer	province;
+
+	private String	city;
+
+	public Integer getProvince() {
+		return province;
+	}
+
+	public void setProvince(Integer province) {
+		this.province = province;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+}

+ 219 - 0
src/main/java/com/goafanti/common/model/BusinessVarieties.java

@@ -0,0 +1,219 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class BusinessVarieties {
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.create_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private String createId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.create_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.update_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private Date updateTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.delete_sign
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private Integer deleteSign;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.cid
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private String cid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.cname
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private String cname;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.super_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private String superId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.layer
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private Integer layer;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.status
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	private String status;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.id
+	 * @return  the value of business_varieties.id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public String getId() {
+		return id;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.id
+	 * @param id  the value for business_varieties.id
+	 * @mbg.generated  Thu Nov 30 10:03:07 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 business_varieties.create_id
+	 * @return  the value of business_varieties.create_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public String getCreateId() {
+		return createId;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.create_id
+	 * @param createId  the value for business_varieties.create_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setCreateId(String createId) {
+		this.createId = createId;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.create_time
+	 * @return  the value of business_varieties.create_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.create_time
+	 * @param createTime  the value for business_varieties.create_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.update_time
+	 * @return  the value of business_varieties.update_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.update_time
+	 * @param updateTime  the value for business_varieties.update_time
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.delete_sign
+	 * @return  the value of business_varieties.delete_sign
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public Integer getDeleteSign() {
+		return deleteSign;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.delete_sign
+	 * @param deleteSign  the value for business_varieties.delete_sign
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setDeleteSign(Integer deleteSign) {
+		this.deleteSign = deleteSign;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.cid
+	 * @return  the value of business_varieties.cid
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public String getCid() {
+		return cid;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.cid
+	 * @param cid  the value for business_varieties.cid
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setCid(String cid) {
+		this.cid = cid;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.cname
+	 * @return  the value of business_varieties.cname
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public String getCname() {
+		return cname;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.cname
+	 * @param cname  the value for business_varieties.cname
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.super_id
+	 * @return  the value of business_varieties.super_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public String getSuperId() {
+		return superId;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.super_id
+	 * @param superId  the value for business_varieties.super_id
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setSuperId(String superId) {
+		this.superId = superId;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.layer
+	 * @return  the value of business_varieties.layer
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public Integer getLayer() {
+		return layer;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.layer
+	 * @param layer  the value for business_varieties.layer
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setLayer(Integer layer) {
+		this.layer = layer;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.status
+	 * @return  the value of business_varieties.status
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public String getStatus() {
+		return status;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.status
+	 * @param status  the value for business_varieties.status
+	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 */
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	
+}
+

+ 963 - 0
src/main/java/com/goafanti/common/model/BusinessVarietiesExample.java

@@ -0,0 +1,963 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BusinessVarietiesExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    public BusinessVarietiesExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 CST 2017
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 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 business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 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 business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 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 business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 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 business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 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 andCreateIdIsNull() {
+            addCriterion("create_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNotNull() {
+            addCriterion("create_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdEqualTo(String value) {
+            addCriterion("create_id =", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotEqualTo(String value) {
+            addCriterion("create_id <>", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThan(String value) {
+            addCriterion("create_id >", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThanOrEqualTo(String value) {
+            addCriterion("create_id >=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThan(String value) {
+            addCriterion("create_id <", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThanOrEqualTo(String value) {
+            addCriterion("create_id <=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLike(String value) {
+            addCriterion("create_id like", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotLike(String value) {
+            addCriterion("create_id not like", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIn(List<String> values) {
+            addCriterion("create_id in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotIn(List<String> values) {
+            addCriterion("create_id not in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdBetween(String value1, String value2) {
+            addCriterion("create_id between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotBetween(String value1, String value2) {
+            addCriterion("create_id not between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignIsNull() {
+            addCriterion("delete_sign is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignIsNotNull() {
+            addCriterion("delete_sign is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignEqualTo(Integer value) {
+            addCriterion("delete_sign =", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignNotEqualTo(Integer value) {
+            addCriterion("delete_sign <>", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignGreaterThan(Integer value) {
+            addCriterion("delete_sign >", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignGreaterThanOrEqualTo(Integer value) {
+            addCriterion("delete_sign >=", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignLessThan(Integer value) {
+            addCriterion("delete_sign <", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignLessThanOrEqualTo(Integer value) {
+            addCriterion("delete_sign <=", value, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignIn(List<Integer> values) {
+            addCriterion("delete_sign in", values, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignNotIn(List<Integer> values) {
+            addCriterion("delete_sign not in", values, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignBetween(Integer value1, Integer value2) {
+            addCriterion("delete_sign between", value1, value2, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteSignNotBetween(Integer value1, Integer value2) {
+            addCriterion("delete_sign not between", value1, value2, "deleteSign");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidIsNull() {
+            addCriterion("cid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidIsNotNull() {
+            addCriterion("cid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidEqualTo(String value) {
+            addCriterion("cid =", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidNotEqualTo(String value) {
+            addCriterion("cid <>", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidGreaterThan(String value) {
+            addCriterion("cid >", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidGreaterThanOrEqualTo(String value) {
+            addCriterion("cid >=", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidLessThan(String value) {
+            addCriterion("cid <", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidLessThanOrEqualTo(String value) {
+            addCriterion("cid <=", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidLike(String value) {
+            addCriterion("cid like", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidNotLike(String value) {
+            addCriterion("cid not like", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidIn(List<String> values) {
+            addCriterion("cid in", values, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidNotIn(List<String> values) {
+            addCriterion("cid not in", values, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidBetween(String value1, String value2) {
+            addCriterion("cid between", value1, value2, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidNotBetween(String value1, String value2) {
+            addCriterion("cid not between", value1, value2, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameIsNull() {
+            addCriterion("cname is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameIsNotNull() {
+            addCriterion("cname is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameEqualTo(String value) {
+            addCriterion("cname =", value, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameNotEqualTo(String value) {
+            addCriterion("cname <>", value, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameGreaterThan(String value) {
+            addCriterion("cname >", value, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameGreaterThanOrEqualTo(String value) {
+            addCriterion("cname >=", value, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameLessThan(String value) {
+            addCriterion("cname <", value, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameLessThanOrEqualTo(String value) {
+            addCriterion("cname <=", value, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameLike(String value) {
+            addCriterion("cname like", value, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameNotLike(String value) {
+            addCriterion("cname not like", value, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameIn(List<String> values) {
+            addCriterion("cname in", values, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameNotIn(List<String> values) {
+            addCriterion("cname not in", values, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameBetween(String value1, String value2) {
+            addCriterion("cname between", value1, value2, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCnameNotBetween(String value1, String value2) {
+            addCriterion("cname not between", value1, value2, "cname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdIsNull() {
+            addCriterion("super_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdIsNotNull() {
+            addCriterion("super_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdEqualTo(String value) {
+            addCriterion("super_id =", value, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdNotEqualTo(String value) {
+            addCriterion("super_id <>", value, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdGreaterThan(String value) {
+            addCriterion("super_id >", value, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdGreaterThanOrEqualTo(String value) {
+            addCriterion("super_id >=", value, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdLessThan(String value) {
+            addCriterion("super_id <", value, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdLessThanOrEqualTo(String value) {
+            addCriterion("super_id <=", value, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdLike(String value) {
+            addCriterion("super_id like", value, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdNotLike(String value) {
+            addCriterion("super_id not like", value, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdIn(List<String> values) {
+            addCriterion("super_id in", values, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdNotIn(List<String> values) {
+            addCriterion("super_id not in", values, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdBetween(String value1, String value2) {
+            addCriterion("super_id between", value1, value2, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuperIdNotBetween(String value1, String value2) {
+            addCriterion("super_id not between", value1, value2, "superId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerIsNull() {
+            addCriterion("layer is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerIsNotNull() {
+            addCriterion("layer is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerEqualTo(Integer value) {
+            addCriterion("layer =", value, "layer");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerNotEqualTo(Integer value) {
+            addCriterion("layer <>", value, "layer");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerGreaterThan(Integer value) {
+            addCriterion("layer >", value, "layer");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerGreaterThanOrEqualTo(Integer value) {
+            addCriterion("layer >=", value, "layer");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerLessThan(Integer value) {
+            addCriterion("layer <", value, "layer");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerLessThanOrEqualTo(Integer value) {
+            addCriterion("layer <=", value, "layer");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerIn(List<Integer> values) {
+            addCriterion("layer in", values, "layer");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerNotIn(List<Integer> values) {
+            addCriterion("layer not in", values, "layer");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerBetween(Integer value1, Integer value2) {
+            addCriterion("layer between", value1, value2, "layer");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerNotBetween(Integer value1, Integer value2) {
+            addCriterion("layer not between", value1, value2, "layer");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("status like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("status not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table business_varieties
+     *
+     * @mbg.generated do_not_delete_during_merge Thu Nov 30 10:03:07 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 business_varieties
+     *
+     * @mbg.generated Thu Nov 30 10:03:07 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);
+        }
+    }
+}

+ 14 - 1
src/main/java/com/goafanti/common/model/Demand.java

@@ -199,8 +199,21 @@ public class Demand {
      * 技术经纪人ID
      */
     private String techBrokerId;
+    
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
 
-    public String getId() {
+	public String getId() {
         return id;
     }
 

+ 11 - 0
src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java

@@ -105,6 +105,9 @@ public class AchievementSearchListBo {
 	/** 行业分类 **/
 	private String 		fieldAs;
 	
+	/** 是否国际*/
+	private Integer internationalFlag;
+	
 	public Integer getLevel() {
 		return level;
 	}
@@ -285,5 +288,13 @@ public class AchievementSearchListBo {
 	public void setFieldAs(String fieldAs) {
 		this.fieldAs = fieldAs;
 	}
+
+	public Integer getInternationalFlag() {
+		return internationalFlag;
+	}
+
+	public void setInternationalFlag(Integer internationalFlag) {
+		this.internationalFlag = internationalFlag;
+	}
 	
 }

+ 3 - 2
src/main/java/com/goafanti/portal/controller/PortalSearchController.java

@@ -43,7 +43,8 @@ public class PortalSearchController extends BaseController {
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
 	public Result achievementSearchList(  String keyword,Integer dataCategory,Integer category,
-			Integer fieldA, String pageNo, String pageSize,String transferMode, Integer dateSort,String upperPrice,String lowerPrice) {
+			Integer fieldA, String pageNo, String pageSize,String transferMode, Integer dateSort,String upperPrice,String lowerPrice,
+			Integer internationalFlag) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 20;
@@ -65,7 +66,7 @@ public class PortalSearchController extends BaseController {
 		}
 		
 		Pagination<AchievementSearchListBo> achievementSearchList = achievementService.listAchievementSearchList( 
-				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice);
+				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice,internationalFlag);
 		
 		
 		List<AchievementSearchListBo> list = (List<AchievementSearchListBo>) achievementSearchList.getList();

+ 20 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -92,6 +92,26 @@
 					</div>
 					<div class="search-criteria row">
 						<div class="search-title col-md-1">
+							<span>是否国际</span>
+						</div>
+						<div class="search-select col-md-11">
+							<ul id="selectInt">
+								<li class="active"><span>不限</span></li>
+								<li>
+									<label for="isInt" class="demand">
+										是<input type="checkbox" name="Int" id="isInt" value="1" />
+									</label>
+								</li>
+								<li>
+									<label for="noInt" class="demand">
+										否<input type="checkbox" name="Int" id="noInt" value="0" />
+									</label>
+								</li>
+							</ul>
+						</div>
+					</div>
+					<div class="search-criteria row">
+						<div class="search-title col-md-1">
 							<span>交易方式</span>
 						</div>
 						<div class="search-select col-md-6">

+ 16 - 10
src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html

@@ -35,25 +35,32 @@
   			<ul>
   				<li>
   					<div>
-  						<img th:src="${portalHost + '/img/assessMent_01.png'}" alt="" class="people"/><span>项目服务</span>
+  						<img th:src="${portalHost + '/img/assessMent_01.png'}" alt="" class="people"/><span>评估流程</span>
   						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line"/>
   					</div>
   				</li>
   				<li>
   					<div>
-  						<img th:src="${portalHost + '/img/assessMent_02.png'}" alt=""  class="people"/><span>政策法规</span>
+  						<a href="#services">
+  							<img th:src="${portalHost + '/img/assessMent_02.png'}" alt=""  class="people"/><span>服务项目</span>
+  						</a>
   						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line"/>
   					</div>
   				</li>
   				<li>
   					<div>
-  						<img th:src="${portalHost + '/img/assessMent_03.png'}" alt="" class="people"/><span>为何选我</span>
+  						<a href="#policies">
+  							<img th:src="${portalHost + '/img/assessMent_03.png'}" alt="" class="people"/><span>政策法规</span>
+  						</a>
   						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line" />
   					</div>
   				</li>
   				<li>
   					<div>
-  						<img th:src="${portalHost + '/img/assessMent_04.png'}" alt=""  class="people"/><span>服务案例</span>
+  						<a href="#advantages">
+  							<img th:src="${portalHost + '/img/assessMent_04.png'}" alt=""  class="people"/><span>我们的优势</span>
+  						</a>
+  						
   					</div>
   				</li>
   			</ul>
@@ -134,7 +141,7 @@
   			<a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
   		</div>
   	</div>
-  	<div class="services">
+  	<div class="services" id="services">
   		<div>
   			<div class="services_left">
 	  			<div>
@@ -210,7 +217,7 @@
   		</div>
   		
   	</div>
-  	<div class="policies">
+  	<div class="policies" id="policies">
   		<div class="policies_title">
   			
   		</div>
@@ -233,7 +240,6 @@
   			</div>
   		</div>
   		<div class="policies_bot">
-  		
   			<a th:if="${#lists.size(zcfg) ge 2}" th:href="@{/portal/news/newsDetail(id=${zcfg[1].id})}" >
   			<div  class="bot" >
   				<h5 th:text=${zcfg[1].createTimeFormattedDate}></h5>
@@ -251,16 +257,16 @@
   			</div>
   			</a>
   			<a th:if="${#lists.size(zcfg) ge 4}" th:href="@{/portal/news/newsDetail(id=${zcfg[3].id})}" >
-  			<div  class="bot">
+  				<div  class="bot">
   				<h5 th:text=${zcfg[3].createTimeFormattedDate}></h5>
   				<div class="line"></div>
   				<h4 th:text=${zcfg[3].title}></h4>
   				<p th:text=${zcfg[3].summary}></p>
   				</div>
-  				</a>
+  			</a>
   		</div>
   	</div>
-  	<div class="advantages">
+  	<div class="advantages" id="advantages">
   		<div>
   			<div class="advantages_title">
   				

+ 8 - 0
src/test/java/com/goafanti/test/TestValueEvaluation.java

@@ -13,6 +13,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.goafanti.admin.service.AdminVarietiesService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.model.ValueEvaluation;
 import com.goafanti.evaluation.service.ValueEvaluationService;
@@ -23,6 +24,9 @@ import com.goafanti.evaluation.service.ValueEvaluationService;
 public class TestValueEvaluation extends AbstractJUnit4SpringContextTests {
 	@Autowired
 	ValueEvaluationService valueEvaluationService;
+	
+	@Autowired
+	AdminVarietiesService adminVarietiesService;
 
 	@Test
 	public void testValueInsert() {
@@ -33,5 +37,9 @@ public class TestValueEvaluation extends AbstractJUnit4SpringContextTests {
 		ve.setLog("{\"transferType\":1}");
 		Assert.assertTrue("插入用户失败", valueEvaluationService.insert(ve) != 0);
 	}
+	@Test
+	public void testInset() {
+		adminVarietiesService.insert("测试","00");
+	}
 	
 }