Browse Source

App服务接口开发

anderx 8 years ago
parent
commit
18c47d0b7d
45 changed files with 608 additions and 861 deletions
  1. 1 1
      GeneratorConfig.xml
  2. 1 6
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  3. 8 0
      src/main/java/com/goafanti/admin/bo/BusinessVarietiesBo.java
  4. 7 0
      src/main/java/com/goafanti/admin/bo/VarietiesBo.java
  5. 22 4
      src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java
  6. 1 3
      src/main/java/com/goafanti/admin/controller/BusinessProjectController.java
  7. 1 1
      src/main/java/com/goafanti/admin/service/AdminVarietiesService.java
  8. 3 0
      src/main/java/com/goafanti/admin/service/BusinessProjectService.java
  9. 4 2
      src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java
  10. 24 27
      src/main/java/com/goafanti/admin/service/impl/BusinessProjectServiceImpl.java
  11. 11 3
      src/main/java/com/goafanti/app/controller/AppAchievementDemandController.java
  12. 3 0
      src/main/java/com/goafanti/app/controller/AppServiceController.java
  13. 11 11
      src/main/java/com/goafanti/common/dao/BusinessProjectMapper.java
  14. 11 11
      src/main/java/com/goafanti/common/dao/MessageConsumerMapper.java
  15. 11 11
      src/main/java/com/goafanti/common/dao/MessageFromBusinessMapper.java
  16. 15 15
      src/main/java/com/goafanti/common/dao/MessageFromSystemMapper.java
  17. 11 11
      src/main/java/com/goafanti/common/dao/MessageProducerMapper.java
  18. 11 11
      src/main/java/com/goafanti/common/dao/NewsInterestMapper.java
  19. 2 1
      src/main/java/com/goafanti/common/enums/AttachmentType.java
  20. 4 1
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  21. 16 16
      src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml
  22. 2 1
      src/main/java/com/goafanti/common/mapper/BusinessVarietiesMapper.xml
  23. 7 3
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  24. 15 75
      src/main/java/com/goafanti/common/mapper/MessageConsumerMapper.xml
  25. 15 15
      src/main/java/com/goafanti/common/mapper/MessageFromBusinessMapper.xml
  26. 16 76
      src/main/java/com/goafanti/common/mapper/MessageFromSystemMapper.xml
  27. 15 75
      src/main/java/com/goafanti/common/mapper/MessageProducerMapper.xml
  28. 15 15
      src/main/java/com/goafanti/common/mapper/NewsInterestMapper.xml
  29. 70 165
      src/main/java/com/goafanti/common/model/BusinessProject.java
  30. 16 16
      src/main/java/com/goafanti/common/model/BusinessProjectExample.java
  31. 8 0
      src/main/java/com/goafanti/common/model/BusinessVarieties.java
  32. 18 18
      src/main/java/com/goafanti/common/model/MessageConsumer.java
  33. 16 16
      src/main/java/com/goafanti/common/model/MessageConsumerExample.java
  34. 60 60
      src/main/java/com/goafanti/common/model/MessageFromBusiness.java
  35. 16 16
      src/main/java/com/goafanti/common/model/MessageFromBusinessExample.java
  36. 39 39
      src/main/java/com/goafanti/common/model/MessageFromSystem.java
  37. 16 16
      src/main/java/com/goafanti/common/model/MessageFromSystemExample.java
  38. 15 15
      src/main/java/com/goafanti/common/model/MessageProducer.java
  39. 16 16
      src/main/java/com/goafanti/common/model/MessageProducerExample.java
  40. 12 12
      src/main/java/com/goafanti/common/model/NewsInterest.java
  41. 16 16
      src/main/java/com/goafanti/common/model/NewsInterestExample.java
  42. 3 1
      src/main/java/com/goafanti/common/utils/FileUtils.java
  43. 0 14
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  44. 1 0
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java
  45. 23 46
      src/main/webapp/WEB-INF/views/portal/news/appCognizance.html

+ 1 - 1
GeneratorConfig.xml

@@ -14,6 +14,6 @@
     <table schema="aft" tableName="message_consumer"/>
     <table schema="aft" tableName="message_from_business"/>
     <table schema="aft" tableName="news_interest"/>
-    <table schema="aft" tableName="project_interest"/>
+    <table schema="aft" tableName="business_project"/>
   </context>
 </generatorConfiguration>

+ 1 - 6
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -401,7 +401,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 	@Override
 	public AchievementUserOwnerDetailBo selectUserOwnerDetail(String id) {
-		
+		System.out.println("``````````````"+id);
 		AchievementUserOwnerDetailBo a=achievementMapper.selectUserOwnerDetail(id);
 		int i=achievementMapper.countInterest(a.getId());
 		a.setCountInterest(String.valueOf(i));
@@ -732,11 +732,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		Pagination<AchievementPartnerListBo> p=(Pagination<AchievementPartnerListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 				params,pNo, pSize);
 		
-		List<AchievementListBo> list=(List<AchievementListBo>) p.getList();
-		for (AchievementListBo ap : list) {
-			int i=achievementMapper.countInterest(ap.getId());
-			ap.setCountInterest(String.valueOf(i));
-		}
 		return p;
 	}
 

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

