Преглед изворни кода

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

wanghui пре 8 година
родитељ
комит
31f6e32e12
26 измењених фајлова са 1654 додато и 1235 уклоњено
  1. 1 0
      GeneratorConfig.xml
  2. 15 0
      src/main/java/com/goafanti/achievement/service/impl/AchievementInterestServiceImpl.java
  3. 25 0
      src/main/java/com/goafanti/app/bo/ProjectBo.java
  4. 1 1
      src/main/java/com/goafanti/app/controller/AppServiceController.java
  5. 0 1
      src/main/java/com/goafanti/app/controller/AppUserController.java
  6. 15 0
      src/main/java/com/goafanti/business/bo/BusinessProjectBo.java
  7. 8 0
      src/main/java/com/goafanti/business/bo/BusinessVarietiesBo.java
  8. 26 0
      src/main/java/com/goafanti/business/controller/AdminVarietiesApiController.java
  9. 2 0
      src/main/java/com/goafanti/business/service/BusinessVarietiesService.java
  10. 2 10
      src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java
  11. 28 2
      src/main/java/com/goafanti/business/service/impl/BusinessVarietiesServiceImpl.java
  12. 11 11
      src/main/java/com/goafanti/common/dao/BusinessProjectMapper.java
  13. 61 78
      src/main/java/com/goafanti/common/dao/BusinessVarietiesMapper.java
  14. 2 0
      src/main/java/com/goafanti/common/dao/ProjectInterestMapper.java
  15. 2 1
      src/main/java/com/goafanti/common/enums/InterestType.java
  16. 1 1
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  17. 52 31
      src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml
  18. 70 31
      src/main/java/com/goafanti/common/mapper/BusinessVarietiesMapper.xml
  19. 24 1
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  20. 5 0
      src/main/java/com/goafanti/common/mapper/ProjectInterestMapper.xml
  21. 100 72
      src/main/java/com/goafanti/common/model/BusinessProject.java
  22. 86 16
      src/main/java/com/goafanti/common/model/BusinessProjectExample.java
  23. 68 32
      src/main/java/com/goafanti/common/model/BusinessVarieties.java
  24. 1032 943
      src/main/java/com/goafanti/common/model/BusinessVarietiesExample.java
  25. 3 3
      src/main/java/com/goafanti/common/model/ProjectInterest.java
  26. 14 1
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

+ 1 - 0
GeneratorConfig.xml

@@ -12,5 +12,6 @@
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="AFT" type="XMLMAPPER" />
     <!-- <table schema="aft" tableName="t_order"/> -->
     <table schema="aft" tableName="t_order_detail"/> 
+
   </context>
 </generatorConfiguration>

+ 15 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementInterestServiceImpl.java

@@ -15,11 +15,13 @@ import com.goafanti.achievement.service.AchievementInterestService;
 import com.goafanti.common.dao.AchievementInterestMapper;
 import com.goafanti.common.dao.DemandInterestMapper;
 import com.goafanti.common.dao.NewsInterestMapper;
+import com.goafanti.common.dao.ProjectInterestMapper;
 import com.goafanti.common.dao.UserInterestMapper;
 import com.goafanti.common.enums.InterestType;
 import com.goafanti.common.model.AchievementInterest;
 import com.goafanti.common.model.DemandInterest;
 import com.goafanti.common.model.NewsInterest;
+import com.goafanti.common.model.ProjectInterest;
 import com.goafanti.common.model.User;
 import com.goafanti.common.model.UserInterest;
 import com.goafanti.common.utils.StringUtils;
@@ -41,6 +43,8 @@ public class AchievementInterestServiceImpl extends BaseMybatisDao<AchievementIn
 	private UserInterestMapper userInterestMapper;
 	@Autowired
 	private NewsInterestMapper	newsInterestMapper;
+	@Autowired
+	private ProjectInterestMapper projectInterestMapper;
 	
 	
 	@Override
@@ -123,6 +127,14 @@ public class AchievementInterestServiceImpl extends BaseMybatisDao<AchievementIn
 			a.setCreateTime(new Date());
 			i=	achievementInterestMapper.insert(a);
 		}
+		if (type==InterestType.PROJECT.getCode()) {
+			ProjectInterest p=new ProjectInterest();
+			p.setId(UUID.randomUUID().toString());
+			p.setUid(uid);
+			p.setProjectId(objectId);
+			p.setCreateTime(new Date());
+			i=projectInterestMapper.insert(p);
+		}
 		if (i==1) {
 			return "关注成功";
 		}
@@ -148,6 +160,9 @@ public class AchievementInterestServiceImpl extends BaseMybatisDao<AchievementIn
 		if (type==InterestType.ACHIEVEMENT.getCode()) {
 			 i=achievementInterestMapper.deleteInterest(uid,objectId);
 		}
+		if (type==InterestType.PROJECT.getCode()) {
+			 i=projectInterestMapper.deleteInterest(uid,objectId);
+		}
 		if (i==1) {
 			return "取消关注成功";
 		}

+ 25 - 0
src/main/java/com/goafanti/app/bo/ProjectBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.app.bo;
 
