Procházet zdrojové kódy

Merge branch 'test' of git@git.coding.net:aft/AFT.git into test

wanghui před 8 roky
rodič
revize
225e9eda9d
43 změnil soubory, kde provedl 9587 přidání a 202 odebrání
  1. 3 1
      .gitignore
  2. 2 3
      generatorConfig.xml
  3. 11 0
      src/main/java/com/goafanti/achievement/bo/InputAchievement.java
  4. 1 1
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  5. 8 5
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  6. 55 25
      src/main/java/com/goafanti/admin/bo/BusinessVarietiesBo.java
  7. 404 0
      src/main/java/com/goafanti/admin/bo/ProjectSizeBo.java
  8. 8 3
      src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java
  9. 77 15
      src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java
  10. 38 0
      src/main/java/com/goafanti/admin/controller/BusinessProjectController.java
  11. 20 1
      src/main/java/com/goafanti/admin/service/AdminVarietiesService.java
  12. 5 0
      src/main/java/com/goafanti/admin/service/BusinessProjectService.java
  13. 195 14
      src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java
  14. 33 0
      src/main/java/com/goafanti/admin/service/impl/BusinessProjectServiceImpl.java
  15. 5 1
      src/main/java/com/goafanti/common/constant/ErrorConstants.java
  16. 4 1
      src/main/java/com/goafanti/common/dao/AdminVarietiesMapper.java
  17. 76 0
      src/main/java/com/goafanti/common/dao/BusinessProjectMapper.java
  18. 110 0
      src/main/java/com/goafanti/common/dao/BusinessVarietiesMapper.java
  19. 101 0
      src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java
  20. 75 0
      src/main/java/com/goafanti/common/dao/ProjectSizeMapper.java
  21. 56 0
      src/main/java/com/goafanti/common/enums/AdminVarietiesStatus.java
  22. 11 12
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  23. 0 30
      src/main/java/com/goafanti/common/mapper/AdminVarietiesMapper.xml
  24. 540 0
      src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml
  25. 456 0
      src/main/java/com/goafanti/common/mapper/BusinessVarietiesMapper.xml
  26. 1 1
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  27. 39 4
      src/main/java/com/goafanti/common/mapper/NewsMapper.xml
  28. 528 10
      src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml
  29. 398 0
      src/main/java/com/goafanti/common/mapper/ProjectSizeMapper.xml
  30. 491 0
      src/main/java/com/goafanti/common/model/BusinessProject.java
  31. 1663 0
      src/main/java/com/goafanti/common/model/BusinessProjectExample.java
  32. 177 46
      src/main/java/com/goafanti/common/model/BusinessVarieties.java
  33. 963 0
      src/main/java/com/goafanti/common/model/BusinessVarietiesExample.java
  34. 283 0
      src/main/java/com/goafanti/common/model/OrganizationManagement.java
  35. 1082 0
      src/main/java/com/goafanti/common/model/OrganizationManagementExample.java
  36. 284 0
      src/main/java/com/goafanti/common/model/ProjectSize.java
  37. 1033 0
      src/main/java/com/goafanti/common/model/ProjectSizeExample.java
  38. 12 0
      src/main/java/com/goafanti/demand/bo/InputDemand.java
  39. 25 13
      src/main/java/com/goafanti/organization/bo/OrganizationListOut.java
  40. 80 1
      src/main/java/com/goafanti/organization/controller/OrganizationManagementController.java
  41. 28 0
      src/main/java/com/goafanti/organization/service/OrganizationService.java
  42. 204 15
      src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java
  43. 2 0
      src/main/resources/props/error.properties

+ 3 - 1
.gitignore

@@ -4,4 +4,6 @@
 .settings
 /.externalToolBuilders/
 /bin/
-/build/
+/build/
+/generatorConfig.xml
+/.gitignore

+ 2 - 3
generatorConfig.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
-  <classPathEntry location="E:/mysql-connector-java-5.1.40.jar" />
+  <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.44.jar" />
   <context id="context1">	
     <jdbcConnection connectionURL="jdbc:mysql://192.168.1.213:3306/aft" 
     	driverClass="com.mysql.jdbc.Driver" password="123456" userId="dev" />
     <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="user_identity"/>
-    <table schema="aft" tableName="organization_identity"/>
+    <table schema="aft" tableName="business_varieties"/>
   </context>
 </generatorConfiguration>

+ 11 - 0
src/main/java/com/goafanti/achievement/bo/InputAchievement.java

@@ -171,6 +171,17 @@ public class InputAchievement {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer    boutique;
 	
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer internationalFlag;
+	public Integer getInternationalFlag() {
+		return internationalFlag;
+	}
+
+	public void setInternationalFlag(Integer internationalFlag) {
+		this.internationalFlag = internationalFlag;
+	}
+
 	public String getId() {
 		return id;
 	}

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

@@ -41,7 +41,7 @@ public interface AchievementService {
 
 	Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,Integer boutique,Integer hot);
+			String releaseDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 
 	AchievementUserOwnerDetailBo selectUserOwnerDetail(String id);
 

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

@@ -96,7 +96,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			Integer boutique, Integer hot) {
 		Map<String, Object> params = disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique, hot);
+				boutique,null, hot);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -117,11 +117,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
+			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
 			Integer boutique, Integer hot) {
 		Map<String, Object> params = disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique, hot);
+				boutique,internationalFlag, hot);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -212,14 +212,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 				disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
-						status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null, null, null),
+						status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null, null,null, null),
 				pNo, pSize);
 	}
 
 	private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
 			Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer type,
-			Integer boutique, Integer hot) {
+			Integer boutique,String internationalFlag, Integer hot) {
 		Map<String, Object> params = new HashMap<>();
 
 		Date rStart = null;
@@ -296,6 +296,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (null != hot) {
 			params.put("hot", hot);
 		}
+		if (null != internationalFlag) {
+			params.put("internationalFlag", internationalFlag);
+		}
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("techBrokerId", TokenManager.getAdminId());
 		}

+ 55 - 25
src/main/java/com/goafanti/admin/bo/BusinessVarietiesBo.java