@@ -32,6 +32,8 @@ public class BusinessVarietiesBo {
 	private String superName;
 	/*创建人*/
 	private String createName;
+	/*品类图标*/
+	private String varietiesLogo;
 	
 	public String getSuperName() {
 		return superName;
@@ -113,6 +115,12 @@ public class BusinessVarietiesBo {
 	public void setCreateName(String createName) {
 		this.createName = createName;
 	}
+	public String getVarietiesLogo() {
+		return varietiesLogo;
+	}
+	public void setVarietiesLogo(String varietiesLogo) {
+		this.varietiesLogo = varietiesLogo;
+	}
 	
 	
 }

+ 7 - 0
src/main/java/com/goafanti/admin/bo/VarietiesBo.java

@@ -3,6 +3,7 @@ package com.goafanti.admin.bo;
 public class VarietiesBo {
 	private String id;
 	private String name;
+	private String varietiesLogo;
 	public String getName() {
 		return name;
 	}
@@ -15,4 +16,10 @@ public class VarietiesBo {
 	public void setId(String id) {
 		this.id = id;
 	}
+	public String getVarietiesLogo() {
+		return varietiesLogo;
+	}
+	public void setVarietiesLogo(String varietiesLogo) {
+		this.varietiesLogo = varietiesLogo;
+	}
 }

+ 22 - 4
src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java

@@ -1,7 +1,7 @@
 package com.goafanti.admin.controller;
 
 import javax.annotation.Resource;
-
+import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -11,11 +11,13 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.admin.service.AdminVarietiesService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.controller.BaseController;
+
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.utils.StringUtils;
 @RestController
 @RequestMapping("api/admin/Varieties")
-public class AdminVarietiesApiController extends BaseController{
+public class AdminVarietiesApiController extends CertifyApiController{
 	@Resource
 	private AdminVarietiesService adminVarietiesService;
 	
@@ -96,7 +98,7 @@ public class AdminVarietiesApiController extends BaseController{
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "品类名称已存在", "品类名称"));
 			return res;
 		}
-		if (adminVarietiesService.ifLayer(superId)) {
+		if (adminVarietiesService.ifLayer(superId,id)) {
 			res.getError().add(buildError( "品类层级不能超过三级", "品类层级不能超过三级"));
 			return res;
 		}
@@ -125,5 +127,21 @@ public class AdminVarietiesApiController extends BaseController{
 		res.setData(adminVarietiesService.updateStatus(id));
 		return res;
 	}
+	/**
+	 * 图片上传
+	 */
+	@RequestMapping(value = "/uploadPicture", method = RequestMethod.POST)
+	public Result uploadPicture(HttpServletRequest req, String sign) {
+		Result res = new Result();
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+
+		if (attachmentType == AttachmentType.VARIETIES_PICTURE
+				) {
+			res.setData(handleFiles(res, "/varieties/", false, req, sign, ""));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "图片"));
+		}
+		return res;
+	}
 
 }

+ 1 - 3
src/main/java/com/goafanti/admin/controller/BusinessProjectController.java

@@ -25,8 +25,6 @@ public class BusinessProjectController extends CertifyApiController{
 	@Resource
 	BusinessProjectService businessprojectService;
 	
-	
-	
 	/**
 	 * 新增项目
 	 */
@@ -95,7 +93,7 @@ public class BusinessProjectController extends CertifyApiController{
 	@RequestMapping(value = "/orgProject", method = RequestMethod.GET)
 	public Result orgProject(String id){
 		Result res=new Result();
-		res.setData(businessprojectService.orgProject(id));
+		res.setData(businessprojectService.orgProjects(id));
 		return res;
 	}
 	/**

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

@@ -29,7 +29,7 @@ public interface AdminVarietiesService {
 	int getCountSon(String id);
 	int getLayer(String superId);
 
-	boolean ifLayer(String superId);
+	boolean ifLayer(String superId,String id);
 
 	List<VarietiesBo> getVarieties();
 

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

@@ -9,6 +9,7 @@ import com.goafanti.admin.bo.BusinessProjectBo;
 import com.goafanti.admin.bo.ProjectSizeBo;
 import com.goafanti.app.bo.ProjectBo;
 import com.goafanti.common.model.BusinessProject;
+import com.goafanti.common.model.BusinessVarieties;
 import com.goafanti.common.model.ProjectSize;
 import com.goafanti.core.mybatis.page.Pagination;
 
@@ -26,6 +27,8 @@ public interface BusinessProjectService {
 	
 	List<Object> orgProject(String id);
 	
+	BusinessProjectBo orgProjects(String id);
+	
 	List<Map<String, String>> getAllCnames(Integer flag);
 	
 	

+ 4 - 2
src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java

@@ -220,15 +220,17 @@ public class AdminVarietiesServiceImpl extends BaseMybatisDao<BusinessVarietiesM
 		return businessVarietiesMapper.getLayer(superId);
 	}
 	@Override
-	public boolean ifLayer(String superId) {
+	public boolean ifLayer(String superId,String id) {
 		if(businessVarietiesMapper.getLayer(superId)>2){
 			return true;
 		}
+		if (businessVarietiesMapper.getLayer(superId)>1&&Integer.valueOf(businessVarietiesMapper.getCount(id))>0) {
+			return true;
+		}
 		return false;
 	}
 	@Override
 	public List<VarietiesBo> getVarieties() {
-		
 		return businessVarietiesMapper.getVarieties();
 	}
 	

+ 24 - 27
src/main/java/com/goafanti/admin/service/impl/BusinessProjectServiceImpl.java

@@ -139,6 +139,20 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		return businessProjectMapper.updateByPrimaryKey(bp);
 	}
 	@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
 	public List<Object> orgProject(String id) {
 		ProjectDetailBo pd=businessProjectMapper.selectAppProjectDetail(id);
 		if (StringUtils.isNotBlank(TokenManager.getUserId())&&projectInterestMapper.checkUidAndDid(id,TokenManager.getUserId())>0) {
@@ -153,6 +167,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		l.add(l2);
 		return l;
 	}
+	
 	@Override
 	public List<Map<String, String>> getAllCnames(Integer flag) {
 		List<Map<String, String>> list=new ArrayList<Map<String, String>>();
@@ -228,34 +243,16 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		if (StringUtils.isNotBlank(s.getDistrict())) {
 			bp.setDistrict(s.getDistrict());
 		}
-		if (null!=s.getPrice()) {
-			bp.setPrice(s.getPrice());
-		}
-		if (null!=(s.getOffset())) {
-			bp.setOffset(s.getOffset());
-		}
-		if (null!=(s.getActivityFlag())) {
-			bp.setActivityFlag(s.getActivityFlag());
-		}
-		if (null!=(s.getMemberPrice())) {
-			bp.setMemberPrice(s.getMemberPrice());
-		}
-		if (null!=(s.getActivityPrice())) {
-			bp.setActivityPrice(s.getActivityPrice());
-		}
-		if (StringUtils.isNotBlank(s.getIntroduce())) {
-			bp.setIntroduce(s.getIntroduce());
-		}
-		if (StringUtils.isNotBlank(s.getValueEffect())) {
-			bp.setValueEffect(s.getValueEffect());
-		}
-		if (StringUtils.isNotBlank(s.getClientSize())) {
-			bp.setClientSize(s.getClientSize());
-		}
-		
+		bp.setPrice(s.getPrice());
+		bp.setOffset(s.getOffset());
+		bp.setActivityFlag(s.getActivityFlag());
+		bp.setMemberPrice(s.getMemberPrice());
+		bp.setActivityPrice(s.getActivityPrice());
+		bp.setIntroduce(s.getIntroduce());
+		bp.setValueEffect(s.getValueEffect());
+		bp.setClientSize(s.getClientSize());
 		bp.setMinLogo(s.getMinLogo());
 		bp.setMaxLogo(s.getMaxLogo());
-		
 		if (null!=(s.getStatus())) {
 			bp.setStatus(s.getStatus());
 		}
@@ -369,7 +366,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 	public boolean judgeBeing(BusinessProject s) {
 		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(s.getId());
 		BusinessProject bp1=businessProjectMapper.selectByPrimaryBname(s.getBname());
-		if (bp.getId().equals(bp1.getId())) {
+		if (null==bp||null==bp1||bp.getId().equals(bp1.getId())) {
 			return false;
 		}else {
 			return true;

+ 11 - 3
src/main/java/com/goafanti/app/controller/AppAchievementDemandController.java

@@ -15,7 +15,7 @@ import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.activity.service.ActivityService;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.bo.Result;
-
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 
 import com.goafanti.common.utils.StringUtils;
@@ -138,7 +138,8 @@ public class AppAchievementDemandController extends BaseApiController {
 	public Result expertsDetail(String uid) {
 		Result res = new Result();
 		if (StringUtils.isBlank(uid)) {
-			res.getError().add(buildError( "ID错误!", "ID错误"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"专家必须指定","专家"));
+			return res;
 		}
 		res.setData(userIdentityService.expertsDetail( uid));
 		return res;
@@ -151,7 +152,10 @@ public class AppAchievementDemandController extends BaseApiController {
 	@RequestMapping(value = "/achievementDetail", method = RequestMethod.GET)
 	private Result userDetail(String id ) {
 		Result res = new Result();
-		 
+		if (StringUtils.isBlank(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"成果必须指定","成果"));
+			return res;
+		}
 		res.setData(achievementService.selectUserOwnerDetail(id));
 		return res;
 	}
@@ -161,6 +165,10 @@ public class AppAchievementDemandController extends BaseApiController {
 	@RequestMapping(value = "/demandDetail", method = RequestMethod.GET)
 	public Result DemandDetail(String id ) {
 		Result res = new Result();
+		if (StringUtils.isBlank(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"需求必须指定","需求"));
+			return res;
+		}
 		res.setData(demandService.selectDemandDetail( id));
 		return res;
 	}

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

@@ -50,6 +50,7 @@ public class AppServiceController extends BaseApiController {
 		Result res = new Result();
 		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"品类必须指定","品类"));
+			return res;
 		}
 		res.setData(businessProjectService.getBusinessProject(id,pNo, pSize));
 		return res;
@@ -62,6 +63,7 @@ public class AppServiceController extends BaseApiController {
 		Result res = new Result();
 		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"项目必须指定","项目"));
+			return res;
 		}
 		res.setData(businessProjectService.orgProject(id));
 		return res;
@@ -92,6 +94,7 @@ public class AppServiceController extends BaseApiController {
 		Result res = new Result();
 		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"咨询师必须指定","咨询师"));
+			return res;
 		}
 		res.setData(userIdentityService.consultantDetail( id));
 		return res;

+ 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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	long countByExample(BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByExample(BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insert(BusinessProject record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insertSelective(BusinessProject record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	List<BusinessProject> selectByExample(BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	BusinessProject selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") BusinessProject record,
 			@Param("example") BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExample(@Param("record") BusinessProject record, @Param("example") BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKeySelective(BusinessProject record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKey(BusinessProject record);
 

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

@@ -9,68 +9,68 @@ public interface MessageConsumerMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	long countByExample(MessageConsumerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByExample(MessageConsumerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insert(MessageConsumer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insertSelective(MessageConsumer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	List<MessageConsumer> selectByExample(MessageConsumerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	MessageConsumer selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") MessageConsumer record,
 			@Param("example") MessageConsumerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExample(@Param("record") MessageConsumer record, @Param("example") MessageConsumerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKeySelective(MessageConsumer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKey(MessageConsumer record);
 }

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

@@ -9,69 +9,69 @@ public interface MessageFromBusinessMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	long countByExample(MessageFromBusinessExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByExample(MessageFromBusinessExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insert(MessageFromBusiness record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insertSelective(MessageFromBusiness record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	List<MessageFromBusiness> selectByExample(MessageFromBusinessExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	MessageFromBusiness selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") MessageFromBusiness record,
 			@Param("example") MessageFromBusinessExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExample(@Param("record") MessageFromBusiness record,
 			@Param("example") MessageFromBusinessExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKeySelective(MessageFromBusiness record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKey(MessageFromBusiness record);
 }

+ 15 - 15
src/main/java/com/goafanti/common/dao/MessageFromSystemMapper.java

@@ -14,73 +14,73 @@ import org.apache.ibatis.annotations.Param;
 public interface MessageFromSystemMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	long countByExample(MessageFromSystemExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByExample(MessageFromSystemExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insert(MessageFromSystem record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insertSelective(MessageFromSystem record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	List<MessageFromSystem> selectByExample(MessageFromSystemExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	MessageFromSystem selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") MessageFromSystem record,
 			@Param("example") MessageFromSystemExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExample(@Param("record") MessageFromSystem record, @Param("example") MessageFromSystemExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKeySelective(MessageFromSystem record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKey(MessageFromSystem record);
 
 	/**
-     * 查询��?�目�?
+     * 查询��?�目�?
      * @param sql
      * @return
      */
@@ -107,14 +107,14 @@ public interface MessageFromSystemMapper {
 	int insertBatchConsumer(List<MessageConsumer> target);
 	
 	/**
-	 * 查询�个用户的未�消�
+	 * 查询�个用户的未�消�
 	 * @param uid
 	 * @return
 	 */
 	List<MessageBo> selectSendMessage(@Param("uid")String uid);
 
 	/**
-	 * 绑定第三方账�
+	 * 绑定第三方账�
 	 * @param uuid
 	 * @param registrationId
 	 * @param userName
@@ -125,7 +125,7 @@ public interface MessageFromSystemMapper {
 			@Param("easemobName")String easemobName, @Param("easemobPass")String easemobPass, @Param("uid")String uid,@Param("lastLoginTime")Date lastLoginTime);
 	
 	/**
-	 * 把消�置为已�?
+	 * 把消�置为已�?
 	 * @param messageId
 	 * @param uid
 	 * @param readTime

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

@@ -9,68 +9,68 @@ public interface MessageProducerMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	long countByExample(MessageProducerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByExample(MessageProducerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insert(MessageProducer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insertSelective(MessageProducer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	List<MessageProducer> selectByExample(MessageProducerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	MessageProducer selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") MessageProducer record,
 			@Param("example") MessageProducerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExample(@Param("record") MessageProducer record, @Param("example") MessageProducerExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKeySelective(MessageProducer record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKey(MessageProducer record);
 

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

@@ -8,67 +8,67 @@ import org.apache.ibatis.annotations.Param;
 public interface NewsInterestMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	long countByExample(NewsInterestExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByExample(NewsInterestExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insert(NewsInterest record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int insertSelective(NewsInterest record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	List<NewsInterest> selectByExample(NewsInterestExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	NewsInterest selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") NewsInterest record, @Param("example") NewsInterestExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByExample(@Param("record") NewsInterest record, @Param("example") NewsInterestExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKeySelective(NewsInterest record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	int updateByPrimaryKey(NewsInterest record);
 

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

@@ -50,7 +50,8 @@ public enum AttachmentType {
 	ACTIVITY_CONTENT_PICTURE("activity_content_picture", "活动内容图片"),
 	CUSTOMER_SYS_FILE("customer_sys_file","客户系统文件"),
 	BUSINESS_PROJECT_MIN_PICTURE("business_project_min_picture","业务项目小图"),
-	BUSINESS_PROJECT_MAX_PICTURE("business_project_max_picture","业务项目大图");
+	BUSINESS_PROJECT_MAX_PICTURE("business_project_max_picture","业务项目大图"),
+	VARIETIES_PICTURE("varieties_picture","业务品类图片");
 	
 	private AttachmentType(String code, String desc) {
 		this.code = code;

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

@@ -1029,8 +1029,11 @@
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, a.boutique,
   		a.name, a.keyword, a.category, a.introduction,owner_postal_address as ownerPostalAddress,
   		a.owner_name as ownerName, a.owner_type as ownerType, a.owner_mobile as ownerMobile,a.field_a as fieldA,a.field_b ,a.field_c as fieldC,
-  		a.status, a.release_date as releaseDate, a.audit_status as auditStatus,f.name as field,f2.name as fieldB
+  		a.status, a.release_date as releaseDate, a.audit_status as auditStatus,f.name as field,f2.name as fieldB,ifnull(b.countInterest,0) as countInterest
   	from achievement a
+  	left join (
+	select count(0)  as countInterest,achievement_id from achievement_interest group by achievement_id
+			)b on a.id = b.achievement_id 
   	left join field_glossory f on a.field_a=f.id
   	left join field_glossory f2 on a.field_b=f2.id
   	where deleted_sign = 0 

+ 16 - 16
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 Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="create_id" jdbcType="VARCHAR" property="createId" />
@@ -35,7 +35,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -69,7 +69,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -103,7 +103,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     id, create_id, create_time, update_time, delete_sign, bname, cid, price, offset, 
     activity_price, activity_flag, member_price, introduce, status, country, province, 
@@ -113,7 +113,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select
     <if test="distinct">
@@ -132,7 +132,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -143,7 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from business_project
     where id = #{id,jdbcType=VARCHAR}
@@ -152,7 +152,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from business_project
     <if test="_parameter != null">
@@ -163,7 +163,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into business_project (id, create_id, create_time, 
       update_time, delete_sign, bname, 
@@ -186,7 +186,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into business_project
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -336,7 +336,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select count(*) from business_project
     <if test="_parameter != null">
@@ -347,7 +347,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update business_project
     <set>
@@ -429,7 +429,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update business_project
     set id = #{record.id,jdbcType=VARCHAR},
@@ -463,7 +463,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update business_project
     <set>
@@ -540,7 +540,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 12 11:46:55 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update business_project
     set create_id = #{createId,jdbcType=VARCHAR},
@@ -680,7 +680,7 @@
     from business_project
     where bname = #{bname,jdbcType=VARCHAR}
   </select>
-  <select id="getBusinessProject"  resultType="com.goafanti.app.bo.ProjectBo">
+  <select id="getBusinessProject" resultType="com.goafanti.app.bo.ProjectBo">
   select id,bname as name,min_logo as minLogoUrl,introduce
    from business_project
 	where delete_sign=0 

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

@@ -17,6 +17,7 @@
     <result column="super_id" jdbcType="VARCHAR" property="superId" />
     <result column="layer" jdbcType="INTEGER" property="layer" />
     <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="varieties_logo" jdbcType="VARCHAR" property="varietiesLogo" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -485,7 +486,7 @@
   		and b.id= #{superId,jdbcType=VARCHAR}
   	</select>
   	<select id="getVarieties" resultType="com.goafanti.admin.bo.VarietiesBo">
-  		select id, cname AS name 
+  		select id, cname AS name, varieties_logo as varietiesLogo 
 	from business_varieties b
 	where b.delete_sign=0
 	and b.status=0

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

@@ -1429,16 +1429,20 @@
 	where demand_id = #{demandId,jdbcType=VARCHAR}
 	</select> 
 	<select id="findAppDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.DemandListBo">
-  		select 
+  	select 
 	  d.id, d.serial_number as serialNumber, d.data_category as dataCategory, d.boutique,
 	  d.name, d.keyword, d.demand_type as demandType, d.industry_category_a as industryCategoryA, d.industry_category_b as industryCategoryB, d.industry_category_c as industryCategoryC,
 	  d.validity_period as validityPeriod, d.status, d.release_status as releaseStatus, 
 	  d.release_date as releaseDate, d.employer_id as employerId, d.audit_status as auditStatus,t.city as cityname,
-	  d.urgent_money as urgentMoney,d.urgent_days as  urgentDays,d.employer_address as employerAddress,d.problem_des as problemDes
+	  d.urgent_money as urgentMoney,d.urgent_days as  urgentDays,d.employer_address as employerAddress,d.problem_des as problemDes,ifnull(t.countInterest,0) as countInterest,g.name as industryCategory1,g2.name as industryCategory2
 	from  demand d 
 	left join  user_identity t on d.employer_id=t.uid
+	left join	field_glossory g on d.industry_category_a=g.id
+	left join	field_glossory g2 on d.industry_category_b=g2.id
+	left join (select count(0)  as countInterest ,demand_id from demand_interest 
+				group by demand_id) t on d.id=t.demand_id
 	where d.deleted_sign = 0 
-	<if test="employerId != null">
+<if test="employerId != null">
 	and d.employer_id = #{employerId, jdbcType=VARCHAR}
 	</if>
 	<if test="serialNumber != null">

+ 15 - 75
src/main/java/com/goafanti/common/mapper/MessageConsumerMapper.xml

@@ -5,11 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -22,11 +18,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -60,11 +52,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -98,11 +86,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     id, create_time, consumer_id, message_id, delete_sign, read_time
   </sql>
@@ -110,11 +94,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select
     <if test="distinct">
@@ -133,11 +113,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -148,11 +124,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from message_consumer
     where id = #{id,jdbcType=VARCHAR}
@@ -161,11 +133,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from message_consumer
     <if test="_parameter != null">
@@ -176,11 +144,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into message_consumer (id, create_time, consumer_id, 
       message_id, delete_sign, read_time
@@ -193,11 +157,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into message_consumer
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -245,11 +205,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select count(*) from message_consumer
     <if test="_parameter != null">
@@ -260,11 +216,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_consumer
     <set>
@@ -295,11 +247,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_consumer
     set id = #{record.id,jdbcType=VARCHAR},
@@ -316,11 +264,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_consumer
     <set>
@@ -346,11 +290,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_consumer
     set create_time = #{createTime,jdbcType=TIMESTAMP},

+ 15 - 15
src/main/java/com/goafanti/common/mapper/MessageFromBusinessMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="creater" jdbcType="VARCHAR" property="creater" />
@@ -32,7 +32,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -66,7 +66,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -100,7 +100,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     id, creater, create_time, update_time, sponsor_id, sponsor_type, sponsor_read, sponsor_read_time, 
     resource_id, resource_type, resource_owner_id, resource_owner_type, resource_owner_read, 
@@ -111,7 +111,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select
     <if test="distinct">
@@ -130,7 +130,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -141,7 +141,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from message_from_business
     where id = #{id,jdbcType=VARCHAR}
@@ -150,7 +150,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from message_from_business
     <if test="_parameter != null">
@@ -161,7 +161,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into message_from_business (id, creater, create_time, 
       update_time, sponsor_id, sponsor_type, 
@@ -184,7 +184,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into message_from_business
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -316,7 +316,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select count(*) from message_from_business
     <if test="_parameter != null">
@@ -327,7 +327,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_from_business
     <set>
@@ -400,7 +400,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_from_business
     set id = #{record.id,jdbcType=VARCHAR},
@@ -431,7 +431,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_from_business
     <set>
@@ -499,7 +499,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_from_business
     set creater = #{creater,jdbcType=VARCHAR},

+ 16 - 76
src/main/java/com/goafanti/common/mapper/MessageFromSystemMapper.xml

@@ -5,11 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="creater" jdbcType="VARCHAR" property="creater" />
@@ -29,11 +25,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -67,11 +59,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -105,11 +93,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     id, creater, create_time, update_time, producer_id, consumer_type, title, body, subject, 
     resource_id, resource_type, delete_sign, is_draft
@@ -118,11 +102,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select
     <if test="distinct">
@@ -141,11 +121,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -156,11 +132,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from message_from_system
     where id = #{id,jdbcType=VARCHAR}
@@ -169,11 +141,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from message_from_system
     <if test="_parameter != null">
@@ -184,11 +152,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into message_from_system (id, creater, create_time, 
       update_time, producer_id, consumer_type, 
@@ -205,11 +169,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into message_from_system
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -299,11 +259,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select count(*) from message_from_system
     <if test="_parameter != null">
@@ -314,11 +270,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_from_system
     <set>
@@ -370,11 +322,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_from_system
     set id = #{record.id,jdbcType=VARCHAR},
@@ -398,11 +346,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_from_system
     <set>
@@ -449,11 +393,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Wed Dec 20 08:38:46 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_from_system
     set creater = #{creater,jdbcType=VARCHAR},
@@ -567,7 +507,7 @@
    	 	${sql}
    </select>
    
-   <select id="listSystemMessageByPage"  resultType="com.goafanti.message.bo.MessageListBo">
+   <select id="listSystemMessageByPage" resultType="com.goafanti.message.bo.MessageListBo">
 		select
 			a.id as messageId,
 			date_format(a.create_time,'%Y-%m-%d %H:%I:%S') as createTime,

+ 15 - 75
src/main/java/com/goafanti/common/mapper/MessageProducerMapper.xml

@@ -5,11 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -21,11 +17,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -59,11 +51,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -97,11 +85,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     id, create_time, consumer_id, message_id, send_time
   </sql>
@@ -109,11 +93,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select
     <if test="distinct">
@@ -132,11 +112,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -147,11 +123,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from message_producer
     where id = #{id,jdbcType=VARCHAR}
@@ -160,11 +132,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from message_producer
     <if test="_parameter != null">
@@ -175,11 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into message_producer (id, create_time, consumer_id, 
       message_id, send_time)
@@ -190,11 +154,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into message_producer
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -236,11 +196,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select count(*) from message_producer
     <if test="_parameter != null">
@@ -251,11 +207,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_producer
     <set>
@@ -283,11 +235,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_producer
     set id = #{record.id,jdbcType=VARCHAR},
@@ -303,11 +251,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_producer
     <set>
@@ -330,11 +274,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-<<<<<<< HEAD
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
-=======
-      This element was generated on Tue Dec 19 09:16:07 CST 2017.
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update message_producer
     set create_time = #{createTime,jdbcType=TIMESTAMP},

+ 15 - 15
src/main/java/com/goafanti/common/mapper/NewsInterestMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -16,7 +16,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -50,7 +50,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -84,7 +84,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     id, uid, new_id, create_time
   </sql>
@@ -92,7 +92,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select
     <if test="distinct">
@@ -111,7 +111,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -122,7 +122,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from news_interest
     where id = #{id,jdbcType=VARCHAR}
@@ -131,7 +131,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     delete from news_interest
     <if test="_parameter != null">
@@ -142,7 +142,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into news_interest (id, uid, new_id, 
       create_time)
@@ -153,7 +153,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     insert into news_interest
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -189,7 +189,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     select count(*) from news_interest
     <if test="_parameter != null">
@@ -200,7 +200,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update news_interest
     <set>
@@ -225,7 +225,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update news_interest
     set id = #{record.id,jdbcType=VARCHAR},
@@ -240,7 +240,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update news_interest
     <set>
@@ -260,7 +260,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Dec 23 16:12:24 CST 2017.
+      This element was generated on Mon Dec 25 18:55:04 CST 2017.
     -->
     update news_interest
     set uid = #{uid,jdbcType=VARCHAR},

+ 70 - 165
src/main/java/com/goafanti/common/model/BusinessProject.java

@@ -7,629 +7,534 @@ public class BusinessProject {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.id
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.create_id
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String createId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.create_time
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.update_time
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.delete_sign
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Integer deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.bname
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String bname;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.cid
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.price
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private BigDecimal price;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.offset
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private BigDecimal offset;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.activity_price
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private BigDecimal activityPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.activity_flag
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String activityFlag;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.member_price
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private BigDecimal memberPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.introduce
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String introduce;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.status
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.country
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String country;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.province
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String province;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.city
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String city;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.district
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String district;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.principal_id
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String principalId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.Value_effect
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String valueEffect;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.client_size
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String clientSize;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.max_logo
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String maxLogo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.min_logo
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String minLogo;
 
 	/**
 	 * 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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getId() {
 		return id;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.id
 	 * @param id  the value for business_project.id
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.create_id
 	 * @return  the value of business_project.create_id
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getCreateId() {
 		return createId;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.create_id
 	 * @param createId  the value for business_project.create_id
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCreateId(String createId) {
 		this.createId = createId;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.create_time
 	 * @return  the value of business_project.create_time
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.create_time
 	 * @param createTime  the value for business_project.create_time
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.update_time
 	 * @return  the value of business_project.update_time
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.update_time
 	 * @param updateTime  the value for business_project.update_time
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.delete_sign
 	 * @return  the value of business_project.delete_sign
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.delete_sign
 	 * @param deleteSign  the value for business_project.delete_sign
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.bname
 	 * @return  the value of business_project.bname
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getBname() {
 		return bname;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.bname
 	 * @param bname  the value for business_project.bname
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setBname(String bname) {
 		this.bname = bname;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.cid
 	 * @return  the value of business_project.cid
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getCid() {
 		return cid;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.cid
 	 * @param cid  the value for business_project.cid
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.price
 	 * @return  the value of business_project.price
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public BigDecimal getPrice() {
 		return price;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.price
 	 * @param price  the value for business_project.price
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setPrice(BigDecimal price) {
 		this.price = price;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.offset
 	 * @return  the value of business_project.offset
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public BigDecimal getOffset() {
 		return offset;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.offset
 	 * @param offset  the value for business_project.offset
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setOffset(BigDecimal offset) {
 		this.offset = offset;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.activity_price
 	 * @return  the value of business_project.activity_price
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public BigDecimal getActivityPrice() {
 		return activityPrice;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.activity_price
 	 * @param activityPrice  the value for business_project.activity_price
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
-	public void setActivityPrice(BigDecimal
-			activityPrice) {
+	public void setActivityPrice(BigDecimal activityPrice) {
 		this.activityPrice = activityPrice;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.activity_flag
 	 * @return  the value of business_project.activity_flag
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getActivityFlag() {
 		return activityFlag;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.activity_flag
 	 * @param activityFlag  the value for business_project.activity_flag
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setActivityFlag(String activityFlag) {
 		this.activityFlag = activityFlag;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.member_price
 	 * @return  the value of business_project.member_price
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public BigDecimal getMemberPrice() {
 		return memberPrice;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.member_price
 	 * @param memberPrice  the value for business_project.member_price
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setMemberPrice(BigDecimal memberPrice) {
 		this.memberPrice = memberPrice;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.introduce
 	 * @return  the value of business_project.introduce
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getIntroduce() {
 		return introduce;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.introduce
 	 * @param introduce  the value for business_project.introduce
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setIntroduce(String introduce) {
 		this.introduce = introduce;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.status
 	 * @return  the value of business_project.status
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getStatus() {
 		return status;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.status
 	 * @param status  the value for business_project.status
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setStatus(String status) {
 		this.status = status;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.country
 	 * @return  the value of business_project.country
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getCountry() {
 		return country;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.country
 	 * @param country  the value for business_project.country
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCountry(String country) {
 		this.country = country;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.province
 	 * @return  the value of business_project.province
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getProvince() {
 		return province;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.province
 	 * @param province  the value for business_project.province
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setProvince(String province) {
 		this.province = province;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.city
 	 * @return  the value of business_project.city
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getCity() {
 		return city;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.city
 	 * @param city  the value for business_project.city
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCity(String city) {
 		this.city = city;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.district
 	 * @return  the value of business_project.district
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getDistrict() {
 		return district;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.district
 	 * @param district  the value for business_project.district
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setDistrict(String district) {
 		this.district = district;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.principal_id
 	 * @return  the value of business_project.principal_id
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getPrincipalId() {
 		return principalId;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.principal_id
 	 * @param principalId  the value for business_project.principal_id
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setPrincipalId(String principalId) {
 		this.principalId = principalId;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.Value_effect
 	 * @return  the value of business_project.Value_effect
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getValueEffect() {
 		return valueEffect;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.Value_effect
 	 * @param valueEffect  the value for business_project.Value_effect
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setValueEffect(String valueEffect) {
 		this.valueEffect = valueEffect;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.client_size
 	 * @return  the value of business_project.client_size
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getClientSize() {
 		return clientSize;
 	}
 
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.client_size
 	 * @param clientSize  the value for business_project.client_size
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setClientSize(String clientSize) {
 		this.clientSize = clientSize;
 	}
 
-
-
 	/**
 	 * 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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getMaxLogo() {
 		return maxLogo;
 	}
 
-
-
 	/**
 	 * 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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setMaxLogo(String maxLogo) {
 		this.maxLogo = maxLogo;
 	}
 
-
-
 	/**
 	 * 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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getMinLogo() {
 		return minLogo;
 	}
 
-
-
 	/**
 	 * 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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
-	
 	public void setMinLogo(String minLogo) {
 		this.minLogo = minLogo;
 	}
 
-	
-	
-
 	@Override
 	public String toString() {
 		return "BusinessProject [id=" + id + ", createId=" + createId + ", createTime=" + createTime + ", updateTime="

+ 16 - 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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	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 Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1707,7 +1707,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table business_project
-	 * @mbg.generated  Tue Dec 12 11:46:55 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -59,6 +59,8 @@ public class BusinessVarieties {
 	 * @return  the value of business_varieties.id
 	 * @mbg.generated  Thu Nov 30 10:03:07 CST 2017
 	 */
+	
+	private String varietiesLogo;
 	public String getId() {
 		return id;
 	}
@@ -214,6 +216,12 @@ public class BusinessVarieties {
 	public void setStatus(String status) {
 		this.status = status;
 	}
+	public String getVarietiesLogo() {
+		return varietiesLogo;
+	}
+	public void setVarietiesLogo(String varietiesLogo) {
+		this.varietiesLogo = varietiesLogo;
+	}
 	
 }
 

+ 18 - 18
src/main/java/com/goafanti/common/model/MessageConsumer.java

@@ -6,39 +6,39 @@ public class MessageConsumer {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.create_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.consumer_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String consumerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.message_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String messageId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.delete_sign
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Boolean deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_consumer.read_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date readTime;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.id
 	 * @return  the value of message_consumer.id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -47,7 +47,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.id
 	 * @param id  the value for message_consumer.id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -56,7 +56,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.create_time
 	 * @return  the value of message_consumer.create_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -65,7 +65,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.create_time
 	 * @param createTime  the value for message_consumer.create_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -74,7 +74,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.consumer_id
 	 * @return  the value of message_consumer.consumer_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getConsumerId() {
 		return consumerId;
@@ -83,7 +83,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.consumer_id
 	 * @param consumerId  the value for message_consumer.consumer_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setConsumerId(String consumerId) {
 		this.consumerId = consumerId;
@@ -92,7 +92,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.message_id
 	 * @return  the value of message_consumer.message_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getMessageId() {
 		return messageId;
@@ -101,7 +101,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.message_id
 	 * @param messageId  the value for message_consumer.message_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setMessageId(String messageId) {
 		this.messageId = messageId;
@@ -110,7 +110,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.delete_sign
 	 * @return  the value of message_consumer.delete_sign
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Boolean getDeleteSign() {
 		return deleteSign;
@@ -119,7 +119,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.delete_sign
 	 * @param deleteSign  the value for message_consumer.delete_sign
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setDeleteSign(Boolean deleteSign) {
 		this.deleteSign = deleteSign;
@@ -128,7 +128,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_consumer.read_time
 	 * @return  the value of message_consumer.read_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getReadTime() {
 		return readTime;
@@ -137,7 +137,7 @@ public class MessageConsumer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_consumer.read_time
 	 * @param readTime  the value for message_consumer.read_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setReadTime(Date readTime) {
 		this.readTime = readTime;

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

@@ -7,23 +7,23 @@ import java.util.List;
 public class MessageConsumerExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public MessageConsumerExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -556,7 +556,7 @@ public class MessageConsumerExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table message_consumer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 60 - 60
src/main/java/com/goafanti/common/model/MessageFromBusiness.java

@@ -6,109 +6,109 @@ public class MessageFromBusiness {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.creater
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String creater;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.create_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.update_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.sponsor_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String sponsorId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.sponsor_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Integer sponsorType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.sponsor_read
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Boolean sponsorRead;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.sponsor_read_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date sponsorReadTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.resource_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String resourceId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.resource_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Integer resourceType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.resource_owner_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String resourceOwnerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.resource_owner_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Integer resourceOwnerType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.resource_owner_read
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Boolean resourceOwnerRead;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.resource_owner_read_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date resourceOwnerReadTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.admin_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String adminId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.admin_read_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date adminReadTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.operator_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Integer operatorType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.operator_result
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String operatorResult;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.title
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String title;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_business.body
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String body;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.id
 	 * @return  the value of message_from_business.id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -117,7 +117,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.id
 	 * @param id  the value for message_from_business.id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -126,7 +126,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.creater
 	 * @return  the value of message_from_business.creater
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getCreater() {
 		return creater;
@@ -135,7 +135,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.creater
 	 * @param creater  the value for message_from_business.creater
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -144,7 +144,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.create_time
 	 * @return  the value of message_from_business.create_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -153,7 +153,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.create_time
 	 * @param createTime  the value for message_from_business.create_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -162,7 +162,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.update_time
 	 * @return  the value of message_from_business.update_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -171,7 +171,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.update_time
 	 * @param updateTime  the value for message_from_business.update_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -180,7 +180,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.sponsor_id
 	 * @return  the value of message_from_business.sponsor_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getSponsorId() {
 		return sponsorId;
@@ -189,7 +189,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.sponsor_id
 	 * @param sponsorId  the value for message_from_business.sponsor_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setSponsorId(String sponsorId) {
 		this.sponsorId = sponsorId;
@@ -198,7 +198,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.sponsor_type
 	 * @return  the value of message_from_business.sponsor_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Integer getSponsorType() {
 		return sponsorType;
@@ -207,7 +207,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.sponsor_type
 	 * @param sponsorType  the value for message_from_business.sponsor_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setSponsorType(Integer sponsorType) {
 		this.sponsorType = sponsorType;
@@ -216,7 +216,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.sponsor_read
 	 * @return  the value of message_from_business.sponsor_read
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Boolean getSponsorRead() {
 		return sponsorRead;
@@ -225,7 +225,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.sponsor_read
 	 * @param sponsorRead  the value for message_from_business.sponsor_read
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setSponsorRead(Boolean sponsorRead) {
 		this.sponsorRead = sponsorRead;
@@ -234,7 +234,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.sponsor_read_time
 	 * @return  the value of message_from_business.sponsor_read_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getSponsorReadTime() {
 		return sponsorReadTime;
@@ -243,7 +243,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.sponsor_read_time
 	 * @param sponsorReadTime  the value for message_from_business.sponsor_read_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setSponsorReadTime(Date sponsorReadTime) {
 		this.sponsorReadTime = sponsorReadTime;
@@ -252,7 +252,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.resource_id
 	 * @return  the value of message_from_business.resource_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getResourceId() {
 		return resourceId;
@@ -261,7 +261,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.resource_id
 	 * @param resourceId  the value for message_from_business.resource_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setResourceId(String resourceId) {
 		this.resourceId = resourceId;
@@ -270,7 +270,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.resource_type
 	 * @return  the value of message_from_business.resource_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Integer getResourceType() {
 		return resourceType;
@@ -279,7 +279,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.resource_type
 	 * @param resourceType  the value for message_from_business.resource_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setResourceType(Integer resourceType) {
 		this.resourceType = resourceType;
@@ -288,7 +288,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.resource_owner_id
 	 * @return  the value of message_from_business.resource_owner_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getResourceOwnerId() {
 		return resourceOwnerId;
@@ -297,7 +297,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.resource_owner_id
 	 * @param resourceOwnerId  the value for message_from_business.resource_owner_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setResourceOwnerId(String resourceOwnerId) {
 		this.resourceOwnerId = resourceOwnerId;
@@ -306,7 +306,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.resource_owner_type
 	 * @return  the value of message_from_business.resource_owner_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Integer getResourceOwnerType() {
 		return resourceOwnerType;
@@ -315,7 +315,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.resource_owner_type
 	 * @param resourceOwnerType  the value for message_from_business.resource_owner_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setResourceOwnerType(Integer resourceOwnerType) {
 		this.resourceOwnerType = resourceOwnerType;
@@ -324,7 +324,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.resource_owner_read
 	 * @return  the value of message_from_business.resource_owner_read
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Boolean getResourceOwnerRead() {
 		return resourceOwnerRead;
@@ -333,7 +333,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.resource_owner_read
 	 * @param resourceOwnerRead  the value for message_from_business.resource_owner_read
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setResourceOwnerRead(Boolean resourceOwnerRead) {
 		this.resourceOwnerRead = resourceOwnerRead;
@@ -342,7 +342,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.resource_owner_read_time
 	 * @return  the value of message_from_business.resource_owner_read_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getResourceOwnerReadTime() {
 		return resourceOwnerReadTime;
@@ -351,7 +351,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.resource_owner_read_time
 	 * @param resourceOwnerReadTime  the value for message_from_business.resource_owner_read_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setResourceOwnerReadTime(Date resourceOwnerReadTime) {
 		this.resourceOwnerReadTime = resourceOwnerReadTime;
@@ -360,7 +360,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.admin_id
 	 * @return  the value of message_from_business.admin_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getAdminId() {
 		return adminId;
@@ -369,7 +369,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.admin_id
 	 * @param adminId  the value for message_from_business.admin_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setAdminId(String adminId) {
 		this.adminId = adminId;
@@ -378,7 +378,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.admin_read_time
 	 * @return  the value of message_from_business.admin_read_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getAdminReadTime() {
 		return adminReadTime;
@@ -387,7 +387,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.admin_read_time
 	 * @param adminReadTime  the value for message_from_business.admin_read_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setAdminReadTime(Date adminReadTime) {
 		this.adminReadTime = adminReadTime;
@@ -396,7 +396,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.operator_type
 	 * @return  the value of message_from_business.operator_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Integer getOperatorType() {
 		return operatorType;
@@ -405,7 +405,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.operator_type
 	 * @param operatorType  the value for message_from_business.operator_type
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setOperatorType(Integer operatorType) {
 		this.operatorType = operatorType;
@@ -414,7 +414,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.operator_result
 	 * @return  the value of message_from_business.operator_result
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getOperatorResult() {
 		return operatorResult;
@@ -423,7 +423,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.operator_result
 	 * @param operatorResult  the value for message_from_business.operator_result
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setOperatorResult(String operatorResult) {
 		this.operatorResult = operatorResult;
@@ -432,7 +432,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.title
 	 * @return  the value of message_from_business.title
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getTitle() {
 		return title;
@@ -441,7 +441,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.title
 	 * @param title  the value for message_from_business.title
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setTitle(String title) {
 		this.title = title;
@@ -450,7 +450,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_business.body
 	 * @return  the value of message_from_business.body
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getBody() {
 		return body;
@@ -459,7 +459,7 @@ public class MessageFromBusiness {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_business.body
 	 * @param body  the value for message_from_business.body
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setBody(String body) {
 		this.body = body;

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

@@ -7,23 +7,23 @@ import java.util.List;
 public class MessageFromBusinessExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public MessageFromBusinessExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1456,7 +1456,7 @@ public class MessageFromBusinessExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table message_from_business
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 39 - 39
src/main/java/com/goafanti/common/model/MessageFromSystem.java

@@ -6,74 +6,74 @@ public class MessageFromSystem {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.id
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.creater
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String creater;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.create_time
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.update_time
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.producer_id
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String producerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.consumer_type
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Integer consumerType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.title
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String title;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.body
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String body;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.subject
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Integer subject;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.resource_id
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String resourceId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.resource_type
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Integer resourceType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.delete_sign
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Boolean deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_from_system.is_draft
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Integer isDraft;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.id
 	 * @return  the value of message_from_system.id
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -82,7 +82,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.id
 	 * @param id  the value for message_from_system.id
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -91,7 +91,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.creater
 	 * @return  the value of message_from_system.creater
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getCreater() {
 		return creater;
@@ -100,7 +100,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.creater
 	 * @param creater  the value for message_from_system.creater
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -109,7 +109,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.create_time
 	 * @return  the value of message_from_system.create_time
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -118,7 +118,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.create_time
 	 * @param createTime  the value for message_from_system.create_time
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -127,7 +127,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.update_time
 	 * @return  the value of message_from_system.update_time
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -136,7 +136,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.update_time
 	 * @param updateTime  the value for message_from_system.update_time
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -145,7 +145,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.producer_id
 	 * @return  the value of message_from_system.producer_id
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getProducerId() {
 		return producerId;
@@ -154,7 +154,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.producer_id
 	 * @param producerId  the value for message_from_system.producer_id
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setProducerId(String producerId) {
 		this.producerId = producerId;
@@ -163,7 +163,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.consumer_type
 	 * @return  the value of message_from_system.consumer_type
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Integer getConsumerType() {
 		return consumerType;
@@ -172,7 +172,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.consumer_type
 	 * @param consumerType  the value for message_from_system.consumer_type
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setConsumerType(Integer consumerType) {
 		this.consumerType = consumerType;
@@ -181,7 +181,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.title
 	 * @return  the value of message_from_system.title
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getTitle() {
 		return title;
@@ -190,7 +190,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.title
 	 * @param title  the value for message_from_system.title
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setTitle(String title) {
 		this.title = title;
@@ -199,7 +199,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.body
 	 * @return  the value of message_from_system.body
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getBody() {
 		return body;
@@ -208,7 +208,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.body
 	 * @param body  the value for message_from_system.body
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setBody(String body) {
 		this.body = body;
@@ -217,7 +217,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.subject
 	 * @return  the value of message_from_system.subject
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Integer getSubject() {
 		return subject;
@@ -226,7 +226,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.subject
 	 * @param subject  the value for message_from_system.subject
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setSubject(Integer subject) {
 		this.subject = subject;
@@ -235,7 +235,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.resource_id
 	 * @return  the value of message_from_system.resource_id
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getResourceId() {
 		return resourceId;
@@ -244,7 +244,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.resource_id
 	 * @param resourceId  the value for message_from_system.resource_id
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setResourceId(String resourceId) {
 		this.resourceId = resourceId;
@@ -253,7 +253,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.resource_type
 	 * @return  the value of message_from_system.resource_type
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Integer getResourceType() {
 		return resourceType;
@@ -262,7 +262,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.resource_type
 	 * @param resourceType  the value for message_from_system.resource_type
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setResourceType(Integer resourceType) {
 		this.resourceType = resourceType;
@@ -271,7 +271,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.delete_sign
 	 * @return  the value of message_from_system.delete_sign
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Boolean getDeleteSign() {
 		return deleteSign;
@@ -280,7 +280,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.delete_sign
 	 * @param deleteSign  the value for message_from_system.delete_sign
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setDeleteSign(Boolean deleteSign) {
 		this.deleteSign = deleteSign;
@@ -289,7 +289,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_from_system.is_draft
 	 * @return  the value of message_from_system.is_draft
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Integer getIsDraft() {
 		return isDraft;
@@ -298,7 +298,7 @@ public class MessageFromSystem {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_from_system.is_draft
 	 * @param isDraft  the value for message_from_system.is_draft
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setIsDraft(Integer isDraft) {
 		this.isDraft = isDraft;

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

@@ -7,23 +7,23 @@ import java.util.List;
 public class MessageFromSystemExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public MessageFromSystemExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1006,7 +1006,7 @@ public class MessageFromSystemExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table message_from_system
-	 * @mbg.generated  Wed Dec 20 08:38:46 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 15 - 15
src/main/java/com/goafanti/common/model/MessageProducer.java

@@ -6,34 +6,34 @@ public class MessageProducer {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_producer.id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_producer.create_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_producer.consumer_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String consumerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_producer.message_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String messageId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column message_producer.send_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date sendTime;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_producer.id
 	 * @return  the value of message_producer.id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -42,7 +42,7 @@ public class MessageProducer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_producer.id
 	 * @param id  the value for message_producer.id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -51,7 +51,7 @@ public class MessageProducer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_producer.create_time
 	 * @return  the value of message_producer.create_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -60,7 +60,7 @@ public class MessageProducer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_producer.create_time
 	 * @param createTime  the value for message_producer.create_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -69,7 +69,7 @@ public class MessageProducer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_producer.consumer_id
 	 * @return  the value of message_producer.consumer_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getConsumerId() {
 		return consumerId;
@@ -78,7 +78,7 @@ public class MessageProducer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_producer.consumer_id
 	 * @param consumerId  the value for message_producer.consumer_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setConsumerId(String consumerId) {
 		this.consumerId = consumerId;
@@ -87,7 +87,7 @@ public class MessageProducer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_producer.message_id
 	 * @return  the value of message_producer.message_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getMessageId() {
 		return messageId;
@@ -96,7 +96,7 @@ public class MessageProducer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_producer.message_id
 	 * @param messageId  the value for message_producer.message_id
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setMessageId(String messageId) {
 		this.messageId = messageId;
@@ -105,7 +105,7 @@ public class MessageProducer {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column message_producer.send_time
 	 * @return  the value of message_producer.send_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getSendTime() {
 		return sendTime;
@@ -114,7 +114,7 @@ public class MessageProducer {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column message_producer.send_time
 	 * @param sendTime  the value for message_producer.send_time
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setSendTime(Date sendTime) {
 		this.sendTime = sendTime;

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

@@ -7,23 +7,23 @@ import java.util.List;
 public class MessageProducerExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public MessageProducerExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -496,7 +496,7 @@ public class MessageProducerExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table message_producer
-	 * @mbg.generated  Tue Dec 19 09:16:07 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 12 - 12
src/main/java/com/goafanti/common/model/NewsInterest.java

@@ -6,29 +6,29 @@ public class NewsInterest {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_interest.id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_interest.uid
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private String uid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_interest.new_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Long newId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column news_interest.create_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	private Date createTime;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_interest.id
 	 * @return  the value of news_interest.id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -37,7 +37,7 @@ public class NewsInterest {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_interest.id
 	 * @param id  the value for news_interest.id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -46,7 +46,7 @@ public class NewsInterest {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_interest.uid
 	 * @return  the value of news_interest.uid
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getUid() {
 		return uid;
@@ -55,7 +55,7 @@ public class NewsInterest {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_interest.uid
 	 * @param uid  the value for news_interest.uid
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setUid(String uid) {
 		this.uid = uid;
@@ -64,7 +64,7 @@ public class NewsInterest {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_interest.new_id
 	 * @return  the value of news_interest.new_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Long getNewId() {
 		return newId;
@@ -73,7 +73,7 @@ public class NewsInterest {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_interest.new_id
 	 * @param newId  the value for news_interest.new_id
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setNewId(Long newId) {
 		this.newId = newId;
@@ -82,7 +82,7 @@ public class NewsInterest {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column news_interest.create_time
 	 * @return  the value of news_interest.create_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -91,7 +91,7 @@ public class NewsInterest {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column news_interest.create_time
 	 * @param createTime  the value for news_interest.create_time
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;

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

@@ -7,23 +7,23 @@ import java.util.List;
 public class NewsInterestExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public NewsInterestExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -426,7 +426,7 @@ public class NewsInterestExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table news_interest
-	 * @mbg.generated  Sat Dec 23 16:12:24 CST 2017
+	 * @mbg.generated  Mon Dec 25 18:55:04 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 3 - 1
src/main/java/com/goafanti/common/utils/FileUtils.java

@@ -106,7 +106,9 @@ public class FileUtils {
 				|| sign.indexOf("achievement_technical_picture") != -1
 				|| sign.indexOf("achievement_maturity_picture") != -1 || sign.indexOf("demand_order_file") != -1
 				|| sign.indexOf("lecture_picture") != -1|| sign.indexOf("cover_picture") != -1 
-				|| sign.indexOf("news") != -1||sign.indexOf("customer_sys_file") != -1||sign.indexOf("business_project_max_picture") != -1||sign.indexOf("business_project_min_picture") != -1) {
+				|| sign.indexOf("news") != -1||sign.indexOf("customer_sys_file") != -1
+				||sign.indexOf("business_project_max_picture") != -1||sign.indexOf("business_project_min_picture") != -1
+				||sign.indexOf("varieties_picture") != -1) {
 			uniq = true;
 		}
 		String fileName = "";

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

@@ -853,20 +853,6 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			
 		}
 		Pagination<DemandSearchListBo> p=(Pagination<DemandSearchListBo>) findPage("findAppDemandListByPage", "findAppDemandCount", params, pNo, pSize);
-			List<DemandListBo> list=(List<DemandListBo>) p.getList();
-			for (DemandListBo d : list) {
-				if (null!=d.getIndustryCategoryA()) {
-					d.setIndustryCategory1(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryA()).getName());
-				}
-				if (null!=d.getIndustryCategoryB()) {
-					d.setIndustryCategory2(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
-				}
-				if (null!=d.getIndustryCategoryC()) {
-					d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
-				}
-				int i=demandMapper.countInterest(d.getId());
-				d.setCountInterest(String.valueOf(i));
-			}
 		return p;
 	}
 

+ 1 - 0
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -305,6 +305,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 
 	@Override
 	public UserIdentityBo expertsDetail(String uid) {
+		System.out.println(uid);
 		UserIdentityBo u=userIdentityMapper.selectUserIdentityByUid(uid);
 		if (null!=u.getProvince()) {
 			u.setProvince0(districtGlossoryMapper.selectByPrimaryKey(u.getProvince()).getName());

+ 23 - 46
src/main/webapp/WEB-INF/views/portal/news/appCognizance.html

@@ -1,77 +1,54 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-	<head>
-		<meta charset="utf-8" />
-	    <meta name="Keywords" content=""/>
-	    <meta name="Description" content=""/>
-		<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1,user-scalable=no">
-		<meta http-equiv="x-ua-compatible" content="ie=edge">
-		<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-		<link th:href="${portalHost + '/news/appCognizance.css'}" rel="stylesheet" type="text/css">
- 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-		<script type="text/javascript"
-			th:src="${portalHost + '/news/appCognizance.js'}"></script>
-        <title>高新认定</title>
-	</head>
+
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>高新认定</title>
+	<link th:href="${portalHost + '/news/appCognizance.css'}" rel="stylesheet">
+	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+	<meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="Expires" content="0" />
+</head>
 	<body>
 		<div class="container">
 			<img th:src="${portalHost + '/img/appCognizance01.jpg'}"  alt="高企认定" id="imgs"/>
 			<div class="contant">
 				<div class="service">
-					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}"  alt="" /><span>需求描述</span></h3>
+					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}"  alt="" /><span>项目描述</span></h3>
 					<hr>
 					<div class="promiseText" id="describe">
-						<div><p>1.本项目处于国内高技术前沿,原创性特征明显。</p></div>
-						<div><p>2.对提升中国结构一体化复合材料的高技术研发水平水平水平水平。 </p></div>
-						<div><p>3.和创新能力具有艾薇阿辉就本项目处于国内高技。</p></div>
-						<div><p>4.术前沿本项目处于国内高技术前沿,原创性特征明显。</p></div>
-						<div><p>4.术前沿本项目处于国内高技术前沿,原创性特征明显。沿本项目处于国内高技术前沿,原创性特征明显</p></div>
+						
 					</div>
 				</div>
 				<div class="service">
-					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}" alt="" /><span>所需资料</span></h3>
+					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}" alt="" /><span>项目价值</span></h3>
 					<hr>
 					<div class="promiseText" id="data">
-						<div><p>1.本项目处于国内高技术前沿,原创性特征明显。</p></div>
-						<div><p>2.对提升中国结构一体化复合材料的高技术研发水平水平水平水平。</p> </div>
-						<div><p>3.和创新能力具有艾薇阿辉就本项目处于国内高技。</p></div>
-						<div><p>4.术前沿本项目处于国内高技术前沿,原创性特征明显。</p></div>
-						<div><p>4.术前沿本项目处于国内高技术前沿,原创性特征明显。沿本项目处于国内高技术前沿,原创性特征明显</p></div>
+						
 					</div>
 				</div>
 				<div class="service servicebj">
 					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}" alt="" /><span>服务规格</span></h3>
 					<hr>
 					<div class="specifications" >
-						<div>普通(45天左右)</div>
-						<div>普通(45天左右)</div>
-						<div>普通(45天左右)</div>
-						<div>普通(45天左右)</div>
-						
+					
 					</div>
 				</div>
 				<div class="service">
-					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}" alt="" /><span>服务承诺</span></h3>
+					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}" alt="" /><span>所需资料</span></h3>
 					<hr>
 					<div class="promiseText" id="promise">
-						<div><p>1.本项目处于国内高技术前沿,原创性特征明显。</p></div>
-						<div><p>2.对提升中国结构一体化复合材料的高技术研发水平水平水平水平。</p> </div>
-						<div><p>3.和创新能力具有艾薇阿辉就本项目处于国内高技。</p></div>
-						<div><p>4.术前沿本项目处于国内高技术前沿,原创性特征明显。</p></div>
-						<div><p>4.术前沿本项目处于国内高技术前沿,原创性特征明显。沿本项目处于国内高技术前沿,原创性特征明显</p></div>
-					</div>
-				</div>
-				<div class="service">
-					<h3><img th:src="${portalHost + '/img/appCognizance02.jpg'}" alt="" /><span>服务保障</span></h3>
-					<hr>
-					<div class="promiseText" id="guarantee">
-						<div><p><span>先垫付</span>1.本项目处于国内高技术前沿,原创性特征明显。</p></div>
-						<div><p><span>时间短</span>2.对提升中国结构一体化复合材料的高技术研发水平水平水平水平。 </p></div>
-						<div><p><span>成功率高</span>3.和创新能力具有艾薇阿辉就本项目处于国内高技。</p></div>
-						<div><p><span>重售后</span>4.术前沿本项目处于国内高技术前沿,原创性特征明显。</p></div>
+					
 					</div>
 				</div>
+				
 			</div>
 		</div>
+		<div th:replace="common::footer(~{::script})">
+			<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+			<script type="text/javascript"
+				th:src="${portalHost + '/news/appCognizance.js'}"></script>
+		</div>
 	</body>
+	
 </html>