+import com.goafanti.common.utils.StringUtils;
+
 public class ProjectBo {
 	private String id;
 	
@@ -10,6 +12,10 @@ public class ProjectBo {
 	private String introduce;
 	
 	private String interestCount;
+	
+	private String boutique;
+	
+	private String projectUrl;
 
 	public String getId() {
 		return id;
@@ -50,4 +56,23 @@ public class ProjectBo {
 	public void setInterestCount(String interestCount) {
 		this.interestCount = interestCount;
 	}
+
+	public String getBoutique() {
+		return boutique;
+	}
+
+	public void setBoutique(String boutique) {
+		this.boutique = boutique;
+	}
+
+	public String getProjectUrl() {
+		if (StringUtils.isBlank(projectUrl)) {
+			return "";
+		}
+		return projectUrl;
+	}
+
+	public void setProjectUrl(String projectUrl) {
+		this.projectUrl = projectUrl;
+	}
 }

+ 1 - 1
src/main/java/com/goafanti/app/controller/AppServiceController.java

@@ -16,7 +16,7 @@ import com.goafanti.user.service.UserIdentityService;
 
 
 @RestController
-@RequestMapping(path = "/app/service", method = RequestMethod.GET)
+@RequestMapping(path = "/open/app/service", method = RequestMethod.GET)
 public class AppServiceController extends BaseApiController {
 	@Resource
 	private BusinessVarietiesService	adminVarietiesService;

+ 0 - 1
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -252,7 +252,6 @@ public class AppUserController extends BaseApiController {
 		if (StringUtils.isNotBlank(TokenManager.getUserId())) {
 			uid=TokenManager.getUserId();
 		}
-		
 		if (Integer.valueOf(interest)==0) {
 			res.setData(achievementInterestService.saveInterest( uid, type, objectId,interest));
 		}else {

+ 15 - 0
src/main/java/com/goafanti/business/bo/BusinessProjectBo.java

@@ -125,6 +125,9 @@ public class BusinessProjectBo {
 	 */
 	private String minLogo;
 	
+	
+	private String projectUrl;
+	
 	/**
 	 * 分类名称
 	 */
@@ -610,5 +613,17 @@ public class BusinessProjectBo {
 	public void setBoutique(Integer boutique) {
 		this.boutique = boutique;
 	}
+
+
+
+	public String getProjectUrl() {
+		return projectUrl;
+	}
+
+
+
+	public void setProjectUrl(String projectUrl) {
+		this.projectUrl = projectUrl;
+	}
 	
 }

+ 8 - 0
src/main/java/com/goafanti/business/bo/BusinessVarietiesBo.java

@@ -33,6 +33,8 @@ public class BusinessVarietiesBo {
 	private String createName;
 	/*品类图标*/
 	private String varietiesLogo;
+	/*排序编号*/
+	private Integer sort;
 	
 	public String getSuperName() {
 		return superName;
@@ -120,6 +122,12 @@ public class BusinessVarietiesBo {
 	public void setVarietiesLogo(String varietiesLogo) {
 		this.varietiesLogo = varietiesLogo;
 	}
+	public Integer getSort() {
+		return sort;
+	}
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
 	
 	
 }

+ 26 - 0
src/main/java/com/goafanti/business/controller/AdminVarietiesApiController.java

@@ -13,6 +13,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 
 import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.dao.BusinessVarietiesMapper;
 import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.utils.StringUtils;
 @RestController
@@ -22,6 +23,8 @@ public class AdminVarietiesApiController extends CertifyApiController{
 	private BusinessVarietiesService businessVarietiesService;
 	@Resource
 	BusinessProjectService businessprojectService;
+	@Resource
+	BusinessVarietiesMapper	businessVarietiesMapper;
 	
 	/**
 	 * 新增品类
@@ -110,6 +113,10 @@ public class AdminVarietiesApiController extends CertifyApiController{
 			res.getError().add(buildError( "品类下级最多存在99个", "品类下级最多存在99个")); 
 			return res;
 		}
+		if (businessVarietiesService.getCountSon(superId)>99) {
+			res.getError().add(buildError( "品类下级最多存在99个", "品类下级最多存在99个")); 
+			return res;
+		}
 		res.setData(businessVarietiesService.updateVarietoes(id, cname, superId, status, varietiesLogo));
 		return res; 
 	}
@@ -155,5 +162,24 @@ public class AdminVarietiesApiController extends CertifyApiController{
 		}
 		return res;
 	}
+	/**
+	 * 品类显示位置更换
+	 */
+	@RequestMapping(value = "/locationChange", method = RequestMethod.GET)
+	public Result locationChange(String id,Integer sort,Integer flag){
+		Result res=new Result();
+		if (1==sort&&flag==1) {
+			res.getError().add(buildError("上移失败", "上移失败"));
+			return res;
+		}
+		
+		
+		if (sort>=Integer.valueOf(businessVarietiesMapper.getSortMax())&&flag==0) {
+			res.getError().add(buildError("下移失败", "下移失败"));
+			return res;
+		}
+		res.setData(businessVarietiesService.updateLocation(id,sort,flag));
+		return res;
+	}
 
 }

+ 2 - 0
src/main/java/com/goafanti/business/service/BusinessVarietiesService.java

@@ -32,5 +32,7 @@ public interface BusinessVarietiesService {
 	boolean ifLayer(String superId,String id);
 
 	List<VarietiesBo> getVarieties();
+
+	int  updateLocation(String id, Integer sort, Integer flag);
 }
 

+ 2 - 10
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -140,15 +140,12 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 	@Override
 	public BusinessProjectBo orgProjects(String id) {
 		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(id);
-		
 		BusinessProjectBo bpo=new BusinessProjectBo();
 		BeanUtils.copyProperties(bp,bpo);
 		String cname=getAllCname(bpo.getCid());
 		String createId=bpo.getCreateId();
 		bpo.setCreateName(businessProjectMapper.getCreateName(createId));
 		bpo.setCname(cname);
-		
-		
 		return bpo;
 	}
 	@Override
@@ -253,6 +250,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		bp.setMinLogo(s.getMinLogo());
 		bp.setMaxLogo(s.getMaxLogo());
 		bp.setBoutique(s.getBoutique());
+		bp.setProjectUrl(s.getProjectUrl());
 		if (null!=(s.getStatus())) {
 			bp.setStatus(s.getStatus());
 		}
@@ -401,14 +399,8 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 			pSize = 10;
 		}
 		Map<String, Object> params = new HashMap<>();
-		
-		Pagination<ProjectBo> p=(Pagination<ProjectBo>)findPage("findRecommendProjectListByPage", "findRecommendProjectListCount",
+		return (Pagination<ProjectBo>)findPage("findRecommendProjectListByPage", "findRecommendProjectListCount",
 				params,pNo,pSize);
-		List<ProjectBo> l=(List<ProjectBo>) p.getList();
-		for (ProjectBo pb : l) {
-			pb.setInterestCount(String.valueOf(projectInterestMapper.countInterest(pb.getId())));
-		}
-		return p;
 	}
 	@Override
 	public boolean checkProject(String id) {

+ 28 - 2
src/main/java/com/goafanti/business/service/impl/BusinessVarietiesServiceImpl.java

@@ -33,6 +33,11 @@ public class BusinessVarietiesServiceImpl extends BaseMybatisDao<BusinessVarieti
 		buv.setCname(cname);
 		buv.setSuperId(superId);
 		buv.setDeleteSign(0);
+		if (null!=businessVarietiesMapper.getSortMax()) {
+			Integer x=Integer.valueOf(businessVarietiesMapper.getSortMax());
+			x+=1;
+			buv.setSort(x);
+		}
 		String str=businessVarietiesMapper.getCidMax(superId);
 		String scid=businessVarietiesMapper.getCid(superId);
 		if (null==str) {
@@ -62,7 +67,7 @@ public class BusinessVarietiesServiceImpl extends BaseMybatisDao<BusinessVarieti
 			}
 			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");
@@ -70,9 +75,9 @@ public class BusinessVarietiesServiceImpl extends BaseMybatisDao<BusinessVarieti
 			buv.setCreateId(TokenManager.getAdminId());
 		}
 		buv.setStatus("0");
-		
 		BusinessVarieties bv=new BusinessVarieties();
 		BeanUtils.copyProperties(buv,bv);
+		bv.getSort();
 		return businessVarietiesMapper.insert(bv);
 		
 	}
@@ -240,6 +245,27 @@ public class BusinessVarietiesServiceImpl extends BaseMybatisDao<BusinessVarieti
 	public List<VarietiesBo> getVarieties() {
 		return businessVarietiesMapper.getVarieties();
 	}
+	@Override
+	public int updateLocation(String id, Integer sort, Integer flag) {
+		if (flag==0) {
+			Integer x=sort+1;
+			BusinessVarieties bv=businessVarietiesMapper.selectByPrimaryKey(id);
+			BusinessVarieties bv2=businessVarietiesMapper.selectBySort(x);
+			bv.setSort(bv.getSort()+1);
+			businessVarietiesMapper.updateByPrimaryKey(bv);
+			bv2.setSort(sort);
+			return businessVarietiesMapper.updateByPrimaryKey(bv2);
+		}else {
+			Integer x=sort-1;
+			BusinessVarieties bv=businessVarietiesMapper.selectByPrimaryKey(id);
+			BusinessVarieties bv2=businessVarietiesMapper.selectBySort(x);
+			bv.setSort(bv.getSort()-1);
+			businessVarietiesMapper.updateByPrimaryKey(bv);
+			bv2.setSort(sort);
+			return businessVarietiesMapper.updateByPrimaryKey(bv2);
+		}
+
+	}
 	
 }
 

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

@@ -11,68 +11,68 @@ public interface BusinessProjectMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	long countByExample(BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	int deleteByExample(BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	int insert(BusinessProject record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	int insertSelective(BusinessProject record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	List<BusinessProject> selectByExample(BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	BusinessProject selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	int updateByPrimaryKeySelective(BusinessProject record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	int updateByPrimaryKey(BusinessProject record);
 

+ 61 - 78
src/main/java/com/goafanti/common/dao/BusinessVarietiesMapper.java

@@ -9,94 +9,73 @@ 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  Tue Jan 09 15:08:39 CST 2018
+	 */
+	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  Tue Jan 09 15:08:39 CST 2018
+	 */
+	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  Tue Jan 09 15:08:39 CST 2018
+	 */
+	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  Tue Jan 09 15:08:39 CST 2018
+	 */
+	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  Tue Jan 09 15:08:39 CST 2018
+	 */
+	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  Tue Jan 09 15:08:39 CST 2018
+	 */
+	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  Tue Jan 09 15:08:39 CST 2018
+	 */
+	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  Tue Jan 09 15:08:39 CST 2018
+	 */
+	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  Tue Jan 09 15:08:39 CST 2018
+	 */
+	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  Tue Jan 09 15:08:39 CST 2018
+	 */
+	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);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_varieties
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
+	 */
+	int updateByPrimaryKey(BusinessVarieties record);
+
+	String getCount(String superId);
 	
 	String getCid(String superId);
 	
@@ -121,4 +100,8 @@ public interface BusinessVarietiesMapper {
 	List<VarietiesBo> getVarieties();
 
 	String getCidMax(String superId);
+
+	String getSortMax();
+
+	BusinessVarieties selectBySort(Integer sort);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/ProjectInterestMapper.java

@@ -97,4 +97,6 @@ public interface ProjectInterestMapper {
 	int  countInterest(String id);
 
 	int checkUidAndDid(@Param("projectId")String projectId,@Param("id") String id);
+
+	int deleteInterest(@Param("uid")String uid, @Param("objectId")String objectId);
 }

+ 2 - 1
src/main/java/com/goafanti/common/enums/InterestType.java

@@ -11,7 +11,8 @@ public enum InterestType {
 	EXPERTS(2, "专家"),
 	POLICY(3,"政策"),
 	UNAUDITED(4,"活动"),
-	OTHER(5, "其他");
+	PROJECT(5,"项目"),
+	OTHER(6, "其他");
 
 	private InterestType(Integer code, String desc) {
 		this.code = code;

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

@@ -1168,7 +1168,7 @@
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	
-	order by serial_number desc
+	order by a.boutique desc
 	<if test="page_sql!=null">
 			${page_sql}
 	</if>

+ 52 - 31
src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="create_id" jdbcType="VARCHAR" property="createId" />
@@ -31,12 +31,13 @@
     <result column="max_logo" jdbcType="VARCHAR" property="maxLogo" />
     <result column="min_logo" jdbcType="VARCHAR" property="minLogo" />
     <result column="boutique" jdbcType="INTEGER" property="boutique" />
+    <result column="project_url" jdbcType="VARCHAR" property="projectUrl" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -70,7 +71,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -104,17 +105,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     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, max_logo, min_logo, boutique
+    city, district, principal_id, Value_effect, client_size, max_logo, min_logo, boutique, 
+    project_url
   </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 Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     select
     <if test="distinct">
@@ -133,7 +135,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -144,7 +146,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     delete from business_project
     where id = #{id,jdbcType=VARCHAR}
@@ -153,7 +155,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     delete from business_project
     <if test="_parameter != null">
@@ -164,7 +166,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     insert into business_project (id, create_id, create_time, 
       update_time, delete_sign, bname, 
@@ -173,8 +175,8 @@
       introduce, status, country, 
       province, city, district, 
       principal_id, Value_effect, client_size, 
-      max_logo, min_logo, boutique
-      )
+      max_logo, min_logo, boutique, 
+      project_url)
     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}, 
@@ -182,14 +184,14 @@
       #{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}, 
-      #{maxLogo,jdbcType=VARCHAR}, #{minLogo,jdbcType=VARCHAR}, #{boutique,jdbcType=INTEGER}
-      )
+      #{maxLogo,jdbcType=VARCHAR}, #{minLogo,jdbcType=VARCHAR}, #{boutique,jdbcType=INTEGER}, 
+      #{projectUrl,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 Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     insert into business_project
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -265,6 +267,9 @@
       <if test="boutique != null">
         boutique,
       </if>
+      <if test="projectUrl != null">
+        project_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -339,13 +344,16 @@
       <if test="boutique != null">
         #{boutique,jdbcType=INTEGER},
       </if>
+      <if test="projectUrl != null">
+        #{projectUrl,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 Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     select count(*) from business_project
     <if test="_parameter != null">
@@ -356,7 +364,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     update business_project
     <set>
@@ -432,6 +440,9 @@
       <if test="record.boutique != null">
         boutique = #{record.boutique,jdbcType=INTEGER},
       </if>
+      <if test="record.projectUrl != null">
+        project_url = #{record.projectUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -441,7 +452,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     update business_project
     set id = #{record.id,jdbcType=VARCHAR},
@@ -467,7 +478,8 @@
       client_size = #{record.clientSize,jdbcType=VARCHAR},
       max_logo = #{record.maxLogo,jdbcType=VARCHAR},
       min_logo = #{record.minLogo,jdbcType=VARCHAR},
-      boutique = #{record.boutique,jdbcType=INTEGER}
+      boutique = #{record.boutique,jdbcType=INTEGER},
+      project_url = #{record.projectUrl,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -476,7 +488,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     update business_project
     <set>
@@ -549,6 +561,9 @@
       <if test="boutique != null">
         boutique = #{boutique,jdbcType=INTEGER},
       </if>
+      <if test="projectUrl != null">
+        project_url = #{projectUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -556,7 +571,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 02 13:57:47 CST 2018.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     update business_project
     set create_id = #{createId,jdbcType=VARCHAR},
@@ -581,7 +596,8 @@
       client_size = #{clientSize,jdbcType=VARCHAR},
       max_logo = #{maxLogo,jdbcType=VARCHAR},
       min_logo = #{minLogo,jdbcType=VARCHAR},
-      boutique = #{boutique,jdbcType=INTEGER}
+      boutique = #{boutique,jdbcType=INTEGER},
+      project_url = #{projectUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -698,7 +714,7 @@
     where bname = #{bname,jdbcType=VARCHAR}
   </select>
   <select id="getBusinessProject" resultType="com.goafanti.app.bo.ProjectBo">
-  select id,bname as name,min_logo as minLogoUrl,introduce
+  	select id,bname as name,min_logo as minLogoUrl,introduce,project_url as projectUrl
    from business_project
 	where delete_sign=0 
 	and status=0
@@ -722,11 +738,14 @@
   
   
   <select id="findRecommendProjectListByPage" resultType="com.goafanti.app.bo.ProjectBo">
- 		select id,bname as name,min_logo as minLogoUrl,introduce
-  		from business_project 
-  		where delete_sign=0 
-  		and status=0
-  		and boutique=1
+ 		select b.id,b.bname as name,b.min_logo as minLogoUrl,b.introduce,b.boutique,
+ 				ifnull(t.interestCount,0) as interestCount,project_url as projectUrl
+  		from business_project b
+  		left join (select count(0)  as interestCount ,project_id from project_interest 
+				group by project_id) t on b.id=t.project_id
+  		where b.delete_sign=0 
+  		and b.status=0
+  		order by b.boutique desc
   		<if test="page_sql!=null">
 			${page_sql}
 		</if>
@@ -734,9 +753,11 @@
   <select id="findRecommendProjectListCount" resultType="Integer">
  		select 
   			count(0)
-  		from business_project 
-  		where delete_sign=0 
-  		and status=0
+  		from business_project  b
+  		left join (select count(0)  as interestCount ,project_id from project_interest 
+				group by project_id) t on b.id=t.project_id
+  		where b.delete_sign=0 
+  		and b.status=0
   </select>
   
   <select id="selectAppProjectDetail" resultType="com.goafanti.app.bo.ProjectDetailBo">

+ 70 - 31
src/main/java/com/goafanti/common/mapper/BusinessVarietiesMapper.xml

@@ -1,11 +1,11 @@
 <?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" >
+<!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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="create_id" jdbcType="VARCHAR" property="createId" />
@@ -18,12 +18,13 @@
     <result column="layer" jdbcType="INTEGER" property="layer" />
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="varieties_logo" jdbcType="VARCHAR" property="varietiesLogo" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
   </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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -57,7 +58,7 @@
     <!--
       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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -91,16 +92,16 @@
     <!--
       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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     id, create_id, create_time, update_time, delete_sign, cid, cname, super_id, layer, 
-    status
+    status, varieties_logo, sort
   </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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     select
     <if test="distinct">
@@ -119,7 +120,7 @@
     <!--
       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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -130,7 +131,7 @@
     <!--
       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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     delete from business_varieties
     where id = #{id,jdbcType=VARCHAR}
@@ -139,7 +140,7 @@
     <!--
       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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     delete from business_varieties
     <if test="_parameter != null">
@@ -150,22 +151,24 @@
     <!--
       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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     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}, 
+      status, varieties_logo, sort
+      )
+    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})
+      #{status,jdbcType=VARCHAR}, #{varietiesLogo,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}
+      )
   </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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     insert into business_varieties
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -199,6 +202,12 @@
       <if test="status != null">
         status,
       </if>
+      <if test="varietiesLogo != null">
+        varieties_logo,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -231,13 +240,19 @@
       <if test="status != null">
         #{status,jdbcType=VARCHAR},
       </if>
+      <if test="varietiesLogo != null">
+        #{varietiesLogo,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=INTEGER},
+      </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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     select count(*) from business_varieties
     <if test="_parameter != null">
@@ -248,7 +263,7 @@
     <!--
       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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     update business_varieties
     <set>
@@ -282,6 +297,12 @@
       <if test="record.status != null">
         status = #{record.status,jdbcType=VARCHAR},
       </if>
+      <if test="record.varietiesLogo != null">
+        varieties_logo = #{record.varietiesLogo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -291,7 +312,7 @@
     <!--
       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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     update business_varieties
     set id = #{record.id,jdbcType=VARCHAR},
@@ -303,7 +324,9 @@
       cname = #{record.cname,jdbcType=VARCHAR},
       super_id = #{record.superId,jdbcType=VARCHAR},
       layer = #{record.layer,jdbcType=INTEGER},
-      status = #{record.status,jdbcType=VARCHAR}
+      status = #{record.status,jdbcType=VARCHAR},
+      varieties_logo = #{record.varietiesLogo,jdbcType=VARCHAR},
+      sort = #{record.sort,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -312,7 +335,7 @@
     <!--
       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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     update business_varieties
     <set>
@@ -346,6 +369,9 @@
       <if test="varietiesLogo != null">
         varieties_logo = #{varietiesLogo,jdbcType=VARCHAR},
       </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -353,7 +379,7 @@
     <!--
       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.
+      This element was generated on Tue Jan 09 15:08:39 CST 2018.
     -->
     update business_varieties
     set create_id = #{createId,jdbcType=VARCHAR},
@@ -365,8 +391,9 @@
       super_id = #{superId,jdbcType=VARCHAR},
       layer = #{layer,jdbcType=INTEGER},
       status = #{status,jdbcType=VARCHAR},
-      varieties_logo = #{varietiesLogo,jdbcType=VARCHAR}
-  	where id = #{id,jdbcType=VARCHAR}
+      varieties_logo = #{varietiesLogo,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   
   <select id="getCount" resultType="string">
@@ -381,12 +408,12 @@
   	</select>
   	
   	<select id="findVarietiesListByPage" resultType="com.goafanti.business.bo.BusinessVarietiesBo">
- 		select b.id,b.create_id as createId ,b.create_time as createTime,b.update_time as updateTime,
+ 		 select b.id,b.create_id as createId ,b.create_time as createTime,b.update_time as updateTime,b.sort,
   		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 and b.layer>0
-  		<if test="cname != null">
+  		where b.delete_sign=0 and b.layer&gt;0
+ 		<if test="cname != null">
 		and b.cname like CONCAT('%',#{cname,jdbcType=VARCHAR},'%')
 		</if>
 		<if test="superId != null">
@@ -398,6 +425,7 @@
 		<if test="status != null">
 		and b.status = #{status,jdbcType=VARCHAR}
 		</if>
+		ORDER BY if(isnull(b.sort),1,0),b.sort
 		<if test="page_sql!=null">
 			${page_sql}
 	</if>
@@ -407,7 +435,7 @@
   			count(0)
   		from business_varieties b
   		 left join business_varieties b2 on b.super_id = b2.id
-  		where b.delete_sign=0 and b.layer>0
+  		where b.delete_sign=0 and b.layer&gt;0
   		<if test="cname != null">
 		and b.cname like CONCAT('%',#{cname,jdbcType=VARCHAR},'%')
 		</if>
@@ -423,20 +451,20 @@
 		
   </select>
   
-  <select id="getSuperList"  resultType="com.goafanti.business.bo.BusinessVarietiesBo">
+  <select id="getSuperList" resultType="com.goafanti.business.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 and status=0
   </select>
   <select id="editVarieties" parameterType="string" resultType="com.goafanti.business.bo.BusinessVarietiesBo">
-  		select b.id,b.create_id as createId ,b.create_time as createTime,b.update_time as updateTime,b.varieties_logo as varietiesLogo,
-  		b.delete_sign as deleteSign,b.cid,b.cname,b.super_id superId ,b.layer,b.status,b2.cname superName,a.name as createName
+  		 select b.id,b.create_id as createId ,b.create_time as createTime,b.update_time as updateTime,b.varieties_logo as varietiesLogo,
+  		b.delete_sign as deleteSign,b.cid,b.cname,b.super_id superId ,b.layer,b.status,b2.cname superName,a.name as createName,b.sort
   		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">
+ 	<if test="id != null">
 		and b.id = #{id,jdbcType=VARCHAR}
 	</if>
   </select>
@@ -502,4 +530,15 @@
  where super_id=#{superId,jdbcType=VARCHAR}
   	</select>
   	
+  	<select id="getSortMax" resultType="String">
+  		select max(sort)
+  from business_varieties
+ 	</select>
+ 	
+ 	<select id="selectBySort"  resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from business_varieties
+    where sort = #{sort,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -1506,7 +1506,7 @@
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
-  	order by d.serial_number desc
+  	order by d.boutique desc
   	<if test="page_sql!=null">
 		${page_sql}
 	</if>
@@ -1679,4 +1679,27 @@
 	left join  achievement a on t.achievement_id=a.id
 	where  t.uid=#{uid,jdbcType=VARCHAR}
 	</select>
+	
+	<select id="findAppProjectInterestByPage" parameterType="String" resultType="com.goafanti.demand.bo.ObjectInterestListBo">
+  	 select b.id ,b.bname as name,t.uid,t.create_time as createTime,ifnull(x.countInterest,0) as countInterest
+	from project_interest t
+	left join (select id,count(0)  as countInterest ,project_id from project_interest
+				group by project_id
+				) x on t.id=x.id  
+	left join business_project  b on t.project_id=b.id
+	where  t.uid=#{uid,jdbcType=VARCHAR}
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findAppProjectInterestCount" parameterType="String" resultType="java.lang.Integer">
+  	select count(1)
+	from project_interest t
+	left join (select id,count(0)  as countInterest ,project_id from project_interest
+				group by project_id
+				) x on t.id=x.id  
+	left join business_project  b on t.project_id=b.id
+	where  t.uid=#{uid,jdbcType=VARCHAR}
+	</select>
 </mapper>

+ 5 - 0
src/main/java/com/goafanti/common/mapper/ProjectInterestMapper.xml

@@ -280,4 +280,9 @@
 	where uid=#{id,jdbcType=VARCHAR}
 	and project_id= #{projectId,jdbcType=VARCHAR}
   </select>
+  <delete id="deleteInterest" parameterType="java.lang.String" >
+    delete from project_interest
+    where uid = #{uid,jdbcType=VARCHAR}
+    and project_id=#{objectId,jdbcType=VARCHAR}
+  </delete>
 </mapper>

+ 100 - 72
src/main/java/com/goafanti/common/model/BusinessProject.java

@@ -3,133 +3,140 @@ package com.goafanti.common.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.goafanti.common.utils.StringUtils;
+
 public class BusinessProject {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.id
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.create_id
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String createId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.create_time
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.update_time
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.delete_sign
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private Integer deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.bname
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String bname;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.cid
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.price
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private BigDecimal price;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.offset
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private BigDecimal offset;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.activity_price
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private BigDecimal activityPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.activity_flag
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String activityFlag;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.member_price
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private BigDecimal memberPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.introduce
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String introduce;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.status
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.country
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String country;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.province
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String province;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.city
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String city;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.district
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String district;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.principal_id
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String principalId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.Value_effect
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String valueEffect;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.client_size
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String clientSize;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.max_logo
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String maxLogo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.min_logo
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String minLogo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.boutique
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private Integer boutique;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.project_url
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
+	 */
+	private String projectUrl;
 
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getId() {
 		return id;
@@ -138,7 +145,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -147,7 +154,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getCreateId() {
 		return createId;
@@ -156,7 +163,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setCreateId(String createId) {
 		this.createId = createId;
@@ -165,7 +172,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -174,7 +181,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -183,7 +190,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -192,7 +199,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -201,7 +208,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -210,7 +217,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
@@ -219,7 +226,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getBname() {
 		return bname;
@@ -228,7 +235,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setBname(String bname) {
 		this.bname = bname;
@@ -237,7 +244,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getCid() {
 		return cid;
@@ -246,7 +253,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
@@ -255,7 +262,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public BigDecimal getPrice() {
 		return price;
@@ -264,7 +271,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setPrice(BigDecimal price) {
 		this.price = price;
@@ -273,7 +280,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public BigDecimal getOffset() {
 		return offset;
@@ -282,7 +289,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setOffset(BigDecimal offset) {
 		this.offset = offset;
@@ -291,7 +298,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public BigDecimal getActivityPrice() {
 		return activityPrice;
@@ -300,7 +307,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setActivityPrice(BigDecimal activityPrice) {
 		this.activityPrice = activityPrice;
@@ -309,7 +316,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getActivityFlag() {
 		return activityFlag;
@@ -318,7 +325,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setActivityFlag(String activityFlag) {
 		this.activityFlag = activityFlag;
@@ -327,7 +334,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public BigDecimal getMemberPrice() {
 		return memberPrice;
@@ -336,7 +343,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setMemberPrice(BigDecimal memberPrice) {
 		this.memberPrice = memberPrice;
@@ -345,7 +352,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getIntroduce() {
 		return introduce;
@@ -354,7 +361,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setIntroduce(String introduce) {
 		this.introduce = introduce;
@@ -363,7 +370,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getStatus() {
 		return status;
@@ -372,7 +379,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setStatus(String status) {
 		this.status = status;
@@ -381,7 +388,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getCountry() {
 		return country;
@@ -390,7 +397,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setCountry(String country) {
 		this.country = country;
@@ -399,7 +406,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getProvince() {
 		return province;
@@ -408,7 +415,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setProvince(String province) {
 		this.province = province;
@@ -417,7 +424,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getCity() {
 		return city;
@@ -426,7 +433,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setCity(String city) {
 		this.city = city;
@@ -435,7 +442,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getDistrict() {
 		return district;
@@ -444,7 +451,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setDistrict(String district) {
 		this.district = district;
@@ -453,7 +460,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getPrincipalId() {
 		return principalId;
@@ -462,7 +469,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setPrincipalId(String principalId) {
 		this.principalId = principalId;
@@ -471,7 +478,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getValueEffect() {
 		return valueEffect;
@@ -480,7 +487,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setValueEffect(String valueEffect) {
 		this.valueEffect = valueEffect;
@@ -489,7 +496,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getClientSize() {
 		return clientSize;
@@ -498,7 +505,7 @@ public class BusinessProject {
 	/**
 	 * 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  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setClientSize(String clientSize) {
 		this.clientSize = clientSize;
@@ -507,7 +514,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.max_logo
 	 * @return  the value of business_project.max_logo
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getMaxLogo() {
 		return maxLogo;
@@ -516,7 +523,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.max_logo
 	 * @param maxLogo  the value for business_project.max_logo
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setMaxLogo(String maxLogo) {
 		this.maxLogo = maxLogo;
@@ -525,7 +532,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.min_logo
 	 * @return  the value of business_project.min_logo
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getMinLogo() {
 		return minLogo;
@@ -534,7 +541,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.min_logo
 	 * @param minLogo  the value for business_project.min_logo
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setMinLogo(String minLogo) {
 		this.minLogo = minLogo;
@@ -543,7 +550,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.boutique
 	 * @return  the value of business_project.boutique
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public Integer getBoutique() {
 		return boutique;
@@ -552,12 +559,33 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.boutique
 	 * @param boutique  the value for business_project.boutique
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setBoutique(Integer boutique) {
 		this.boutique = boutique;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.project_url
+	 * @return  the value of business_project.project_url
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
+	 */
+	public String getProjectUrl() {
+		if (StringUtils.isAnyBlank(projectUrl)) {
+			return "";
+		}
+		return projectUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.project_url
+	 * @param projectUrl  the value for business_project.project_url
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
+	 */
+	public void setProjectUrl(String projectUrl) {
+		this.projectUrl = projectUrl;
+	}
+
 	@Override
 	public String toString() {
 		return "BusinessProject [id=" + id + ", createId=" + createId + ", createTime=" + createTime + ", updateTime="

+ 86 - 16
src/main/java/com/goafanti/common/model/BusinessProjectExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class BusinessProjectExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public BusinessProjectExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1763,11 +1763,81 @@ public class BusinessProjectExample {
 			addCriterion("boutique not between", value1, value2, "boutique");
 			return (Criteria) this;
 		}
+
+		public Criteria andProjectUrlIsNull() {
+			addCriterion("project_url is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlIsNotNull() {
+			addCriterion("project_url is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlEqualTo(String value) {
+			addCriterion("project_url =", value, "projectUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlNotEqualTo(String value) {
+			addCriterion("project_url <>", value, "projectUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlGreaterThan(String value) {
+			addCriterion("project_url >", value, "projectUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlGreaterThanOrEqualTo(String value) {
+			addCriterion("project_url >=", value, "projectUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlLessThan(String value) {
+			addCriterion("project_url <", value, "projectUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlLessThanOrEqualTo(String value) {
+			addCriterion("project_url <=", value, "projectUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlLike(String value) {
+			addCriterion("project_url like", value, "projectUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlNotLike(String value) {
+			addCriterion("project_url not like", value, "projectUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlIn(List<String> values) {
+			addCriterion("project_url in", values, "projectUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlNotIn(List<String> values) {
+			addCriterion("project_url not in", values, "projectUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlBetween(String value1, String value2) {
+			addCriterion("project_url between", value1, value2, "projectUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andProjectUrlNotBetween(String value1, String value2) {
+			addCriterion("project_url not between", value1, value2, "projectUrl");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table business_project
-	 * @mbg.generated  Tue Jan 02 13:57:47 CST 2018
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 68 - 32
src/main/java/com/goafanti/common/model/BusinessVarieties.java

@@ -5,69 +5,77 @@ import java.util.Date;
 public class BusinessVarieties {
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.id
-	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.create_id
-	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String cname;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.super_id
-	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	private String status;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.varieties_logo
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
+	 */
+	private String varietiesLogo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_varieties.sort
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
+	 */
+	private Integer sort;
 
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
-	
-	private String varietiesLogo;
 	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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -75,7 +83,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getCreateId() {
 		return createId;
@@ -83,7 +91,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setCreateId(String createId) {
 		this.createId = createId;
@@ -91,7 +99,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -99,7 +107,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -107,7 +115,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -115,7 +123,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -123,7 +131,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -131,7 +139,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
@@ -139,7 +147,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getCid() {
 		return cid;
@@ -147,7 +155,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
@@ -155,7 +163,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getCname() {
 		return cname;
@@ -163,7 +171,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setCname(String cname) {
 		this.cname = cname;
@@ -171,7 +179,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getSuperId() {
 		return superId;
@@ -179,7 +187,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setSuperId(String superId) {
 		this.superId = superId;
@@ -187,7 +195,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public Integer getLayer() {
 		return layer;
@@ -195,7 +203,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public void setLayer(Integer layer) {
 		this.layer = layer;
@@ -203,7 +211,7 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	public String getStatus() {
 		return status;
@@ -211,17 +219,45 @@ public class BusinessVarieties {
 	/**
 	 * 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
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
 	 */
 	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_varieties.varieties_logo
+	 * @return  the value of business_varieties.varieties_logo
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
+	 */
 	public String getVarietiesLogo() {
 		return varietiesLogo;
 	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.varieties_logo
+	 * @param varietiesLogo  the value for business_varieties.varieties_logo
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
+	 */
 	public void setVarietiesLogo(String varietiesLogo) {
 		this.varietiesLogo = varietiesLogo;
 	}
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_varieties.sort
+	 * @return  the value of business_varieties.sort
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
+	 */
+	public Integer getSort() {
+		return sort;
+	}
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_varieties.sort
+	 * @param sort  the value for business_varieties.sort
+	 * @mbg.generated  Tue Jan 09 15:08:39 CST 2018
+	 */
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+	
 	
 }
 

Разлика између датотеке није приказан због своје велике величине
+ 1032 - 943
src/main/java/com/goafanti/common/model/BusinessVarietiesExample.java


+ 3 - 3
src/main/java/com/goafanti/common/model/ProjectInterest.java

@@ -28,7 +28,7 @@ public class ProjectInterest {
      *
      * @mbg.generated Sat Dec 23 16:12:24 CST 2017
      */
-    private Long projectId;
+    private String projectId;
 
     /**
      *
@@ -95,7 +95,7 @@ public class ProjectInterest {
      *
      * @mbg.generated Sat Dec 23 16:12:24 CST 2017
      */
-    public Long getProjectId() {
+    public String getProjectId() {
         return projectId;
     }
 
@@ -107,7 +107,7 @@ public class ProjectInterest {
      *
      * @mbg.generated Sat Dec 23 16:12:24 CST 2017
      */
-    public void setProjectId(Long projectId) {
+    public void setProjectId(String projectId) {
         this.projectId = projectId;
     }
 

+ 14 - 1
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -33,6 +33,7 @@ import com.goafanti.common.dao.NewsInterestMapper;
 
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
+import com.goafanti.common.dao.ProjectInterestMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserInterestMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -110,7 +111,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	private NewsInterestMapper	newsInterestMapper;
 	@Autowired
 	private UserInterestMapper	userInterestMapper;
-
+	@Autowired
+	ProjectInterestMapper	projectInterestMapper; 
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -869,6 +871,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (StringUtils.isNotBlank(TokenManager.getUserId())) {
 			params.put("uid", TokenManager.getUserId());
 		}
+		params.put("uid", "904d1d5a-30f6-4813-b632-1ff07a1ad317");
 		if (type==InterestType.POLICY.getCode()) {
 			Pagination<ObjectInterestListBo> p=(Pagination<ObjectInterestListBo>) findPage("findAppNewsInterestByPage", "findAppNewsInterestCount", params, pNo, pSize);
 			List<ObjectInterestListBo> l=(List<ObjectInterestListBo>) p.getList();
@@ -909,6 +912,16 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			}
 			return p;
 		}
+		if (null==type||type==InterestType.PROJECT.getCode()) {
+			Pagination<ObjectInterestListBo> p=(Pagination<ObjectInterestListBo>) findPage("findAppProjectInterestByPage", "findAppProjectInterestCount", params, pNo, pSize);
+			List<ObjectInterestListBo> l=(List<ObjectInterestListBo>) p.getList();
+			for (ObjectInterestListBo o : l) {
+				int i=projectInterestMapper.countInterest(o.getId());
+				o.setCountInterest(String.valueOf(i));
+				o.setType(type);
+			}
+			return p;
+		}
 		return null;
 	}