@@ -3,57 +3,79 @@ package com.goafanti.admin.bo;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
+
 public class BusinessVarietiesBo {
 	/*分类ID*/
 	private String id;
 	/*创建人*/
-	private String create_id;
+	private String createId;
 	/*创建时间*/
-	private Date create_time;
+	private Date createTime;
 	/*更新时间*/
-	private Date update_time;
+	private Date updateTime;
 	/*删除标识*/
-	private Integer delete_sign;
+	private Integer deleteSign;
 	/*分类编号*/
 	private String cid;
 	/*分类名称*/
 	private String cname;
 	/*父分类*/
-	private String super_id;
+	private String superId;
 	/*分类层级*/
 	private Integer layer;
 	/*分类状态*/
 	private String status;
+	/*上级品类*/
+	private String superName;
+	/*创建人*/
+	private String createName;
 	
+	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 getCreate_id() {
-		return create_id;
+	public String getCreateId() {
+		return createId;
 	}
-	public void setCreate_id(String create_id) {
-		this.create_id = create_id;
+	public void setCreateId(String createId) {
+		this.createId = createId;
 	}
-	public Date getCreate_time() {
-		return create_time;
+	public Date getCreateTime() {
+		return createTime;
 	}
-	public void setCreate_time(Date create_time) {
-		this.create_time = create_time;
+	// 创建时间
+	public String getCreateTimeFormattedDate() {
+		if (this.createTime == null) {
+				return null;
+			} else {
+				return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
+			}
+		}	
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
 	}
-	public Date getUpdate_time() {
-		return update_time;
+	public Date getUpdateTime() {
+		return updateTime;
 	}
-	public void setUpdate_time(Date update_time) {
-		this.update_time = update_time;
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
 	}
-	public Integer getDelete_sign() {
-		return delete_sign;
+	public Integer getDeleteSign() {
+		return deleteSign;
 	}
-	public void setDelete_sign(Integer delete_sign) {
-		this.delete_sign = delete_sign;
+	public void setDeleteSign(Integer deleteSign) {
+		this.deleteSign = deleteSign;
 	}
 	public String getCid() {
 		return cid;
@@ -67,11 +89,11 @@ public class BusinessVarietiesBo {
 	public void setCname(String cname) {
 		this.cname = cname;
 	}
-	public String getSuper_id() {
-		return super_id;
+	public String getSuperId() {
+		return superId;
 	}
-	public void setSuper_id(String super_id) {
-		this.super_id = super_id;
+	public void setSuperId(String superId) {
+		this.superId = superId;
 	}
 	public Integer getLayer() {
 		return layer;
@@ -85,5 +107,13 @@ public class BusinessVarietiesBo {
 	public void setStatus(String status) {
 		this.status = status;
 	}
+	public String getCreateName() {
+		return createName;
+	}
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
+	
+	
 }
 

+ 404 - 0
src/main/java/com/goafanti/admin/bo/ProjectSizeBo.java

@@ -0,0 +1,404 @@
+package com.goafanti.admin.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ProjectSizeBo {
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.id
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private String id;
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.create_id
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private String createId;
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.create_time
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private Date createTime;
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.update_time
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private Date updateTime;
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.pid
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private String pid;
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.pname
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private String pname;
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.price
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private BigDecimal price;
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.offset
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private BigDecimal offset;
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.activity_price
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private BigDecimal activityPrice;
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.activity_flag
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private String activityFlag;
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.member_price
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private BigDecimal memberPrice;
+
+	    /**
+	     *
+	     * This field was generated by MyBatis Generator.
+	     * This field corresponds to the database column project_size.status
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    private Integer status;
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method returns the value of the database column project_size.id
+	     *
+	     * @return the value of project_size.id
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public String getId() {
+	        return id;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.id
+	     *
+	     * @param id the value for project_size.id
+	     *
+	     * @mbg.generated Mon Dec 04 09:52: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 project_size.create_id
+	     *
+	     * @return the value of project_size.create_id
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public String getCreateId() {
+	        return createId;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.create_id
+	     *
+	     * @param createId the value for project_size.create_id
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 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 project_size.create_time
+	     *
+	     * @return the value of project_size.create_time
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public Date getCreateTime() {
+	        return createTime;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.create_time
+	     *
+	     * @param createTime the value for project_size.create_time
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 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 project_size.update_time
+	     *
+	     * @return the value of project_size.update_time
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public Date getUpdateTime() {
+	        return updateTime;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.update_time
+	     *
+	     * @param updateTime the value for project_size.update_time
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 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 project_size.pid
+	     *
+	     * @return the value of project_size.pid
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public String getPid() {
+	        return pid;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.pid
+	     *
+	     * @param pid the value for project_size.pid
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public void setPid(String pid) {
+	        this.pid = pid;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method returns the value of the database column project_size.pname
+	     *
+	     * @return the value of project_size.pname
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public String getPname() {
+	        return pname;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.pname
+	     *
+	     * @param pname the value for project_size.pname
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public void setPname(String pname) {
+	        this.pname = pname;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method returns the value of the database column project_size.price
+	     *
+	     * @return the value of project_size.price
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public BigDecimal getPrice() {
+	        return price;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.price
+	     *
+	     * @param price the value for project_size.price
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public void setPrice(BigDecimal price) {
+	        this.price = price;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method returns the value of the database column project_size.offset
+	     *
+	     * @return the value of project_size.offset
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public BigDecimal getOffset() {
+	        return offset;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.offset
+	     *
+	     * @param offset the value for project_size.offset
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public void setOffset(BigDecimal offset) {
+	        this.offset = offset;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method returns the value of the database column project_size.activity_price
+	     *
+	     * @return the value of project_size.activity_price
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public BigDecimal getActivityPrice() {
+	        return activityPrice;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.activity_price
+	     *
+	     * @param activityPrice the value for project_size.activity_price
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public void setActivityPrice(BigDecimal activityPrice) {
+	        this.activityPrice = activityPrice;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method returns the value of the database column project_size.activity_flag
+	     *
+	     * @return the value of project_size.activity_flag
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public String getActivityFlag() {
+	        return activityFlag;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.activity_flag
+	     *
+	     * @param activityFlag the value for project_size.activity_flag
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public void setActivityFlag(String activityFlag) {
+	        this.activityFlag = activityFlag;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method returns the value of the database column project_size.member_price
+	     *
+	     * @return the value of project_size.member_price
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public BigDecimal getMemberPrice() {
+	        return memberPrice;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.member_price
+	     *
+	     * @param memberPrice the value for project_size.member_price
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public void setMemberPrice(BigDecimal memberPrice) {
+	        this.memberPrice = memberPrice;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method returns the value of the database column project_size.status
+	     *
+	     * @return the value of project_size.status
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public Integer getStatus() {
+	        return status;
+	    }
+
+	    /**
+	     * This method was generated by MyBatis Generator.
+	     * This method sets the value of the database column project_size.status
+	     *
+	     * @param status the value for project_size.status
+	     *
+	     * @mbg.generated Mon Dec 04 09:52:04 CST 2017
+	     */
+	    public void setStatus(Integer status) {
+	        this.status = status;
+	    }
+	}
+

+ 8 - 3
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -84,7 +84,7 @@ public class AdminAchievementApiController extends CertifyApiController {
     @RequestMapping(value = "/orgList", method = RequestMethod.GET)
     private Result orgList(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
             String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
-            Integer releaseStatus, String pageNo, String pageSize,Integer boutique,Integer hot) {
+            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
         Result res = new Result();
         Integer pNo = 1;
         Integer pSize = 10;
@@ -94,8 +94,13 @@ public class AdminAchievementApiController extends CertifyApiController {
         if (StringUtils.isNumeric(pageNo)) {
             pNo = Integer.parseInt(pageNo);
         }
-        res.setData(achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize,boutique,hot));
+        
+        Object o = achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
+                keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
+        
+        res.setData(o);
+        
+        
         return res;
     }
     /**

+ 77 - 15
src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java

@@ -5,6 +5,7 @@ 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;
 
 
@@ -16,7 +17,7 @@ import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.BusinessVarieties;
 import com.goafanti.common.utils.StringUtils;
 @RestController
-@RequestMapping("api/admin/Varieties")
+@RequestMapping("open/api/admin/Varieties")
 public class AdminVarietiesApiController extends BaseController{
 	@Resource
 	private AdminVarietiesService adminVarietiesService;
@@ -28,13 +29,18 @@ public class AdminVarietiesApiController extends BaseController{
 	public Result addVarieties(String cname,String superId) {
 		Result res=new Result();
 		if (StringUtils.isBlank(cname)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "登录帐号为空", "登录帐号"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "品类名称为空", "品类名称"));
 			return res;
 		}
 		if (StringUtils.isBlank(superId)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "上级用户为空", "上级用户"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "上级品类为空", "上级品类"));
+			return res;
+		}
+		if (0<(adminVarietiesService.isBeing(cname))) {
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "品类名称已存在", "品类名称"));
 			return res;
 		}
+		
 		res.setData(adminVarietiesService.insert(cname,superId));
 		
 		return res;
@@ -43,19 +49,75 @@ public class AdminVarietiesApiController extends BaseController{
 	/**
 	 * 搜索品类
 	 */
-	@RequestMapping(value="/vtList" ,method=RequestMethod.GET)
-	public Result vtList(String cname,String super_name,Integer layer,
-			String status,String pageNo, String pageSize) {
+	@RequestMapping(value="/vtList" ,method=RequestMethod.POST)
+	public Result vtList(String cname,String superId,Integer layer,
+			String status,Integer pageNo, Integer pageSize) {
+		Result res = new Result();
+        res.setData(adminVarietiesService.listVarieties(cname, superId, layer,
+        		status, pageNo, pageSize));
+		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;
+	}
+	/**
+	 * 保存编辑信息
+	 */
+	@RequestMapping(value = "/editVarieties", method = RequestMethod.POST)
+	public Result editVarieties (String id,String cname,String superId,String  status) {
 		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);
+		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;
+		}
+		if (1<(adminVarietiesService.isBeing(cname))) {
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "品类名称已存在", "品类名称"));
+			return res;
+		}
+		res.setData(adminVarietiesService.updateVarietoes(id, cname, superId, status));
+		return res; 
+	}
+	/**
+	 * 品类删除
+	 */
+	@RequestMapping(value = "/deleteState", method = RequestMethod.GET)
+	public Result deleteState(String id){
+		Result res=new Result();
+		if (adminVarietiesService.getCountSon(id)>0) {
+			res.getError().add(buildError("品类下存在子品类", "品类存在子品类"));
+			return res;
+		}
+		res.setData(adminVarietiesService.deleteState(id));
+		return res;
+	}
+	/**
+	 * 品类停用
+	 */
+	@RequestMapping(value = "/updateStatus", method = RequestMethod.GET)
+	public Result updateStatus(String id){
+		Result res=new Result();
+		res.setData(adminVarietiesService.updateStatus(id));
 		return res;
 	}
 

+ 38 - 0
src/main/java/com/goafanti/admin/controller/BusinessProjectController.java

@@ -0,0 +1,38 @@
+package com.goafanti.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.admin.service.BusinessProjectService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.utils.StringUtils;
+
+@RestController
+@RequestMapping("open/api/admin/ProjectSize")
+public class BusinessProjectController extends BaseController{
+	
+	BusinessProjectService businessprojectService;
+	
+	/**
+	 * 新增项目
+	 */
+	@RequestMapping(value = "/addProject" , method = RequestMethod.POST)
+	public Result addProject(String bname,String cid,String country,String province,String city,String district) {
+		Result res=new Result();
+		if (StringUtils.isBlank(bname)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "项目名称名称为空", "项目名称"));
+			return res;
+		}
+		if (StringUtils.isBlank(cid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "所属品类为空", "所属品类"));
+			return res;
+		}
+		res.setData(businessprojectService.insert(bname, cid, country,province,city,district));
+		return res;
+	}
+
+}

+ 20 - 1
src/main/java/com/goafanti/admin/service/AdminVarietiesService.java

@@ -1,10 +1,29 @@
 package com.goafanti.admin.service;
 
+import java.util.List;
+
+import com.goafanti.admin.bo.BusinessVarietiesBo;
+import com.goafanti.common.model.BusinessVarieties;
 import com.goafanti.core.mybatis.page.Pagination;
 
 public interface AdminVarietiesService {
 	
 	int insert(String cname, String superId);
 	
-	/*Pagination<BusinessVaruetiesBo> bvList();*/
+	Pagination<BusinessVarieties> listVarieties(String cname, String superId, Integer layer, String status,
+			Integer pNo, Integer pSize);
+	
+	List<BusinessVarietiesBo> getSuperList();
+	
+	BusinessVarietiesBo editVarieties(String id);
+	
+	int updateVarietoes(String id,String cname,String superId,String status);
+	
+	int deleteState(String id);
+	
+	int updateStatus(String id);
+	
+	int isBeing(String cname);
+	
+	int getCountSon(String id);
 }

+ 5 - 0
src/main/java/com/goafanti/admin/service/BusinessProjectService.java

@@ -0,0 +1,5 @@
+package com.goafanti.admin.service;
+
+public interface BusinessProjectService {
+	int insert(String bname,String cid,String country,String province,String city,String district);
+}

+ 195 - 14
src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java

@@ -1,5 +1,9 @@
 package com.goafanti.admin.service.impl;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import org.springframework.beans.BeanUtils;
@@ -9,38 +13,215 @@ 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 implements AdminVarietiesService {
+public class AdminVarietiesServiceImpl extends BaseMybatisDao<BusinessVarietiesMapper> implements AdminVarietiesService {
 	
 	@Autowired
-	private AdminVarietiesMapper adminVarietiesMapper;
+	private BusinessVarietiesMapper businessVarietiesMapper;
 	
 	public int insert(String cname, String superId) {
 		BusinessVarietiesBo buv=new BusinessVarietiesBo();
 		buv.setId(UUID.randomUUID().toString());
+		buv.setCreateTime(new Date());
 		buv.setCname(cname);
-		buv.setSuper_id(superId);
-		buv.setDelete_sign(0);
-		if (Integer.valueOf(superId)<=0) {
-			if (null!=adminVarietiesMapper.MaxId(superId)||adminVarietiesMapper.MaxId(superId)>0) {
-				buv.setCid("00"+adminVarietiesMapper.MaxId(superId));
+		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 {
-			if (null!=adminVarietiesMapper.MaxId(superId)||adminVarietiesMapper.MaxId(superId)>0) {
-				buv.setCid(superId+adminVarietiesMapper.MaxId(superId));
+			int w=i+1;
+			if(Integer.valueOf(i)<10){
+				buv.setCid(str+"0"+w);
+			}else {
+				buv.setCid(str+w);
 			}
-			
 		}
-		buv.setCreate_id(TokenManager.getAdminId());
-		buv.setLayer(buv.getCid().length()/2);
-		buv.setStatus("正常");
+		
+		//判断是否数据库这个ID已经存在
+		String n=businessVarietiesMapper.ThanCid(buv.getCid());
+		while(StringUtils.isNotBlank(n)) {
+			String s1=buv.getCid().substring(0, buv.getCid().length()-3);
+			String s2=buv.getCid().substring(buv.getCid().length()-2, buv.getCid().length());
+			int i1=Integer.valueOf(s2)+1;
+			if(i1<10){
+				buv.setCid(s1+"0"+i1);
+			}else {
+				buv.setCid(s1+i1);
+			}
+			n=businessVarietiesMapper.ThanCid(buv.getCid());
+		}
+		System.out.println("cid:"+buv.getCid());
+		buv.setLayer(buv.getCid().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 adminVarietiesMapper.insert(bv);
+		return businessVarietiesMapper.insert(bv);
+		
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<BusinessVarieties> listVarieties(String cname, String superId, Integer layer, String status,
+			Integer pNo, Integer pSize) {
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		} 
 		
+		Pagination<?> a = findPage("findVarietiesListByPage", "findVarietiesListCount",
+				disposeParams(cname,superId,layer,status),pNo,pSize);
+		return (Pagination<BusinessVarieties>)findPage("findVarietiesListByPage", "findVarietiesListCount",
+				disposeParams(cname,superId,layer,status),pNo,pSize);
 	}
 
+	private Map<String, Object> disposeParams(String cname, String superId, Integer layer, String status) {
+		Map<String, Object> params = new HashMap<>();
+
+		if (StringUtils.isNotBlank(cname)) {
+			params.put("cname", cname);
+		}
+
+		if (StringUtils.isNotBlank(superId)) {
+			params.put("superId", superId);
+		}
+
+		if (null != layer) {
+			params.put("layer", layer);
+		}
+		if (StringUtils.isNotBlank(status)) {
+			params.put("status", status);
+		}
+
+		
+		return params;
+	}
+	public List<BusinessVarietiesBo> getSuperList() {
+		
+		return businessVarietiesMapper.getSuperList();
+	}
+	@Override
+	public BusinessVarietiesBo editVarieties(String id) {
+		
+		return businessVarietiesMapper.editVarieties(id);
+	}
+	@Override
+	public int updateVarietoes(String id, String cname, String superId, String status) {
+		BusinessVarieties bs=new BusinessVarieties();
+		bs=businessVarietiesMapper.selectByPrimaryKey(id);
+		bs.setCname(cname);
+		String str=businessVarietiesMapper.getCid(superId);
+		int i=Integer.valueOf(businessVarietiesMapper.getCount(superId));
+			if (3>=str.length()) {
+				if(Integer.valueOf(i)<9){
+					
+					bs.setCid("BZ0"+i);
+				}else {
+					bs.setCid("BZ"+i);
+				}
+			}else {
+				int w=i+1;
+				if(Integer.valueOf(i)<9){
+					bs.setCid(str+"0"+w);
+				}else {
+					bs.setCid(str+w);
+				}
+			}
+			//判断是否数据库这个ID已经存在
+			checkCid(bs);
+		//将子品类名称编号做修改
+		String c1=bs.getCid();
+		List<BusinessVarietiesBo> list=businessVarietiesMapper.selectSuperid(id);
+		for (BusinessVarietiesBo bv : list) {
+			String n=bv.getId();
+			String w=bv.getCid();
+			BusinessVarieties bvs=businessVarietiesMapper.selectByPrimaryKey(n);
+			String s2=bvs.getCid().substring(w.length()-2, w.length());
+			bvs.setCid(c1+s2);
+			checkCid(bvs);
+			businessVarietiesMapper.updateByPrimaryKey(bvs);
+		}
+		bs.setSuperId(superId);
+		bs.setLayer(bs.getCid().length()/2-1);
+		bs.setUpdateTime(new Date());
+		bs.setStatus(status);
+		return businessVarietiesMapper.updateByPrimaryKey(bs);
+	}
+	
+	/**
+	 * 检查用户是否存在
+	 * @param bs
+	 */
+	private void checkCid(BusinessVarieties bs) {
+		String n=businessVarietiesMapper.ThanCid(bs.getCid());
+		
+		while(null!=n) {
+			String s1=bs.getCid().substring(0, bs.getCid().length()-2);
+			String s2=bs.getCid().substring(bs.getCid().length()-2, bs.getCid().length());
+			int i1=Integer.valueOf(s2)+1;
+			if(i1<10){
+				bs.setCid(s1+"0"+i1);
+			}else {
+				bs.setCid(s1+i1);
+			}
+			n=businessVarietiesMapper.ThanCid(bs.getCid());
+		}
+	}
+	@Override
+	public int deleteState(String id) {
+		BusinessVarieties bs=new BusinessVarieties();
+		bs=businessVarietiesMapper.selectByPrimaryKey(id);
+		
+		if (0 ==bs.getDeleteSign()) {
+			bs.setDeleteSign(1);
+		}else {
+			bs.setDeleteSign(0);
+		}
+		
+		return businessVarietiesMapper.updateByPrimaryKey(bs);
+	}
+	@Override
+	public int updateStatus(String id) {
+		BusinessVarieties bs=new BusinessVarieties();
+		bs=businessVarietiesMapper.selectByPrimaryKey(id);
+		
+		if (0==Integer.valueOf(bs.getStatus())) {
+			bs.setStatus("1");
+		}else {
+			bs.setStatus("0");
+		}
+		
+		return businessVarietiesMapper.updateByPrimaryKey(bs);
+	}
+	@Override
+	public int isBeing(String cname) {
+		
+		return businessVarietiesMapper.getcname(cname);
+	}
+	@Override
+	public int getCountSon(String id) {
+		
+		return Integer.valueOf(businessVarietiesMapper.getCount(id));
+	}
+	
+	
 }

+ 33 - 0
src/main/java/com/goafanti/admin/service/impl/BusinessProjectServiceImpl.java

@@ -0,0 +1,33 @@
+package com.goafanti.admin.service.impl;
+
+import java.util.Date;
+import java.util.UUID;
+
+import com.goafanti.admin.service.BusinessProjectService;
+
+import com.goafanti.common.dao.BusinessProjectMapper;
+import com.goafanti.common.model.BusinessProject;
+
+import com.goafanti.core.shiro.token.TokenManager;
+
+public class BusinessProjectServiceImpl implements BusinessProjectService {
+	BusinessProjectMapper businessProjectMapper;
+	@Override
+	public int insert(String bname, String cid, String country, String province, String city, String district) {
+		BusinessProject bp=new BusinessProject();
+		bp.setId(UUID.randomUUID().toString());
+		bp.setBname(bname);
+		bp.setCountry(country);
+		if (1!=Integer.valueOf(country)) {
+			bp.setProvince(province);
+			bp.setCity(city);
+			bp.setDistrict(district);
+		}
+		bp.setCreateId(TokenManager.getAdminId());
+		bp.setCreateTime(new Date());
+		bp.setStatus("0");
+
+		return businessProjectMapper.insert(bp);
+	}
+
+}

+ 5 - 1
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -15,7 +15,9 @@ public class ErrorConstants {
 	public static final String	PARAM_INTEGER_ERROR					= "PARAM_INTEGER_ERROR";
 
 	public static final String	PARAM_EMPTY_ERROR					= "PARAM_EMPTY_ERROR";
-
+	
+	public static final String	PARAM_BEING_ERROR					= "PARAM_BEING_ERROR";
+	
 	public static final String	PARAM_SIZE_ERROR					= "PARAM_SIZE_ERROR";
 
 	public static final String	PARAM_PATTERN_ERROR					= "PARAM_PATTERN_ERROR";
@@ -111,4 +113,6 @@ public class ErrorConstants {
 	public static final String BUSINESS_ALREADY_EXIST				= "BUSINESS_ALREADY_EXIST";
 	
 	public static final String AT_LEAST_A_BUSINESS					= "AT_LEAST_A_BUSINESS";
+	
+	public static final String	SON_ALREADY_EXIST					= "SON_ALREADY_EXIST";
 }

+ 4 - 1
src/main/java/com/goafanti/common/dao/AdminVarietiesMapper.java

@@ -1,12 +1,15 @@
 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);
 
-	Integer MaxId(String superId);
+	
 
    
 

+ 76 - 0
src/main/java/com/goafanti/common/dao/BusinessProjectMapper.java

@@ -0,0 +1,76 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.BusinessProject;
+import com.goafanti.common.model.BusinessProjectExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessProjectMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	long countByExample(BusinessProjectExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int deleteByExample(BusinessProjectExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int insert(BusinessProject record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int insertSelective(BusinessProject record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	List<BusinessProject> selectByExample(BusinessProjectExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	BusinessProject selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int updateByExampleSelective(@Param("record") BusinessProject record,
+			@Param("example") BusinessProjectExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int updateByExample(@Param("record") BusinessProject record, @Param("example") BusinessProjectExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int updateByPrimaryKeySelective(BusinessProject record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int updateByPrimaryKey(BusinessProject record);
+}

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

@@ -0,0 +1,110 @@
+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);
+    
+	String ThanCid(String cid);
+	
+	int getcname(String cname);
+	List<BusinessVarietiesBo>  selectSuperid(String spuerId);
+}

+ 101 - 0
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -1,5 +1,106 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
+import com.goafanti.organization.bo.OrganizationListOut;
+import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.common.model.OrganizationManagement;
+import com.goafanti.common.model.OrganizationManagementExample;
+import org.apache.ibatis.annotations.Param;
+
 public interface OrganizationManagementMapper {
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	long countByExample(OrganizationManagementExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int deleteByExample(OrganizationManagementExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int deleteByPrimaryKey(String id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int insert(OrganizationManagement record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int insertSelective(OrganizationManagement record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	List<OrganizationManagement> selectByExample(OrganizationManagementExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	OrganizationManagement selectByPrimaryKey(String id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int updateByExampleSelective(@Param("record") OrganizationManagement record,
+			@Param("example") OrganizationManagementExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int updateByExample(@Param("record") OrganizationManagement record,
+			@Param("example") OrganizationManagementExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int updateByPrimaryKeySelective(OrganizationManagement record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table organization_management
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	int updateByPrimaryKey(OrganizationManagement record);
+	List<OrganizationListOut> selectSuperId();
+	/**
+	 * 新增
+	 * @param olo
+	 * @return
+	 */
+	int insert1(OrganizationListOut olo);
+	/**
+	 * 根据组织名称查组织编号
+	 */
+	String selectDepNoByName(String name);
+	/**
+	 * 查询相同上级下编号数量
+	 */
+	int selectDepNoCount(String superId);
+	/**
+	 * 模糊查询负责人名称
+	 */
+	List<AdminListBo> selectName(String name);
+	
+	OrganizationListOut selectAllById(String id);
+	
+	int deleteById(String id);
+	
+	String selectAdminNameById(String name);
+	
+	String selectIdByDepNo(String depNo);
+	/**
+	 * 查询有相同上级组织的信息
+	 * @param superId
+	 * @return
+	 */
+	List<OrganizationListOut> selectIDNBySuperId(String superId);
+	
+	int updateByNumber(OrganizationListOut olo);
 	
+	int selectCountBySuperId(String superId);
 }

+ 75 - 0
src/main/java/com/goafanti/common/dao/ProjectSizeMapper.java

@@ -0,0 +1,75 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.ProjectSize;
+import com.goafanti.common.model.ProjectSizeExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ProjectSizeMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table project_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	long countByExample(ProjectSizeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table project_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int deleteByExample(ProjectSizeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table project_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table project_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int insert(ProjectSize record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table project_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int insertSelective(ProjectSize record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table project_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	List<ProjectSize> selectByExample(ProjectSizeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table project_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	ProjectSize selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table project_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int updateByExampleSelective(@Param("record") ProjectSize record, @Param("example") ProjectSizeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table project_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int updateByExample(@Param("record") ProjectSize record, @Param("example") ProjectSizeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table project_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int updateByPrimaryKeySelective(ProjectSize record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table project_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	int updateByPrimaryKey(ProjectSize record);
+}

+ 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;
+	}
+
+}
+	
+

+ 11 - 12
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -865,7 +865,7 @@
 	</if>
   	where a.deleted_sign = 0 and a.owner_type = 1
   	<if test="techBrokerId != null">
-		a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
 	</if>
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%') 	
@@ -903,9 +903,7 @@
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
-	<if test="techBrokerId != null">
-	   and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-	</if>
+	
 	<if test="boutique != null">
 		and a.boutique = #{boutique,jdbcType=INTEGER}
 	</if>
@@ -938,7 +936,7 @@
 	</if>
   	where a.deleted_sign = 0 and a.owner_type = 1
   	<if test="techBrokerId != null">
-		a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
 	</if>
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
@@ -976,9 +974,7 @@
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
-	<if test="techBrokerId != null">
-	   and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-	</if>
+	
 	<if test="hot != null and hot == 0"><!-- 不在首页 -->
 		and a.id not in(select mm.product_id from marketing_management mm where mm.effective = 1)
 	</if>
@@ -1039,6 +1035,7 @@
 	<if test="releaseStatus != null">
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
+	
 	order by serial_number desc
 	<if test="page_sql!=null">
 			${page_sql}
@@ -1080,6 +1077,7 @@
 	<if test="releaseStatus != null">
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
+	
   </select>
   
   <select id="selectUserOwnerDetail" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementUserOwnerDetailBo">
@@ -1094,7 +1092,7 @@
 		    a.owner_mobile as ownerMobile, a.owner_email as ownerEmail, a.owner_postal_address as ownerPostalAddress, 
 		    a.cooperation_mode as cooperationMode, a.transfer_mode as transferMode, a.bargaining_mode as bargainingMode, 
 		    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough, 
-		    a.patent_case as patentCase, a.awards, a.team_des as teamDes, 
+		    a.patent_case as patentCase, a.awards, a.team_des as teamDes,  a.international_flag as internationalFlag,
 		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl, 
 		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId, 
 		    a.create_time as createTime, a.release_status as releaseStatus, 
@@ -1122,7 +1120,7 @@
 		    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough, 
 		    a.patent_case as patentCase, a.awards, a.team_des as teamDes, 
 		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl, 
-		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId, 
+		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId,  a.international_flag as internationalFlag,
 		    a.create_time as createTime, a.release_status as releaseStatus, 
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
 		    oi.unit_name as iOwnerName, oi.postal_address as iOwnerPostalAddress, u.email as iOwnerEmail,
@@ -1141,7 +1139,7 @@
     	 name, keyword, category,
     	 owner_name, owner_type, owner_id_number,
     	 owner_mobile, owner_email, owner_postal_address,
-    	 cooperation_mode, introduction, tech_broker_id
+    	 cooperation_mode, introduction, tech_broker_id,international_flag
     	 )
     values 
     <foreach item="item" index="index" collection="list" separator=",">
@@ -1151,7 +1149,8 @@
       	#{item.name,jdbcType=VARCHAR}, #{item.keyword,jdbcType=VARCHAR}, #{item.category,jdbcType=INTEGER},
       	#{item.ownerName,jdbcType=VARCHAR}, #{item.ownerType,jdbcType=VARCHAR}, #{item.ownerIdNumber,jdbcType=VARCHAR},
       	#{item.ownerMobile,jdbcType=VARCHAR}, #{item.ownerEmail,jdbcType=VARCHAR}, #{item.ownerPostalAddress,jdbcType=VARCHAR},
-      	#{item.cooperationMode,jdbcType=INTEGER}, #{item.introduction,jdbcType=LONGVARCHAR},#{item.techBrokerId,jdbcType=VARCHAR}
+      	#{item.cooperationMode,jdbcType=INTEGER}, #{item.introduction,jdbcType=LONGVARCHAR},#{item.techBrokerId,jdbcType=VARCHAR},
+      	#{item.internationalFlag,jdbcType=INTEGER}
       )
     </foreach>
   </insert>

+ 0 - 30
src/main/java/com/goafanti/common/mapper/AdminVarietiesMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.AdminVarietiesMapper">
-  <sql id="varietiesList" >
-    id,create_id,create_time,update_time,
-    ,delete_sign,cid,cname,super_id,layer,status
-  </sql>
-  
-  
-   <insert id="insert" parameterType="com.goafanti.admin.bo.BusinessVarietiesBo">
-    insert into business_varieties (
-    <include refid="varietiesList"/>
-    )values
-    (#{id,jdbcType=VARCHAR},#{create_id,jdbcType=VARCHAR},now(),#{update_time,jdbcType=TIMESTAMP},
-    #{delete_sign,jdbcType=INTEGER},#{cid,jdbcType=VARCHAR},
-    #{cname,jdbcType=VARCHAR},#{super_id,jdbcType=VARCHAR},#{layer,jdbcType=INTEGER},#{status,jdbcType=VARCHAR})
-    </insert>
-    
-    <select id="selectvarieties" resultType="com.goafanti.admin.bo.BusinessVarietiesBo" >
-    select 
-    <include refid="varietiesList" />
-    from business_varieties
-    
-  	</select>
-  	
-  	<select id="MaxId" resultType="string">
-  	select max(cid) from business_varieties
-  	where super_id=#{superId,jdbcType=VARCHAR} 
-  	</select>
-</mapper>

+ 540 - 0
src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml

@@ -0,0 +1,540 @@
+<?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.BusinessProjectMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.BusinessProject">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 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="bname" jdbcType="VARCHAR" property="bname" />
+    <result column="cid" jdbcType="VARCHAR" property="cid" />
+    <result column="price" jdbcType="DECIMAL" property="price" />
+    <result column="offset" jdbcType="DECIMAL" property="offset" />
+    <result column="activity_price" jdbcType="DECIMAL" property="activityPrice" />
+    <result column="activity_flag" jdbcType="VARCHAR" property="activityFlag" />
+    <result column="member_price" jdbcType="DECIMAL" property="memberPrice" />
+    <result column="introduce" jdbcType="VARCHAR" property="introduce" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="country" jdbcType="VARCHAR" property="country" />
+    <result column="province" jdbcType="VARCHAR" property="province" />
+    <result column="city" jdbcType="VARCHAR" property="city" />
+    <result column="district" jdbcType="VARCHAR" property="district" />
+    <result column="principal_id" jdbcType="VARCHAR" property="principalId" />
+    <result column="Value_effect" jdbcType="VARCHAR" property="valueEffect" />
+    <result column="client_size" jdbcType="VARCHAR" property="clientSize" />
+  </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 Mon Dec 04 15:29:25 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 Mon Dec 04 15:29:25 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 Mon Dec 04 15:29:25 CST 2017.
+    -->
+    id, create_id, create_time, update_time, delete_sign, bname, cid, price, offset, 
+    activity_price, activity_flag, member_price, introduce, status, country, province, 
+    city, district, principal_id, Value_effect, client_size
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.BusinessProjectExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_project
+    <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 Mon Dec 04 15:29:25 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from business_project
+    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 Mon Dec 04 15:29:25 CST 2017.
+    -->
+    delete from business_project
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.BusinessProjectExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    delete from business_project
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.BusinessProject">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    insert into business_project (id, create_id, create_time, 
+      update_time, delete_sign, bname, 
+      cid, price, offset, 
+      activity_price, activity_flag, member_price, 
+      introduce, status, country, 
+      province, city, district, 
+      principal_id, Value_effect, client_size
+      )
+    values (#{id,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{deleteSign,jdbcType=INTEGER}, #{bname,jdbcType=VARCHAR}, 
+      #{cid,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{offset,jdbcType=DECIMAL}, 
+      #{activityPrice,jdbcType=DECIMAL}, #{activityFlag,jdbcType=VARCHAR}, #{memberPrice,jdbcType=DECIMAL}, 
+      #{introduce,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{country,jdbcType=VARCHAR}, 
+      #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{district,jdbcType=VARCHAR}, 
+      #{principalId,jdbcType=VARCHAR}, #{valueEffect,jdbcType=VARCHAR}, #{clientSize,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.BusinessProject">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    insert into business_project
+    <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="bname != null">
+        bname,
+      </if>
+      <if test="cid != null">
+        cid,
+      </if>
+      <if test="price != null">
+        price,
+      </if>
+      <if test="offset != null">
+        offset,
+      </if>
+      <if test="activityPrice != null">
+        activity_price,
+      </if>
+      <if test="activityFlag != null">
+        activity_flag,
+      </if>
+      <if test="memberPrice != null">
+        member_price,
+      </if>
+      <if test="introduce != null">
+        introduce,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="country != null">
+        country,
+      </if>
+      <if test="province != null">
+        province,
+      </if>
+      <if test="city != null">
+        city,
+      </if>
+      <if test="district != null">
+        district,
+      </if>
+      <if test="principalId != null">
+        principal_id,
+      </if>
+      <if test="valueEffect != null">
+        Value_effect,
+      </if>
+      <if test="clientSize != null">
+        client_size,
+      </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="bname != null">
+        #{bname,jdbcType=VARCHAR},
+      </if>
+      <if test="cid != null">
+        #{cid,jdbcType=VARCHAR},
+      </if>
+      <if test="price != null">
+        #{price,jdbcType=DECIMAL},
+      </if>
+      <if test="offset != null">
+        #{offset,jdbcType=DECIMAL},
+      </if>
+      <if test="activityPrice != null">
+        #{activityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="activityFlag != null">
+        #{activityFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="memberPrice != null">
+        #{memberPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="introduce != null">
+        #{introduce,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="country != null">
+        #{country,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null">
+        #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null">
+        #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="district != null">
+        #{district,jdbcType=VARCHAR},
+      </if>
+      <if test="principalId != null">
+        #{principalId,jdbcType=VARCHAR},
+      </if>
+      <if test="valueEffect != null">
+        #{valueEffect,jdbcType=VARCHAR},
+      </if>
+      <if test="clientSize != null">
+        #{clientSize,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.BusinessProjectExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    select count(*) from business_project
+    <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 Mon Dec 04 15:29:25 CST 2017.
+    -->
+    update business_project
+    <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.bname != null">
+        bname = #{record.bname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cid != null">
+        cid = #{record.cid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.price != null">
+        price = #{record.price,jdbcType=DECIMAL},
+      </if>
+      <if test="record.offset != null">
+        offset = #{record.offset,jdbcType=DECIMAL},
+      </if>
+      <if test="record.activityPrice != null">
+        activity_price = #{record.activityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.activityFlag != null">
+        activity_flag = #{record.activityFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="record.memberPrice != null">
+        member_price = #{record.memberPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.introduce != null">
+        introduce = #{record.introduce,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.country != null">
+        country = #{record.country,jdbcType=VARCHAR},
+      </if>
+      <if test="record.province != null">
+        province = #{record.province,jdbcType=VARCHAR},
+      </if>
+      <if test="record.city != null">
+        city = #{record.city,jdbcType=VARCHAR},
+      </if>
+      <if test="record.district != null">
+        district = #{record.district,jdbcType=VARCHAR},
+      </if>
+      <if test="record.principalId != null">
+        principal_id = #{record.principalId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.valueEffect != null">
+        Value_effect = #{record.valueEffect,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clientSize != null">
+        client_size = #{record.clientSize,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 Mon Dec 04 15:29:25 CST 2017.
+    -->
+    update business_project
+    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},
+      bname = #{record.bname,jdbcType=VARCHAR},
+      cid = #{record.cid,jdbcType=VARCHAR},
+      price = #{record.price,jdbcType=DECIMAL},
+      offset = #{record.offset,jdbcType=DECIMAL},
+      activity_price = #{record.activityPrice,jdbcType=DECIMAL},
+      activity_flag = #{record.activityFlag,jdbcType=VARCHAR},
+      member_price = #{record.memberPrice,jdbcType=DECIMAL},
+      introduce = #{record.introduce,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=VARCHAR},
+      country = #{record.country,jdbcType=VARCHAR},
+      province = #{record.province,jdbcType=VARCHAR},
+      city = #{record.city,jdbcType=VARCHAR},
+      district = #{record.district,jdbcType=VARCHAR},
+      principal_id = #{record.principalId,jdbcType=VARCHAR},
+      Value_effect = #{record.valueEffect,jdbcType=VARCHAR},
+      client_size = #{record.clientSize,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.BusinessProject">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    update business_project
+    <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="bname != null">
+        bname = #{bname,jdbcType=VARCHAR},
+      </if>
+      <if test="cid != null">
+        cid = #{cid,jdbcType=VARCHAR},
+      </if>
+      <if test="price != null">
+        price = #{price,jdbcType=DECIMAL},
+      </if>
+      <if test="offset != null">
+        offset = #{offset,jdbcType=DECIMAL},
+      </if>
+      <if test="activityPrice != null">
+        activity_price = #{activityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="activityFlag != null">
+        activity_flag = #{activityFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="memberPrice != null">
+        member_price = #{memberPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="introduce != null">
+        introduce = #{introduce,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="country != null">
+        country = #{country,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null">
+        province = #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null">
+        city = #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="district != null">
+        district = #{district,jdbcType=VARCHAR},
+      </if>
+      <if test="principalId != null">
+        principal_id = #{principalId,jdbcType=VARCHAR},
+      </if>
+      <if test="valueEffect != null">
+        Value_effect = #{valueEffect,jdbcType=VARCHAR},
+      </if>
+      <if test="clientSize != null">
+        client_size = #{clientSize,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.BusinessProject">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    update business_project
+    set create_id = #{createId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      delete_sign = #{deleteSign,jdbcType=INTEGER},
+      bname = #{bname,jdbcType=VARCHAR},
+      cid = #{cid,jdbcType=VARCHAR},
+      price = #{price,jdbcType=DECIMAL},
+      offset = #{offset,jdbcType=DECIMAL},
+      activity_price = #{activityPrice,jdbcType=DECIMAL},
+      activity_flag = #{activityFlag,jdbcType=VARCHAR},
+      member_price = #{memberPrice,jdbcType=DECIMAL},
+      introduce = #{introduce,jdbcType=VARCHAR},
+      status = #{status,jdbcType=VARCHAR},
+      country = #{country,jdbcType=VARCHAR},
+      province = #{province,jdbcType=VARCHAR},
+      city = #{city,jdbcType=VARCHAR},
+      district = #{district,jdbcType=VARCHAR},
+      principal_id = #{principalId,jdbcType=VARCHAR},
+      Value_effect = #{valueEffect,jdbcType=VARCHAR},
+      client_size = #{clientSize,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -0,0 +1,456 @@
+<?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},#{createTime,jdbcType=TIMESTAMP}, 
+      #{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 as createId ,b.create_time as createTime,b.update_time as updateTime,
+  		b.delete_sign daleteSign,b.cid,b.cname,b.super_id superId ,b.layer,b.status,b2.cname as superName
+  		from business_varieties b
+  		left join business_varieties b2 on b.super_id = b2.id
+  		where b.delete_sign=0 
+  		<if test="cname != null">
+		and b.cname like CONCAT('%',#{cname,jdbcType=VARCHAR},'%')
+		</if>
+		<if test="superId != null">
+		and b.super_id = #{superId,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>
+		<if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
+  <select id="findVarietiesListCount" resultType="Integer">
+ 		select 
+  			count(0)
+  		from business_varieties b
+  		 left join business_varieties b2 on b.super_id = b2.id
+  		where b.delete_sign=0 
+  		<if test="cname != null">
+		and b.cname like CONCAT('%',#{cname,jdbcType=VARCHAR},'%')
+		</if>
+		<if test="superId != null">
+		and b.super_id = #{superId,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 as createId ,b.create_time as createTime,b.update_time as updateTime,
+  		b.delete_sign daleteSign,b.cid,b.cname,b.super_id superId ,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 as createId ,b.create_time as createTime,b.update_time as updateTime,
+  		b.delete_sign as deleteSign,b.cid,b.cname,b.super_id superId ,b.layer,b.status,b2.cname superName,a.name as createName
+  		from business_varieties b 
+  		 left join business_varieties b2 on b.super_id = b2.id
+  		 left join admin a on b.create_id = a.id
+  		where b.delete_sign=0
+  		<if test="id != null">
+		and b.id = #{id,jdbcType=VARCHAR}
+	</if>
+  </select>
+  
+  <select id="ThanCid" resultType="string">
+  		select b.id 
+  		from business_varieties b
+  		where b.cid= #{cid,jdbcType=VARCHAR}
+  	</select>
+  	
+  	<select id="getcname" resultType="Integer">
+  		select count(1) 
+  		from business_varieties b
+  		where b.cname= #{cname,jdbcType=VARCHAR}
+  	</select>
+  	
+  	<select id="selectSuperid" resultType="com.goafanti.admin.bo.BusinessVarietiesBo">
+  		select b.id,b.create_id as createId ,b.create_time as createTime,b.update_time as updateTime,
+  		b.delete_sign as deleteSign,b.cid,b.cname,b.super_id superId ,b.layer,b.status
+  		from business_varieties b 
+  		where b.super_id= #{superId,jdbcType=VARCHAR}
+  	</select>
+</mapper>

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

@@ -889,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.remark
+  		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

+ 39 - 4
src/main/java/com/goafanti/common/mapper/NewsMapper.xml

@@ -240,12 +240,13 @@
 			a.source,
 			a.content
 		from news a
-		where 1 =1
+		where
+		a.type != 1 and a.type != 2
 		<if test="provinceId != null">
 			and a.province_id = #{provinceId,jdbcType=INTEGER}
 		</if>
 
-		<if test="type != null and type != 0" >
+		<if test="type != null and type != 0 " >
 			and a.type = #{type,jdbcType=INTEGER}
 		</if>
 		<!-- 
@@ -266,11 +267,12 @@
 		select 
 			count(0)
 		from news a
-		where 1 =1
+		where 
+		a.type != 1 and a.type != 2
 		<if test="provinceId != null">
 			and a.province_id = #{provinceId,jdbcType=INTEGER}
 		</if>
-		<if test="type != null and type != 0" >
+		<if test="type != null and type != 0 and type != 1 and type != 2" >
 			and a.type = #{type,jdbcType=INTEGER}
 		</if>
 		<!-- 	
@@ -282,4 +284,37 @@
 			and a.title like concat('%',#{keyword},'%')
 		</if>
 	</select>
+	<select id="portalNewsPolicy" resultType="com.goafanti.news.bo.NewsPortalList">
+		select
+			a.id,
+			DATE_FORMAT(a.create_time,'%Y-%d-%m') as createTime,
+			a.title,
+			a.title_img as titleImg,
+			a.type,
+			a.hot,
+			a.summary,
+			a.source,
+			a.content
+		from news a
+		where
+		a.type =5 or a.type =4
+		order by create_time desc
+	</select>
+	<select id="portalNewsQuestion" resultType="com.goafanti.news.bo.NewsPortalList">
+		select
+			a.id,
+			DATE_FORMAT(a.create_time,'%Y-%d-%m') as createTime,
+			a.title,
+			a.title_img as titleImg,
+			a.type,
+			a.hot,
+			a.summary,
+			a.source,
+			a.content
+		from news a
+		where
+		a.type =2
+		order by create_time desc
+	</select>
+	
 </mapper>

+ 528 - 10
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -1,24 +1,542 @@
 <?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.OrganizationManagementMapper">
-	<select id="selectOrganizationList" resultType="com.goafanti.organization.bo.OrganizationListOut">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrganizationManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 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="deleted_sign" jdbcType="VARCHAR" property="deletedSign" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="manager_id" jdbcType="VARCHAR" property="managerId" />
+    <result column="dep_no" jdbcType="VARCHAR" property="depNo" />
+    <result column="super_id" jdbcType="VARCHAR" property="superId" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <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 11:09:29 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 11:09:29 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 11:09:29 CST 2017.
+    -->
+    id, create_id, create_time, update_time, deleted_sign, name, type, manager_id, dep_no, 
+    super_id, remarks, status
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from department_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 Thu Nov 30 11:09:29 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from department_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 Thu Nov 30 11:09:29 CST 2017.
+    -->
+    delete from department_management
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    delete from department_management
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrganizationManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    insert into department_management (id, create_id, create_time, 
+      update_time, deleted_sign, name, 
+      type, manager_id, dep_no, 
+      super_id, remarks, status
+      )
+    values (#{id,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{deletedSign,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{type,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{depNo,jdbcType=VARCHAR}, 
+      #{superId,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    insert into department_management
+    <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="deletedSign != null">
+        deleted_sign,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="managerId != null">
+        manager_id,
+      </if>
+      <if test="depNo != null">
+        dep_no,
+      </if>
+      <if test="superId != null">
+        super_id,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </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="deletedSign != null">
+        #{deletedSign,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="managerId != null">
+        #{managerId,jdbcType=VARCHAR},
+      </if>
+      <if test="depNo != null">
+        #{depNo,jdbcType=VARCHAR},
+      </if>
+      <if test="superId != null">
+        #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample" 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 11:09:29 CST 2017.
+    -->
+    select count(*) from department_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 Thu Nov 30 11:09:29 CST 2017.
+    -->
+    update department_management
+    <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.deletedSign != null">
+        deleted_sign = #{record.deletedSign,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.managerId != null">
+        manager_id = #{record.managerId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.depNo != null">
+        dep_no = #{record.depNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.superId != null">
+        super_id = #{record.superId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </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 11:09:29 CST 2017.
+    -->
+    update department_management
+    set id = #{record.id,jdbcType=VARCHAR},
+      create_id = #{record.createId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      deleted_sign = #{record.deletedSign,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=VARCHAR},
+      manager_id = #{record.managerId,jdbcType=VARCHAR},
+      dep_no = #{record.depNo,jdbcType=VARCHAR},
+      super_id = #{record.superId,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      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.OrganizationManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    update department_management
+    <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="deletedSign != null">
+        deleted_sign = #{deletedSign,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="managerId != null">
+        manager_id = #{managerId,jdbcType=VARCHAR},
+      </if>
+      <if test="depNo != null">
+        dep_no = #{depNo,jdbcType=VARCHAR},
+      </if>
+      <if test="superId != null">
+        super_id = #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </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.OrganizationManagement">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Nov 30 11:09:29 CST 2017.
+    -->
+    update department_management
+    set create_id = #{createId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      deleted_sign = #{deletedSign,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      type = #{type,jdbcType=VARCHAR},
+      manager_id = #{managerId,jdbcType=VARCHAR},
+      dep_no = #{depNo,jdbcType=VARCHAR},
+      super_id = #{superId,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      status = #{status,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+	<select id="selectOrganizationList" parameterType="String" resultType="com.goafanti.organization.bo.OrganizationListOut">
 		select
-		u.id as uid,om.id,om.create_id as createId,om.create_time as createTime,
+		om.id,om.create_id as createId,om.create_time as createTime,
 		om.update_time as updateTime,om.deleted_sign as deletedSign,
 		om.name,om.type,om.manager_id as managerId,
 		om.dep_no as depNo,
 		om.super_id as superId,
-		om.desc
-		from user u
-		left join organization_management om on om.id = u.id
+		om.remarks,om.status
+		from department_management om 
+		where
+		om.deleted_sign = '0'
+		<if test="name !=null">
+			AND om.name=#{name,jdbcType=VARCHAR}
+		</if>
+		<if test="superId !=null">
+			AND om.super_id=#{superId,jdbcType=VARCHAR}
+		</if>
+		<if test="type !=null">
+			AND om.type=#{type,jdbcType=VARCHAR}
+		</if>
+		<if test="depNo !=null">
+			AND om.dep_no=#{depNo,jdbcType=VARCHAR}
+		</if>
+		<if test="page_sql != null">
+    		${page_sql}
+   		</if>
 	</select>
 	<select id="selectOrganizationCount" resultType="java.lang.Integer">
 		select
 		count(0)
-		from 
-		(select
-		id
-		from idorganization_management
-		)	
+		from department_management om
+		where
+		om.deleted_sign='0'
+		<if test="name !=null">
+			AND om.name=#{name,jdbcType=VARCHAR}
+		</if>
+		<if test="superId !=null">
+			AND om.super_id=#{superId,jdbcType=VARCHAR}
+		</if>
+		<if test="type !=null">
+			AND om.type=#{type,jdbcType=VARCHAR}
+		</if>
+		<if test="depNo !=null">
+			AND om.dep_no=#{depNo,jdbcType=VARCHAR}
+		</if>	
 	</select>
+	<select id="selectSuperId" resultType="com.goafanti.organization.bo.OrganizationListOut">
+		select
+		id,name,dep_no as depNo
+		from department_management
+		where
+		status ='0'
+	</select>
+	<insert id="insert1" parameterType="com.goafanti.organization.bo.OrganizationListOut">
+		insert into department_management(
+		id,create_id,create_time,update_time,deleted_sign,
+		name,type,manager_id,dep_no,super_id,desc,status)
+		values(#{id,jdbcType=VARCHAR},#{createId,jdbcType=VARCHAR},
+		#{createTime,jdbcType=VARCHAR},#{updateTime,jdbcType=VARCHAR},
+		#{deletedSign,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},
+		#{type,jdbcType=VARCHAR},#{managerId,jdbcType=VARCHAR},
+		#{depNo,jdbcType=VARCHAR},#{superId,jdbcType=VARCHAR},
+		#{desc,jdbcType=VARCHAR},#{status,jdbcType=VARCHAR})	
+	</insert>
+	<select id="selectDepNoByName" resultType="String">
+		select
+		dep_no as depNo
+		from department_management
+		where
+		name=#{name,jdbcType=VARCHAR}
+	</select>
+	<select id="selectDepNoCount" parameterType="String" resultType="java.lang.Integer">
+		select
+		count(0)
+		from department_management
+		where
+		<!-- dep_no like concat(#{depNo,jdbcType=VARCHAR},'%') -->
+		super_id=#{superId,jdbcType=VARCHAR}
+	</select>
+	<select id="selectName" resultType="com.goafanti.admin.bo.AdminListBo">
+		select
+		name
+		from admin
+		where
+		name  like concat('%',#{name,jdbcType=VARCHAR},'%')
+	</select>
+	<select id="selectAllById" resultType="com.goafanti.organization.bo.OrganizationListOut">
+		select
+		id,create_id as createId,create_time as createTime,
+		update_time as updateTime,deleted_sign as deletedSign,
+		name,type,manager_id as managerId,
+		dep_no as depNo,
+		super_id as superId,
+		remarks,status
+		from department_management
+		where 
+		id=#{id,jdbcType=VARCHAR}
+	</select>
+	<delete id="deleteById" parameterType="java.lang.String">
+	    delete from department_management
+	    where id = #{id,jdbcType=VARCHAR}
+  	</delete>
+  	<select id="selectAdminNameById" parameterType="java.lang.String" resultType="java.lang.String">
+  		select 
+  		name
+  		from admin
+  		where 
+  		id=#{id,jdbcType=VARCHAR}
+  	</select>
+  	<select id="selectIdByDepNo" parameterType="java.lang.String" resultType="java.lang.String">
+  		select
+  		id
+  		from department_management
+  		where
+  		dep_no=#{depNo,jdbcType=VARCHAR}
+  	</select>
+  	<select id="selectIDNBySuperId" parameterType="java.lang.String" resultType="com.goafanti.organization.bo.OrganizationListOut">
+  		select
+  		id,create_id as createId,create_time as createTime,
+		update_time as updateTime,deleted_sign as deletedSign,
+		name,type,manager_id as managerId,
+		dep_no as depNo,
+		super_id as superId,
+		remarks,status
+  		from department_management 		
+  		where
+  		super_id=#{superId,jdbcType=VARCHAR}
+  		order by dep_no
+  	</select>
+  	<update id="updateByNumber" parameterType="com.goafanti.organization.bo.OrganizationListOut">
+  		update department_management
+	    <set>
+	    	dep_no = #{depNo,jdbcType=VARCHAR}
+	    </set>
+	    where
+	    id=#{id,jdbcType=VARCHAR}
+  	</update>
+  	<select id="selectCountBySuperId" parameterType="String" resultType="java.lang.Integer">
+  		select
+		count(0)
+		from department_management
+		where
+		super_id=#{superId,jdbcType=VARCHAR}
+  	</select>
 </mapper>

+ 398 - 0
src/main/java/com/goafanti/common/mapper/ProjectSizeMapper.xml

@@ -0,0 +1,398 @@
+<?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.ProjectSizeMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.ProjectSize">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 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="pid" jdbcType="VARCHAR" property="pid" />
+    <result column="pname" jdbcType="VARCHAR" property="pname" />
+    <result column="price" jdbcType="DECIMAL" property="price" />
+    <result column="offset" jdbcType="DECIMAL" property="offset" />
+    <result column="activity_price" jdbcType="DECIMAL" property="activityPrice" />
+    <result column="activity_flag" jdbcType="VARCHAR" property="activityFlag" />
+    <result column="member_price" jdbcType="DECIMAL" property="memberPrice" />
+    <result column="status" jdbcType="INTEGER" 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 Mon Dec 04 15:29:25 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 Mon Dec 04 15:29:25 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 Mon Dec 04 15:29:25 CST 2017.
+    -->
+    id, create_id, create_time, update_time, pid, pname, price, offset, activity_price, 
+    activity_flag, member_price, status
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.ProjectSizeExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from project_size
+    <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 Mon Dec 04 15:29:25 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from project_size
+    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 Mon Dec 04 15:29:25 CST 2017.
+    -->
+    delete from project_size
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.ProjectSizeExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    delete from project_size
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.ProjectSize">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    insert into project_size (id, create_id, create_time, 
+      update_time, pid, pname, 
+      price, offset, activity_price, 
+      activity_flag, member_price, status
+      )
+    values (#{id,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{pid,jdbcType=VARCHAR}, #{pname,jdbcType=VARCHAR}, 
+      #{price,jdbcType=DECIMAL}, #{offset,jdbcType=DECIMAL}, #{activityPrice,jdbcType=DECIMAL}, 
+      #{activityFlag,jdbcType=VARCHAR}, #{memberPrice,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.ProjectSize">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    insert into project_size
+    <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="pid != null">
+        pid,
+      </if>
+      <if test="pname != null">
+        pname,
+      </if>
+      <if test="price != null">
+        price,
+      </if>
+      <if test="offset != null">
+        offset,
+      </if>
+      <if test="activityPrice != null">
+        activity_price,
+      </if>
+      <if test="activityFlag != null">
+        activity_flag,
+      </if>
+      <if test="memberPrice != null">
+        member_price,
+      </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="pid != null">
+        #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="pname != null">
+        #{pname,jdbcType=VARCHAR},
+      </if>
+      <if test="price != null">
+        #{price,jdbcType=DECIMAL},
+      </if>
+      <if test="offset != null">
+        #{offset,jdbcType=DECIMAL},
+      </if>
+      <if test="activityPrice != null">
+        #{activityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="activityFlag != null">
+        #{activityFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="memberPrice != null">
+        #{memberPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.ProjectSizeExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    select count(*) from project_size
+    <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 Mon Dec 04 15:29:25 CST 2017.
+    -->
+    update project_size
+    <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.pid != null">
+        pid = #{record.pid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pname != null">
+        pname = #{record.pname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.price != null">
+        price = #{record.price,jdbcType=DECIMAL},
+      </if>
+      <if test="record.offset != null">
+        offset = #{record.offset,jdbcType=DECIMAL},
+      </if>
+      <if test="record.activityPrice != null">
+        activity_price = #{record.activityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.activityFlag != null">
+        activity_flag = #{record.activityFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="record.memberPrice != null">
+        member_price = #{record.memberPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,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 Mon Dec 04 15:29:25 CST 2017.
+    -->
+    update project_size
+    set id = #{record.id,jdbcType=VARCHAR},
+      create_id = #{record.createId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      pid = #{record.pid,jdbcType=VARCHAR},
+      pname = #{record.pname,jdbcType=VARCHAR},
+      price = #{record.price,jdbcType=DECIMAL},
+      offset = #{record.offset,jdbcType=DECIMAL},
+      activity_price = #{record.activityPrice,jdbcType=DECIMAL},
+      activity_flag = #{record.activityFlag,jdbcType=VARCHAR},
+      member_price = #{record.memberPrice,jdbcType=DECIMAL},
+      status = #{record.status,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.ProjectSize">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    update project_size
+    <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="pid != null">
+        pid = #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="pname != null">
+        pname = #{pname,jdbcType=VARCHAR},
+      </if>
+      <if test="price != null">
+        price = #{price,jdbcType=DECIMAL},
+      </if>
+      <if test="offset != null">
+        offset = #{offset,jdbcType=DECIMAL},
+      </if>
+      <if test="activityPrice != null">
+        activity_price = #{activityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="activityFlag != null">
+        activity_flag = #{activityFlag,jdbcType=VARCHAR},
+      </if>
+      <if test="memberPrice != null">
+        member_price = #{memberPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.ProjectSize">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Dec 04 15:29:25 CST 2017.
+    -->
+    update project_size
+    set create_id = #{createId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      pid = #{pid,jdbcType=VARCHAR},
+      pname = #{pname,jdbcType=VARCHAR},
+      price = #{price,jdbcType=DECIMAL},
+      offset = #{offset,jdbcType=DECIMAL},
+      activity_price = #{activityPrice,jdbcType=DECIMAL},
+      activity_flag = #{activityFlag,jdbcType=VARCHAR},
+      member_price = #{memberPrice,jdbcType=DECIMAL},
+      status = #{status,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 491 - 0
src/main/java/com/goafanti/common/model/BusinessProject.java

@@ -0,0 +1,491 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class BusinessProject {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.id
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.create_id
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String createId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.create_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.update_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private Date updateTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.delete_sign
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private Integer deleteSign;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.bname
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String bname;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.cid
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String cid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private BigDecimal price;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.offset
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private BigDecimal offset;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.activity_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private BigDecimal activityPrice;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.activity_flag
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String activityFlag;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.member_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private BigDecimal memberPrice;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.introduce
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String introduce;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.status
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String status;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.country
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String country;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.province
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String province;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.city
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String city;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.district
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String district;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.principal_id
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String principalId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.Value_effect
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String valueEffect;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.client_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String clientSize;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.id
+	 * @return  the value of business_project.id
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.id
+	 * @param id  the value for business_project.id
+	 * @mbg.generated  Mon Dec 04 15:29:25 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_project.create_id
+	 * @return  the value of business_project.create_id
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getCreateId() {
+		return createId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.create_id
+	 * @param createId  the value for business_project.create_id
+	 * @mbg.generated  Mon Dec 04 15:29:25 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_project.create_time
+	 * @return  the value of business_project.create_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.create_time
+	 * @param createTime  the value for business_project.create_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 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_project.update_time
+	 * @return  the value of business_project.update_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.update_time
+	 * @param updateTime  the value for business_project.update_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 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_project.delete_sign
+	 * @return  the value of business_project.delete_sign
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public Integer getDeleteSign() {
+		return deleteSign;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.delete_sign
+	 * @param deleteSign  the value for business_project.delete_sign
+	 * @mbg.generated  Mon Dec 04 15:29:25 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_project.bname
+	 * @return  the value of business_project.bname
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getBname() {
+		return bname;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.bname
+	 * @param bname  the value for business_project.bname
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setBname(String bname) {
+		this.bname = bname;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.cid
+	 * @return  the value of business_project.cid
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getCid() {
+		return cid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.cid
+	 * @param cid  the value for business_project.cid
+	 * @mbg.generated  Mon Dec 04 15:29:25 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_project.price
+	 * @return  the value of business_project.price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public BigDecimal getPrice() {
+		return price;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.price
+	 * @param price  the value for business_project.price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setPrice(BigDecimal price) {
+		this.price = price;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.offset
+	 * @return  the value of business_project.offset
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public BigDecimal getOffset() {
+		return offset;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.offset
+	 * @param offset  the value for business_project.offset
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setOffset(BigDecimal offset) {
+		this.offset = offset;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.activity_price
+	 * @return  the value of business_project.activity_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public BigDecimal getActivityPrice() {
+		return activityPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.activity_price
+	 * @param activityPrice  the value for business_project.activity_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setActivityPrice(BigDecimal activityPrice) {
+		this.activityPrice = activityPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.activity_flag
+	 * @return  the value of business_project.activity_flag
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getActivityFlag() {
+		return activityFlag;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.activity_flag
+	 * @param activityFlag  the value for business_project.activity_flag
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setActivityFlag(String activityFlag) {
+		this.activityFlag = activityFlag;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.member_price
+	 * @return  the value of business_project.member_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public BigDecimal getMemberPrice() {
+		return memberPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.member_price
+	 * @param memberPrice  the value for business_project.member_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setMemberPrice(BigDecimal memberPrice) {
+		this.memberPrice = memberPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.introduce
+	 * @return  the value of business_project.introduce
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getIntroduce() {
+		return introduce;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.introduce
+	 * @param introduce  the value for business_project.introduce
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setIntroduce(String introduce) {
+		this.introduce = introduce;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.status
+	 * @return  the value of business_project.status
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.status
+	 * @param status  the value for business_project.status
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.country
+	 * @return  the value of business_project.country
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getCountry() {
+		return country;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.country
+	 * @param country  the value for business_project.country
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.province
+	 * @return  the value of business_project.province
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getProvince() {
+		return province;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.province
+	 * @param province  the value for business_project.province
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setProvince(String province) {
+		this.province = province;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.city
+	 * @return  the value of business_project.city
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getCity() {
+		return city;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.city
+	 * @param city  the value for business_project.city
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.district
+	 * @return  the value of business_project.district
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getDistrict() {
+		return district;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.district
+	 * @param district  the value for business_project.district
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setDistrict(String district) {
+		this.district = district;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.principal_id
+	 * @return  the value of business_project.principal_id
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getPrincipalId() {
+		return principalId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.principal_id
+	 * @param principalId  the value for business_project.principal_id
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setPrincipalId(String principalId) {
+		this.principalId = principalId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.Value_effect
+	 * @return  the value of business_project.Value_effect
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getValueEffect() {
+		return valueEffect;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.Value_effect
+	 * @param valueEffect  the value for business_project.Value_effect
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setValueEffect(String valueEffect) {
+		this.valueEffect = valueEffect;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.client_size
+	 * @return  the value of business_project.client_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getClientSize() {
+		return clientSize;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.client_size
+	 * @param clientSize  the value for business_project.client_size
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setClientSize(String clientSize) {
+		this.clientSize = clientSize;
+	}
+}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1663 - 0
src/main/java/com/goafanti/common/model/BusinessProjectExample.java


+ 177 - 46
src/main/java/com/goafanti/common/model/BusinessVarieties.java

@@ -3,86 +3,217 @@ package com.goafanti.common.model;
 import java.util.Date;
 
 public class BusinessVarieties {
-	/*分类ID*/
+	/**
+	 * 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;
-	/*创建人*/
-	private String create_id;
-	/*创建时间*/
-	private Date create_time;
-	/*更新时间*/
-	private Date update_time;
-	/*删除标识*/
-	private Integer delete_sign;
-	/*分类编号*/
+	/**
+	 * 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;
-	/*父分类*/
-	private String super_id;
-	/*分类层级*/
+	/**
+	 * 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;
 	}
-	public String getCreate_id() {
-		return create_id;
-	}
-	public void setCreate_id(String create_id) {
-		this.create_id = create_id;
-	}
-	public Date getCreate_time() {
-		return create_time;
-	}
-	public void setCreate_time(Date create_time) {
-		this.create_time = create_time;
-	}
-	public Date getUpdate_time() {
-		return update_time;
-	}
-	public void setUpdate_time(Date update_time) {
-		this.update_time = update_time;
-	}
-	public Integer getDelete_sign() {
-		return delete_sign;
-	}
-	public void setDelete_sign(Integer delete_sign) {
-		this.delete_sign = delete_sign;
-	}
+	/**
+	 * 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;
 	}
-	public String getSuper_id() {
-		return super_id;
-	}
-	public void setSuper_id(String super_id) {
-		this.super_id = super_id;
-	}
+	/**
+	 * 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);
+        }
+    }
+}

+ 283 - 0
src/main/java/com/goafanti/common/model/OrganizationManagement.java

@@ -0,0 +1,283 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class OrganizationManagement {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.create_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String createId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.create_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.update_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private Date updateTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.deleted_sign
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String deletedSign;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.name
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String name;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.type
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String type;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.manager_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String managerId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.dep_no
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String depNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.super_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String superId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.remarks
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String remarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column organization_management.status
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	private String status;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.id
+	 * @return  the value of organization_management.id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.id
+	 * @param id  the value for organization_management.id
+	 * @mbg.generated  Thu Nov 30 11:09:29 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 organization_management.create_id
+	 * @return  the value of organization_management.create_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getCreateId() {
+		return createId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.create_id
+	 * @param createId  the value for organization_management.create_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 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 organization_management.create_time
+	 * @return  the value of organization_management.create_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.create_time
+	 * @param createTime  the value for organization_management.create_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 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 organization_management.update_time
+	 * @return  the value of organization_management.update_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.update_time
+	 * @param updateTime  the value for organization_management.update_time
+	 * @mbg.generated  Thu Nov 30 11:09:29 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 organization_management.deleted_sign
+	 * @return  the value of organization_management.deleted_sign
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getDeletedSign() {
+		return deletedSign;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.deleted_sign
+	 * @param deletedSign  the value for organization_management.deleted_sign
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setDeletedSign(String deletedSign) {
+		this.deletedSign = deletedSign;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.name
+	 * @return  the value of organization_management.name
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.name
+	 * @param name  the value for organization_management.name
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.type
+	 * @return  the value of organization_management.type
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.type
+	 * @param type  the value for organization_management.type
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.manager_id
+	 * @return  the value of organization_management.manager_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getManagerId() {
+		return managerId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.manager_id
+	 * @param managerId  the value for organization_management.manager_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setManagerId(String managerId) {
+		this.managerId = managerId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.dep_no
+	 * @return  the value of organization_management.dep_no
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getDepNo() {
+		return depNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.dep_no
+	 * @param depNo  the value for organization_management.dep_no
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setDepNo(String depNo) {
+		this.depNo = depNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.super_id
+	 * @return  the value of organization_management.super_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getSuperId() {
+		return superId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.super_id
+	 * @param superId  the value for organization_management.super_id
+	 * @mbg.generated  Thu Nov 30 11:09:29 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 organization_management.remarks
+	 * @return  the value of organization_management.remarks
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.remarks
+	 * @param remarks  the value for organization_management.remarks
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.status
+	 * @return  the value of organization_management.status
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column organization_management.status
+	 * @param status  the value for organization_management.status
+	 * @mbg.generated  Thu Nov 30 11:09:29 CST 2017
+	 */
+	public void setStatus(String status) {
+		this.status = status;
+	}
+}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1082 - 0
src/main/java/com/goafanti/common/model/OrganizationManagementExample.java


+ 284 - 0
src/main/java/com/goafanti/common/model/ProjectSize.java

@@ -0,0 +1,284 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ProjectSize {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.id
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.create_id
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String createId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.create_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.update_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private Date updateTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.pid
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String pid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.pname
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String pname;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private BigDecimal price;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.offset
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private BigDecimal offset;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.activity_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private BigDecimal activityPrice;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.activity_flag
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private String activityFlag;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.member_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private BigDecimal memberPrice;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project_size.status
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	private Integer status;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column project_size.id
+	 * @return  the value of project_size.id
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.id
+	 * @param id  the value for project_size.id
+	 * @mbg.generated  Mon Dec 04 15:29:25 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 project_size.create_id
+	 * @return  the value of project_size.create_id
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getCreateId() {
+		return createId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.create_id
+	 * @param createId  the value for project_size.create_id
+	 * @mbg.generated  Mon Dec 04 15:29:25 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 project_size.create_time
+	 * @return  the value of project_size.create_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.create_time
+	 * @param createTime  the value for project_size.create_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 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 project_size.update_time
+	 * @return  the value of project_size.update_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.update_time
+	 * @param updateTime  the value for project_size.update_time
+	 * @mbg.generated  Mon Dec 04 15:29:25 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 project_size.pid
+	 * @return  the value of project_size.pid
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getPid() {
+		return pid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.pid
+	 * @param pid  the value for project_size.pid
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column project_size.pname
+	 * @return  the value of project_size.pname
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getPname() {
+		return pname;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.pname
+	 * @param pname  the value for project_size.pname
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setPname(String pname) {
+		this.pname = pname;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column project_size.price
+	 * @return  the value of project_size.price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public BigDecimal getPrice() {
+		return price;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.price
+	 * @param price  the value for project_size.price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setPrice(BigDecimal price) {
+		this.price = price;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column project_size.offset
+	 * @return  the value of project_size.offset
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public BigDecimal getOffset() {
+		return offset;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.offset
+	 * @param offset  the value for project_size.offset
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setOffset(BigDecimal offset) {
+		this.offset = offset;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column project_size.activity_price
+	 * @return  the value of project_size.activity_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public BigDecimal getActivityPrice() {
+		return activityPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.activity_price
+	 * @param activityPrice  the value for project_size.activity_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setActivityPrice(BigDecimal activityPrice) {
+		this.activityPrice = activityPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column project_size.activity_flag
+	 * @return  the value of project_size.activity_flag
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public String getActivityFlag() {
+		return activityFlag;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.activity_flag
+	 * @param activityFlag  the value for project_size.activity_flag
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setActivityFlag(String activityFlag) {
+		this.activityFlag = activityFlag;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column project_size.member_price
+	 * @return  the value of project_size.member_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public BigDecimal getMemberPrice() {
+		return memberPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.member_price
+	 * @param memberPrice  the value for project_size.member_price
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setMemberPrice(BigDecimal memberPrice) {
+		this.memberPrice = memberPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column project_size.status
+	 * @return  the value of project_size.status
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project_size.status
+	 * @param status  the value for project_size.status
+	 * @mbg.generated  Mon Dec 04 15:29:25 CST 2017
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1033 - 0
src/main/java/com/goafanti/common/model/ProjectSizeExample.java


+ 12 - 0
src/main/java/com/goafanti/demand/bo/InputDemand.java

@@ -133,6 +133,18 @@ public class InputDemand {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer boutique;
 	
+	@Max(value = 500, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer remark;
+	
+	public Integer getRemark() {
+		return remark;
+	}
+
+	public void setRemark(Integer remark) {
+		this.remark = remark;
+	}
+
 	public String getId() {
 		return id;
 	}

+ 25 - 13
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -8,9 +8,9 @@ public class OrganizationListOut {
 	/**创建人**/
 	private String createId;
 	/**创建时间**/
-	private String updateTime;
+	private String createTime;
 	/**更新时间**/
-	private String datetime;
+	private String updateTime;
 	/**删除标识**/
 	private String deletedSign;
 	/**组织名称**/
@@ -24,7 +24,9 @@ public class OrganizationListOut {
 	/**上级组织**/
 	private String superId;
 	/**组织职能说明**/
-	private String desc;
+	private String remarks;
+	/**组织状态**/
+	private String status;
 	public String getUid() {
 		return uid;
 	}
@@ -43,18 +45,18 @@ public class OrganizationListOut {
 	public void setCreateId(String createId) {
 		this.createId = createId;
 	}
+	public String getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
 	public String getUpdateTime() {
 		return updateTime;
 	}
 	public void setUpdateTime(String updateTime) {
 		this.updateTime = updateTime;
 	}
-	public String getDatetime() {
-		return datetime;
-	}
-	public void setDatetime(String datetime) {
-		this.datetime = datetime;
-	}
 	public String getDeletedSign() {
 		return deletedSign;
 	}
@@ -91,11 +93,21 @@ public class OrganizationListOut {
 	public void setSuperId(String superId) {
 		this.superId = superId;
 	}
-	public String getDesc() {
-		return desc;
+	public String getRemarks() {
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	public String getStatus() {
+		return status;
 	}
-	public void setDesc(String desc) {
-		this.desc = desc;
+	public void setStatus(String status) {
+		this.status = status;
 	}
+	
+	
+	
+	
 
 }

+ 80 - 1
src/main/java/com/goafanti/organization/controller/OrganizationManagementController.java

@@ -2,19 +2,26 @@ package com.goafanti.organization.controller;
 
 import javax.annotation.Resource;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.dao.OrganizationManagementMapper;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.service.OrganizationService;
 
 @RestController
 @RequestMapping("api/admin/organization")
-public class OrganizationManagementController {
+public class OrganizationManagementController extends BaseApiController{
 	@Resource
 	private OrganizationService organizationService;
+	@Autowired
+	private OrganizationManagementMapper organizationManagementMapper;
 	/**部门组织管理列表 **/
 	@RequestMapping(value = "/listOrganizationManagement" , method = RequestMethod.POST)
 	public Result listOrganizationManagement(OrganizationListOut olo, Integer pageNo,
@@ -23,4 +30,76 @@ public class OrganizationManagementController {
 		res.setData(organizationService.listOrganizationManagement(olo, pageNo, pageSize));
 		return res;		
 	}
+	/**部门组织管理上级组织查询 **/
+	@RequestMapping(value = "/selectSuperId" , method = RequestMethod.POST)
+	public Result selectsuperId(){
+		Result res = new Result();
+		res.setData(organizationService.selectSuperId());
+		return res;
+	}
+	/**部门组织管理新增**/
+	@RequestMapping(value = "/addOrganization" , method = RequestMethod.POST)
+	public Result addOrganization(String name, String managerId, String type, String superId, String remarks) throws Exception{
+		Result res = new Result();
+		if(StringUtils.isBlank(name) || StringUtils.isBlank(type) 
+				|| StringUtils.isBlank(superId)){
+			res.getError().add(buildError("","组织名称、组织类型、上级组织不能为空"));
+			return res;
+		}
+		String olo=organizationManagementMapper.selectDepNoByName(name);
+		if(olo!=null){
+			res.getError().add(buildError("","部门已存在"));
+			return res;
+		}
+		organizationService.addOrganization(name, managerId, type, superId, remarks);
+		return res;
+	}
+	/**负责人自动补全查询**/
+	@RequestMapping(value = "/selectName" , method = RequestMethod.POST)
+	public Result selectName(String name){
+		Result res = new Result();
+		res.setData(organizationService.selectName(name));
+		return res;
+	}
+	/**编辑页面数据读取**/
+	@RequestMapping(value = "/selectAllById" , method = RequestMethod.POST)
+	public OrganizationListOut selectAllById(String id){
+		OrganizationListOut res = organizationService.selectAllById(id);
+		return res;
+	}
+	/**修改信息**/
+	@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
+	public Result updateOrganization(String name, String type, String managerId, String superId, String status,
+			String remarks,String id){
+		Result res = new Result();
+		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
+				|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
+				|| StringUtils.isBlank(status)|| StringUtils.isBlank(remarks)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
+			return res;
+		}
+		organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id);
+		return res;
+	}
+	
+	
+	/**删除列表信息**/
+	@RequestMapping(value = "/deleteById" , method = RequestMethod.POST)
+	public Result deleteById(String id){
+		Result res = new Result();
+		if(StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "id"));
+			return res;
+		}
+		OrganizationListOut olo=organizationManagementMapper.selectAllById(id);
+		String superId=olo.getName();
+		int subordinate=organizationManagementMapper.selectCountBySuperId(superId);
+		if(subordinate>0){
+			res.getError().add(buildError("","存在下级组织不能删除"));
+			return res;
+		}
+		organizationService.deleteById(id);
+		return res;
+	}
+	
 }

+ 28 - 0
src/main/java/com/goafanti/organization/service/OrganizationService.java

@@ -1,5 +1,8 @@
 package com.goafanti.organization.service;
 
+import java.util.List;
+
+import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.organization.bo.OrganizationListOut;
 
@@ -13,4 +16,29 @@ public interface OrganizationService {
 	 */
 	Pagination<OrganizationListOut> 
 	listOrganizationManagement(OrganizationListOut olo,Integer pageNo, Integer pageSize);
+	/**组织名称查上级组织*/
+	List<OrganizationListOut> selectSuperId();
+	/**
+	 * 
+	 * @param name 组织名称
+	 * @param managerId 负责人ID
+	 * @param type 组织类型
+	 * @param superId 上级组织
+	 * @param desc 组织职能说明
+	 * @return
+	 */
+	int addOrganization(String name,String managerId,String type,String superId,String desc);
+	/**
+	 * 模糊查询负责人名称
+	 * @param name
+	 * @return
+	 */
+	List<AdminListBo> selectName(String name);
+	
+	OrganizationListOut selectAllById(String id);
+	
+	int deleteById(String id);
+	
+	int updateOrganization(String name,String type,String managerId,String superId,String status,String remarks,String id);
+	
 }

+ 204 - 15
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -1,24 +1,31 @@
 package com.goafanti.organization.service.impl;
 
+import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.goafanti.organization.service.OrganizationService;
-import com.goafanti.common.dao.UserMapper;
+import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.common.dao.OrganizationManagementMapper;
+import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 @Service
-public class OrganizationServiceImpl extends BaseMybatisDao<UserMapper> implements OrganizationService {
-	
+public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManagementMapper> implements OrganizationService {
+	@Autowired
+	private OrganizationManagementMapper organizationManagementMapper;
 	@Override
 	public Pagination<OrganizationListOut> listOrganizationManagement(OrganizationListOut olo, Integer pageNo,
 			Integer pageSize) {
-		olo.setId(TokenManager.getAdminId());
+		/*olo.setCreateId(TokenManager.getAdminId());*/
 		Map<String,Object> params =disposeParams(olo);
 		@SuppressWarnings("unchecked")
 		Pagination<OrganizationListOut> list=(Pagination<OrganizationListOut>)findPage("selectOrganizationList","selectOrganizationCount",params,pageNo,pageSize);
@@ -27,19 +34,201 @@ public class OrganizationServiceImpl extends BaseMybatisDao<UserMapper> implemen
 	private Map<String,Object> disposeParams(OrganizationListOut olo){
 		Map<String,Object> params = new HashMap<String, Object>();		
 		if(StringUtils.isNotBlank(olo.getId())) params.put("id", olo.getId());
-		if(StringUtils.isNotBlank(olo.getCreateId())) params.put("id", olo.getCreateId());
-		if(StringUtils.isNotBlank(olo.getUpdateTime())) params.put("id", olo.getUpdateTime());
-		if(StringUtils.isNotBlank(olo.getDatetime())) params.put("id", olo.getDatetime());
-		if(StringUtils.isNotBlank(olo.getDeletedSign())) params.put("id", olo.getDeletedSign());
-		if(StringUtils.isNotBlank(olo.getName())) params.put("id", olo.getName());
+		if(StringUtils.isNotBlank(olo.getCreateId())) params.put("createId", olo.getCreateId());
+		if(StringUtils.isNotBlank(olo.getCreateTime())) params.put("createTime", olo.getCreateTime());
+		if(StringUtils.isNotBlank(olo.getUpdateTime())) params.put("updateTime", olo.getUpdateTime());
+		if(StringUtils.isNotBlank(olo.getDeletedSign())) params.put("deletedSign", olo.getDeletedSign());
+		if(StringUtils.isNotBlank(olo.getName())) params.put("name", olo.getName());
 		if(StringUtils.isNotBlank(olo.getType())) params.put("type", olo.getType());
-		if(StringUtils.isNotBlank(olo.getManagerId())) params.put("id", olo.getManagerId());
-		if(StringUtils.isNotBlank(olo.getDepNo())) params.put("id", olo.getDepNo());
-		if(StringUtils.isNotBlank(olo.getSuperId())) params.put("id", olo.getSuperId());
-		if(StringUtils.isNotBlank(olo.getDesc())) params.put("id", olo.getDesc());
+		if(StringUtils.isNotBlank(olo.getManagerId())) params.put("managerId", olo.getManagerId());
+		if(StringUtils.isNotBlank(olo.getDepNo())) params.put("depNo", olo.getDepNo());
+		if(StringUtils.isNotBlank(olo.getSuperId())) params.put("superId", olo.getSuperId());
+		if(StringUtils.isNotBlank(olo.getRemarks())) params.put("remarks", olo.getRemarks());
+		if(StringUtils.isNotBlank(olo.getStatus())) params.put("status", olo.getStatus());
 		return params;
 	}
+	@Override
+	public List<OrganizationListOut> selectSuperId() {
+		return organizationManagementMapper.selectSuperId();
+	}
+	/**
+	 *   XXIn form 提交 ,bo包中
+	 *   xxOut 输出 bo包中
+	 *   domain 类 model中
+	 *
+	 */
+	@Override
+	public int addOrganization(String name, String managerId, String type, String superId, String remarks) {
+		String id = UUID.randomUUID().toString();
+		Date now = new Date();
+		OrganizationManagement om=new OrganizationManagement(); 
+		om.setId(id);
+		String createId =organizationManagementMapper.selectAdminNameById(TokenManager.getAdminId());
+		om.setCreateId(createId);
+		om.setCreateTime(now);
+		om.setUpdateTime(now);
+		om.setDeletedSign("0");
+		om.setName(name);
+		om.setType(type);
+		om.setManagerId(managerId);
+		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
+		int Count=organizationManagementMapper.selectDepNoCount(superId);
+		if(Count<10){
+			String dep=sdepNo+"0"+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=Count+1;				
+				if(Count>=10){
+					dep=sdepNo+Count;	
+				}else{
+					dep=sdepNo+"0"+Count;
+				}
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			om.setDepNo(dep);
+		}
+		if(Count>=10){
+			String dep=sdepNo+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=Count+1;				
+				dep=sdepNo+Count;
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			om.setDepNo(dep);
+		}
+		om.setSuperId(superId);
+		om.setRemarks(remarks);
+		om.setStatus("0");
+		organizationManagementMapper.insert(om);
+		return 1;
+	}
+	@Override
+	public List<AdminListBo> selectName(String name) {
+		List<AdminListBo> list=organizationManagementMapper.selectName(name);
+		return list;
+	}
+	@Override
+	public OrganizationListOut selectAllById(String id) {
+		OrganizationListOut olo=organizationManagementMapper.selectAllById(id);
+		return olo;
+	}
+	@Override
+	public int deleteById(String id) {
+		organizationManagementMapper.deleteById(id);
+		return 1;
+	}
+	@Override
+	public int updateOrganization(String name, String type, String managerId, String superId, String status,
+			String remarks,String id) {
+		Date now=new Date();
+		OrganizationManagement om=new OrganizationManagement();
+		om.setName(name);
+		om.setType(type);
+		om.setUpdateTime(now);
+		om.setManagerId(managerId);
+		om.setSuperId(superId);
+		String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
+		int Count=organizationManagementMapper.selectDepNoCount(superId);
+		if(Count<10){
+			String dep=sdepNo+"0"+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=Count+1;				
+				if(Count>=10){
+					dep=sdepNo+Count;	
+				}else{
+					dep=sdepNo+"0"+Count;
+				}
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			om.setDepNo(dep);
+		}
+		if(Count>=10){
+			String dep=sdepNo+Count;
+			String sid=organizationManagementMapper.selectIdByDepNo(dep);
+			while(sid!=null){
+				Count=Count+1;				
+				dep=sdepNo+Count;
+				sid=organizationManagementMapper.selectIdByDepNo(dep);				
+			}
+			om.setDepNo(dep);
+		}
+		om.setStatus(status);
+		om.setRemarks(remarks);
+		om.setId(id);
+		organizationManagementMapper.updateByPrimaryKeySelective(om);
+		//*******下级编号修改
+		int n=0;
+		List<OrganizationListOut> Nos =organizationManagementMapper.selectIDNBySuperId(name);
+		for(OrganizationListOut i:Nos){			
+			sdepNo=organizationManagementMapper.selectDepNoByName(i.getSuperId());
+			if(n<10){
+				String dep=sdepNo+"0"+n;			
+				if(n>=10){
+					dep=sdepNo+n;	
+				}else{
+					dep=sdepNo+"0"+n;
+				}	
+				i.setDepNo(dep);
+			}
+			if(n>=10){
+				String dep=sdepNo+n;			
+				dep=sdepNo+n;	
+				i.setDepNo(dep);
+			}
+			organizationManagementMapper.updateByNumber(i);
+			n++;
+			
+			//*******下下级编号修改
+			int m=0;
+			List<OrganizationListOut> Noss =organizationManagementMapper.selectIDNBySuperId(i.getName());
+			System.out.println("noss="+Noss);
+			for(OrganizationListOut o:Noss){			
+				sdepNo=organizationManagementMapper.selectDepNoByName(o.getSuperId());
+				if(m<10){
+					String dep=sdepNo+"0"+m;			
+					if(m>=10){
+						dep=sdepNo+m;	
+					}else{
+						dep=sdepNo+"0"+m;
+					}	
+					o.setDepNo(dep);
+				}
+				if(m>=10){
+					String dep=sdepNo+m;			
+					dep=sdepNo+m;	
+					o.setDepNo(dep);
+				}
+				organizationManagementMapper.updateByNumber(o);
+				m++;
+				
+				//*******下下级编号修改
+				int z=0;
+				List<OrganizationListOut> Nosss =organizationManagementMapper.selectIDNBySuperId(o.getName());
+				for(OrganizationListOut p:Nosss){			
+					sdepNo=organizationManagementMapper.selectDepNoByName(p.getSuperId());
+					if(z<10){
+						String dep=sdepNo+"0"+z;			
+						if(z>=10){
+							dep=sdepNo+z;	
+						}else{
+							dep=sdepNo+"0"+z;
+						}	
+						p.setDepNo(dep);
+					}
+					if(z>=10){
+						String dep=sdepNo+z;			
+						dep=sdepNo+z;	
+						p.setDepNo(dep);
+					}
+					organizationManagementMapper.updateByNumber(p);
+					z++;
+					
+				}
+			}
+		}
+		return 1;
+	}
 
-	
-	
 }

+ 2 - 0
src/main/resources/props/error.properties

@@ -25,6 +25,8 @@ PARAM_INTEGER_ERROR={0}\u53C2\u6570\u5FC5\u987B\u4E3A\u6570\u5B57\u3002
 
 PARAM_EMPTY_ERROR={0}\u5FC5\u987B\u6307\u5B9A\u3002
 
+PARAM_BEING_ERROR={0}\u5df2\u5b58\u5728\u000d\u000a
+
 PARAM_SIZE_ERROR={0}\u53C2\u6570\u957F\u5EA6\u4E0D\u6B63\u786E\uFF0C\u5FC5\u987B\u5728{min}\u548C{max}\u4E4B\u95F4\u3002
 
 PARAM_PATTERN_ERROR={0}\u53C2\u6570\u683C\u5F0F\u987B\u6B63\u786E\u6307\u5B9A{1}\u3002