Procházet zdrojové kódy

Accept Merge Request #254 生产版本更新 : (test -> prod)

Merge Request: 生产版本更新
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/254
浅川 před 8 roky
rodič
revize
63c67b3096
40 změnil soubory, kde provedl 1176 přidání a 496 odebrání
  1. 1 1
      generatorConfig.xml
  2. 2 2
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  3. 2 2
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  4. 0 1
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  5. 2 0
      src/main/java/com/goafanti/common/constant/AFTConstants.java
  6. 3 1
      src/main/java/com/goafanti/common/constant/ErrorConstants.java
  7. 23 0
      src/main/java/com/goafanti/common/controller/WebpageController.java
  8. 20 11
      src/main/java/com/goafanti/common/dao/CustomerLogMapper.java
  9. 10 2
      src/main/java/com/goafanti/common/dao/CustomerMapper.java
  10. 27 18
      src/main/java/com/goafanti/common/dao/CustomerOrganizationInfoMapper.java
  11. 12 25
      src/main/java/com/goafanti/common/dao/CustomerUserInfoMapper.java
  12. 4 2
      src/main/java/com/goafanti/common/enums/CustomerFollowFiled.java
  13. 7 1
      src/main/java/com/goafanti/common/enums/CustomerIntentionFiled.java
  14. 25 22
      src/main/java/com/goafanti/common/mapper/CustomerLogMapper.xml
  15. 26 42
      src/main/java/com/goafanti/common/mapper/CustomerMapper.xml
  16. 54 24
      src/main/java/com/goafanti/common/mapper/CustomerOrganizationInfoMapper.xml
  17. 20 37
      src/main/java/com/goafanti/common/mapper/CustomerUserInfoMapper.xml
  18. 2 1
      src/main/java/com/goafanti/common/mapper/FollowUpRecordMapper.xml
  19. 42 42
      src/main/java/com/goafanti/common/model/CustomerLog.java
  20. 36 26
      src/main/java/com/goafanti/common/model/CustomerLogExample.java
  21. 47 24
      src/main/java/com/goafanti/common/model/CustomerOrganizationInfo.java
  22. 86 16
      src/main/java/com/goafanti/common/model/CustomerOrganizationInfoExample.java
  23. 36 59
      src/main/java/com/goafanti/common/model/CustomerUserInfo.java
  24. 16 86
      src/main/java/com/goafanti/common/model/CustomerUserInfoExample.java
  25. 1 0
      src/main/java/com/goafanti/customer/bo/CustomerIn.java
  26. 14 3
      src/main/java/com/goafanti/customer/bo/CustomerOut.java
  27. 37 8
      src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java
  28. 0 11
      src/main/java/com/goafanti/customer/service/CustomerLogoService.java
  29. 5 0
      src/main/java/com/goafanti/customer/service/CustomerOrganizationService.java
  30. 18 2
      src/main/java/com/goafanti/customer/service/CustomerService.java
  31. 4 0
      src/main/java/com/goafanti/customer/service/impl/CustomerOrganizationServiceImp.java
  32. 48 18
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  33. 1 1
      src/main/java/com/goafanti/demand/service/DemandService.java
  34. 1 1
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  35. 9 3
      src/main/java/com/goafanti/portal/bo/BoutiqueListBo.java
  36. 3 1
      src/main/resources/props/error.properties
  37. 7 3
      src/main/webapp/WEB-INF/views/common.html
  38. 291 0
      src/main/webapp/WEB-INF/views/portal/aboutUs.html
  39. 231 0
      src/main/webapp/WEB-INF/views/portal/contactUs.html
  40. 3 0
      src/test/java/com/goafanti/test/TestValueEvaluation.java

+ 1 - 1
generatorConfig.xml

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

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

@@ -79,8 +79,8 @@ public interface AchievementService {
 	
 	/** 查询精品成果  **/
 	public List<AchievementListBo> getAchievement(Integer boutique);
-	 
-    /** 查询猜你喜欢  **/
+	 
+    /** 查询猜你喜欢  **/
     public List<AchievementListBo>  getPerhapLike();
     
     /**查询智者的科技成果**/

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

@@ -608,7 +608,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.updateByPrimaryKey(a);
 	}
 
-
+
 	@Override
 	@Cacheable(value = "internationalAchievementList", key = "'internationalAchievementList:'+#internationalAchievementCacheKey")
 	public List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementCacheKey) {
@@ -658,5 +658,5 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	}
 
 	
-	
+	
 }

+ 0 - 1
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -16,7 +16,6 @@ import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminLocationMapper;
 import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.CustomerMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AdminLocation;

+ 2 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -73,5 +73,7 @@ public class AFTConstants {
 	
 	public static final String CUSTOMER_TO_PUBLIC					= "转为公共客户";
 	
+	public static final String CUSTOMER_FOLLOW						= "跟进客户";
+	
 	public static final String CUSTOMER_VIEW_ALL					= "customer_view_all";
 }

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

@@ -104,5 +104,7 @@ public class ErrorConstants {
 
 	public static final String	M_CODE_ERROR						= "M_CODE_ERROR";
 	
-	public static final String MARKET_BOOTH_MAX						= "MARKET_BOOTH_MAX";				
+	public static final String MARKET_BOOTH_MAX						= "MARKET_BOOTH_MAX";	
+	
+	public static final String CUSTOMER_ALREADY_EXIST				= "CUSTOMER_ALREADY_EXIST";
 }

+ 23 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -621,6 +621,29 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 	
+	/**
+	 *  关于我们
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@RequestMapping(value="/portal/aboutUs")
+	public ModelAndView aboutUs(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/aboutUs");
+		return modelview;
+	}
+	
+	/**
+	 * 联系我们
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@RequestMapping(value="/portal/contactUs")
+	public ModelAndView contactUs(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/contactUs");
+		return modelview;
+	}
 	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
 		if (!banners.isEmpty()) {

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

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.CustomerLog;
 import com.goafanti.common.model.CustomerLogExample;
+import com.goafanti.customer.bo.CustomerOut;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,67 +11,74 @@ public interface CustomerLogMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	long countByExample(CustomerLogExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	int deleteByExample(CustomerLogExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	int insert(CustomerLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	int insertSelective(CustomerLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	List<CustomerLog> selectByExample(CustomerLogExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	CustomerLog selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") CustomerLog record, @Param("example") CustomerLogExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	int updateByExample(@Param("record") CustomerLog record, @Param("example") CustomerLogExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	int updateByPrimaryKeySelective(CustomerLog record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	int updateByPrimaryKey(CustomerLog record);
+
+	/**
+     * 查看操作日志
+     * @param customerId 客户编号
+     * @return
+     */
+    List<CustomerLog> listCustomerLog(@Param("cid") String customerId);
 }

+ 10 - 2
src/main/java/com/goafanti/common/dao/CustomerMapper.java

@@ -82,9 +82,17 @@ public interface CustomerMapper {
 	CustomerOut selectCustomerById(String id);
 
     /**
-     * 
+     *  查询团队 客户记录
      * @param ladderId 上层领导ID
-     * @return 查询团队 客户记录
+     * @return
      */
     List<Customer> selectByLadderId(@Param("ladderId")String ladderId);
+    
+    /**
+     * 客户详情-历史记录
+     * @param customerId
+     * @return
+     */
+    CustomerOut findCustomerHistory(@Param("id")String customerId);
+    
 }

+ 27 - 18
src/main/java/com/goafanti/common/dao/CustomerOrganizationInfoMapper.java

@@ -10,72 +10,81 @@ public interface CustomerOrganizationInfoMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	long countByExample(CustomerOrganizationInfoExample example);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int deleteByExample(CustomerOrganizationInfoExample example);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int insert(CustomerOrganizationInfo record);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int insertSelective(CustomerOrganizationInfo record);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	List<CustomerOrganizationInfo> selectByExample(CustomerOrganizationInfoExample example);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	CustomerOrganizationInfo selectByPrimaryKey(String id);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") CustomerOrganizationInfo record,
 			@Param("example") CustomerOrganizationInfoExample example);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByExample(@Param("record") CustomerOrganizationInfo record,
 			@Param("example") CustomerOrganizationInfoExample example);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByPrimaryKeySelective(CustomerOrganizationInfo record);
+
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByPrimaryKey(CustomerOrganizationInfo record);
-	/**
-	 * 删除
-	 */
-	int deleteCustomerOrganizationByCid(String cid);
+
 	/**
 	 * 修改
 	 */
 	int updateCustomerOrganizationByCid(CustomerOrganizationInfo coi);
+	
 	/**
-	 * 新增
+	 *  查询公司是否存在
+	 * @param companyName
+	 * @return
 	 */
-	int insertCustomerOrganization(CustomerOrganizationInfo cui);
-
+	int findCustomerOrganizationByName(@Param("companyName")String companyName);
 }

+ 12 - 25
src/main/java/com/goafanti/common/dao/CustomerUserInfoMapper.java

@@ -12,86 +12,73 @@ public interface CustomerUserInfoMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	long countByExample(CustomerUserInfoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int deleteByExample(CustomerUserInfoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int insert(CustomerUserInfo record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int insertSelective(CustomerUserInfo record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	List<CustomerUserInfo> selectByExample(CustomerUserInfoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	CustomerUserInfo selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByExampleSelective(@Param("record") CustomerUserInfo record,
 			@Param("example") CustomerUserInfoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByExample(@Param("record") CustomerUserInfo record, @Param("example") CustomerUserInfoExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByPrimaryKeySelective(CustomerUserInfo record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	int updateByPrimaryKey(CustomerUserInfo record);
 
 	/**
-	 * 删除
-	 */
-	int deleteCustomerUserByCid(String cid);
-
-	/**
-	 * 修改
-	 */
-	int updateCustomerUserByPrimaryKey(String cid);
-	/**
-	 * 新增
-	 */
-	int insertCustomerUser(CustomerUserInfo record);
-	/**
-	 * 查询联系人名称列表
+	 * 查询联系人列表
 	 */
 	List<CustomerUserInfo> selectCustomerUserList(String cid);
 	/**

+ 4 - 2
src/main/java/com/goafanti/common/enums/CustomerFollowFiled.java

@@ -19,9 +19,11 @@ public enum CustomerFollowFiled {
 	/** 面谈中**/
 	FOLLOW_CONTRACT_INTERVIEW(6,"面谈中"),
 	/** 已面签 **/
-	FOLLOW_THE_INTERVIEW(6,"已面签"),
+	FOLLOW_THE_INTERVIEW(7,"已面签"),
+	/** 无进度 **/
+	FOLLOW_NO_PROGRESS(8,"无进度"),
 	/** 未知  **/
-	OTHER(-1,"未知");
+	OTHER(null,"未知");
 	
 	private static Map<Integer, CustomerFollowFiled> status = new HashMap<Integer, CustomerFollowFiled>();
 

+ 7 - 1
src/main/java/com/goafanti/common/enums/CustomerIntentionFiled.java

@@ -22,8 +22,14 @@ public enum CustomerIntentionFiled {
 	INTENTION_DEMAND(7,"技术需求"),
 	/** 专家咨询  **/
 	INTENTION_CONSULTATION(8,"专家咨询"),
+	/** 团单合作  **/
+	INTENTION_TEAM_COOPERATION(9,"团单合作"),
+	/** 商标 **/
+	INTENTION_BRAND(10,"商标"),
+	/** 系统集成  **/
+	INTENTION_INTEGRATION(11,"系统集成"),
 	/** 未知  **/
-	OTHER(-1,"未知");
+	OTHER(null,"未知");
 	
 	private static Map<Integer, CustomerIntentionFiled> status = new HashMap<Integer, CustomerIntentionFiled>();
 

+ 25 - 22
src/main/java/com/goafanti/common/mapper/CustomerLogMapper.xml

@@ -5,13 +5,13 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="cid" jdbcType="VARCHAR" property="cid" />
     <result column="operator_name" jdbcType="VARCHAR" property="operatorName" />
     <result column="operator_type" jdbcType="VARCHAR" property="operatorType" />
-    <result column="operator_time" jdbcType="TIMESTAMP" property="operatorTime" />
+    <result column="operator_time" jdbcType="VARCHAR" property="operatorTime" />
     <result column="before_customer_status" jdbcType="VARCHAR" property="beforeCustomerStatus" />
     <result column="after_customer_status" jdbcType="VARCHAR" property="afterCustomerStatus" />
     <result column="before_customer_intention" jdbcType="VARCHAR" property="beforeCustomerIntention" />
@@ -25,7 +25,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -59,7 +59,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -93,7 +93,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     id, cid, operator_name, operator_type, operator_time, before_customer_status, after_customer_status, 
     before_customer_intention, after_customer_intention, before_follow_situation, after_follow_situation, 
@@ -103,7 +103,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     select
     <if test="distinct">
@@ -122,7 +122,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -133,7 +133,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     delete from customer_log
     where id = #{id,jdbcType=VARCHAR}
@@ -142,7 +142,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     delete from customer_log
     <if test="_parameter != null">
@@ -153,7 +153,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     insert into customer_log (id, cid, operator_name, 
       operator_type, operator_time, before_customer_status, 
@@ -162,7 +162,7 @@
       after_follow_situation, before_admin_name, 
       after_admin_name)
     values (#{id,jdbcType=VARCHAR}, #{cid,jdbcType=VARCHAR}, #{operatorName,jdbcType=VARCHAR}, 
-      #{operatorType,jdbcType=VARCHAR}, #{operatorTime,jdbcType=TIMESTAMP}, #{beforeCustomerStatus,jdbcType=VARCHAR}, 
+      #{operatorType,jdbcType=VARCHAR}, #{operatorTime,jdbcType=VARCHAR}, #{beforeCustomerStatus,jdbcType=VARCHAR}, 
       #{afterCustomerStatus,jdbcType=VARCHAR}, #{beforeCustomerIntention,jdbcType=VARCHAR}, 
       #{afterCustomerIntention,jdbcType=VARCHAR}, #{beforeFollowSituation,jdbcType=VARCHAR}, 
       #{afterFollowSituation,jdbcType=VARCHAR}, #{beforeAdminName,jdbcType=VARCHAR}, 
@@ -172,7 +172,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     insert into customer_log
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -230,7 +230,7 @@
         #{operatorType,jdbcType=VARCHAR},
       </if>
       <if test="operatorTime != null">
-        #{operatorTime,jdbcType=TIMESTAMP},
+        #{operatorTime,jdbcType=VARCHAR},
       </if>
       <if test="beforeCustomerStatus != null">
         #{beforeCustomerStatus,jdbcType=VARCHAR},
@@ -262,7 +262,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     select count(*) from customer_log
     <if test="_parameter != null">
@@ -273,7 +273,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     update customer_log
     <set>
@@ -290,7 +290,7 @@
         operator_type = #{record.operatorType,jdbcType=VARCHAR},
       </if>
       <if test="record.operatorTime != null">
-        operator_time = #{record.operatorTime,jdbcType=TIMESTAMP},
+        operator_time = #{record.operatorTime,jdbcType=VARCHAR},
       </if>
       <if test="record.beforeCustomerStatus != null">
         before_customer_status = #{record.beforeCustomerStatus,jdbcType=VARCHAR},
@@ -325,14 +325,14 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     update customer_log
     set id = #{record.id,jdbcType=VARCHAR},
       cid = #{record.cid,jdbcType=VARCHAR},
       operator_name = #{record.operatorName,jdbcType=VARCHAR},
       operator_type = #{record.operatorType,jdbcType=VARCHAR},
-      operator_time = #{record.operatorTime,jdbcType=TIMESTAMP},
+      operator_time = #{record.operatorTime,jdbcType=VARCHAR},
       before_customer_status = #{record.beforeCustomerStatus,jdbcType=VARCHAR},
       after_customer_status = #{record.afterCustomerStatus,jdbcType=VARCHAR},
       before_customer_intention = #{record.beforeCustomerIntention,jdbcType=VARCHAR},
@@ -349,7 +349,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     update customer_log
     <set>
@@ -363,7 +363,7 @@
         operator_type = #{operatorType,jdbcType=VARCHAR},
       </if>
       <if test="operatorTime != null">
-        operator_time = #{operatorTime,jdbcType=TIMESTAMP},
+        operator_time = #{operatorTime,jdbcType=VARCHAR},
       </if>
       <if test="beforeCustomerStatus != null">
         before_customer_status = #{beforeCustomerStatus,jdbcType=VARCHAR},
@@ -396,13 +396,13 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 16:56:48 CST 2017.
+      This element was generated on Wed Oct 25 15:20:07 CST 2017.
     -->
     update customer_log
     set cid = #{cid,jdbcType=VARCHAR},
       operator_name = #{operatorName,jdbcType=VARCHAR},
       operator_type = #{operatorType,jdbcType=VARCHAR},
-      operator_time = #{operatorTime,jdbcType=TIMESTAMP},
+      operator_time = #{operatorTime,jdbcType=VARCHAR},
       before_customer_status = #{beforeCustomerStatus,jdbcType=VARCHAR},
       after_customer_status = #{afterCustomerStatus,jdbcType=VARCHAR},
       before_customer_intention = #{beforeCustomerIntention,jdbcType=VARCHAR},
@@ -413,4 +413,7 @@
       after_admin_name = #{afterAdminName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <select id="listCustomerLog" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	select  <include refid="Base_Column_List" /> from customer_log where cid = #{cid,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 26 - 42
src/main/java/com/goafanti/common/mapper/CustomerMapper.xml

@@ -515,58 +515,42 @@
     c.company_name as companyName,
     c.location_province as locationProvince,
     c.company_industry as companyIndustry,
-    c.adress,
+    c.adress,c.remarks,
     d.name as adminName
     from customer a 
     left join customer_organization_info c on a.id=c.cid
     left join admin d on a.aid=d.id
     where a.id = #{id,jdbcType=VARCHAR}
   </select> 
-  
-  <update id="updCustomerByPrimaryKey" parameterType="com.goafanti.common.model.Customer">
-    update customer
-    <set>
-      <if test="aid != null">
-        aid = #{aid,jdbcType=VARCHAR},
-      </if>
-      <if test="paid != null">
-        paid = #{paid,jdbcType=VARCHAR},
-      </if>
-      <if test="shareType != null">
-        share_type = #{shareType,jdbcType=INTEGER},
-      </if>
-      <if test="customerType != null">
-        customer_type = #{customerType,jdbcType=INTEGER},
-      </if>
-      <if test="customerStatus != null">
-        customer_status = #{customerStatus,jdbcType=INTEGER},
-      </if>
-      <if test="companyIntention != null">
-        company_intention = #{companyIntention,jdbcType=CHAR},
-      </if>
-      <if test="followSituation != null">
-        follow_situation = #{followSituation,jdbcType=INTEGER},
-      </if>
-      <if test="tag != null">
-        tag = #{tag,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="followId != null">
-        follow_id = #{followId,jdbcType=VARCHAR},
-      </if>
-      <if test="effective != null">
-        effective = #{effective,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  
+
   <select id="selectByLadderId" parameterType="java.lang.String" resultMap="BaseResultMap">
   	select 
     <include refid="Base_Column_List" />
     from customer
     where aid = #{ladderId} or paid like concat('%',#{ladderId},'%')
   </select>
+  
+  <select id="findCustomerHistory" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerOut">
+  	select 
+		a.id as cid,a.aid, a.create_time as createTime,
+		a.follow_situation as followSituation,a.customer_status as customerStatus,
+		b.company_name as customerName,
+		c.followCount,
+		d.follow_date as followDate,
+		e.name as contactName,
+		f.operatorTime,
+		g.name as adminName
+	from  customer  a 
+	left join customer_organization_info b on a.id = b.cid 
+	left join (select ifnull(0,count(0)) as followCount,r.aid,r.cid from follow_up_record r group by r.aid,r.cid) c 
+		on a.id = c.cid and a.aid = c.aid
+	left join follow_up_record d on a.follow_id = d.id
+	left join customer_user_info e on d.cuid = e.id
+	left join (select l1.cid,l1.operator_time as operatorTime from customer_log l1 ,
+		(select cid, max(operator_time) as operator_time from customer_log  group by cid ) l2 
+		where l1.cid = l2.cid and l1.operator_time = l2.operator_time)f 
+		on a.id = f.cid
+	left join admin g on a.aid = g.id 
+	where a.id = #{id,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 54 - 24
src/main/java/com/goafanti/common/mapper/CustomerOrganizationInfoMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="cid" jdbcType="VARCHAR" property="cid" />
@@ -15,12 +15,13 @@
     <result column="location_area" jdbcType="VARCHAR" property="locationArea" />
     <result column="adress" jdbcType="VARCHAR" property="adress" />
     <result column="company_industry" jdbcType="VARCHAR" property="companyIndustry" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -54,7 +55,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -88,15 +89,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
-    id, cid, company_name, location_province, location_city, location_area, adress, company_industry
+    id, cid, company_name, location_province, location_city, location_area, adress, company_industry, 
+    remarks
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.CustomerOrganizationInfoExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select
     <if test="distinct">
@@ -115,7 +117,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -126,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     delete from customer_organization_info
     where id = #{id,jdbcType=VARCHAR}
@@ -135,7 +137,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     delete from customer_organization_info
     <if test="_parameter != null">
@@ -146,20 +148,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     insert into customer_organization_info (id, cid, company_name, 
       location_province, location_city, location_area, 
-      adress, company_industry)
+      adress, company_industry, remarks
+      )
     values (#{id,jdbcType=VARCHAR}, #{cid,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
       #{locationProvince,jdbcType=CHAR}, #{locationCity,jdbcType=VARCHAR}, #{locationArea,jdbcType=VARCHAR}, 
-      #{adress,jdbcType=VARCHAR}, #{companyIndustry,jdbcType=VARCHAR})
+      #{adress,jdbcType=VARCHAR}, #{companyIndustry,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.CustomerOrganizationInfo">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     insert into customer_organization_info
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -187,6 +191,9 @@
       <if test="companyIndustry != null">
         company_industry,
       </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -213,13 +220,16 @@
       <if test="companyIndustry != null">
         #{companyIndustry,jdbcType=VARCHAR},
       </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.CustomerOrganizationInfoExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select count(*) from customer_organization_info
     <if test="_parameter != null">
@@ -230,7 +240,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_organization_info
     <set>
@@ -258,6 +268,9 @@
       <if test="record.companyIndustry != null">
         company_industry = #{record.companyIndustry,jdbcType=VARCHAR},
       </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -267,7 +280,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_organization_info
     set id = #{record.id,jdbcType=VARCHAR},
@@ -277,7 +290,8 @@
       location_city = #{record.locationCity,jdbcType=VARCHAR},
       location_area = #{record.locationArea,jdbcType=VARCHAR},
       adress = #{record.adress,jdbcType=VARCHAR},
-      company_industry = #{record.companyIndustry,jdbcType=VARCHAR}
+      company_industry = #{record.companyIndustry,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -286,7 +300,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_organization_info
     <set>
@@ -311,14 +325,17 @@
       <if test="companyIndustry != null">
         company_industry = #{companyIndustry,jdbcType=VARCHAR},
       </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
     </set>
-    where cid = #{cid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.CustomerOrganizationInfo">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 13 20:04:10 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_organization_info
     set cid = #{cid,jdbcType=VARCHAR},
@@ -327,25 +344,38 @@
       location_city = #{locationCity,jdbcType=VARCHAR},
       location_area = #{locationArea,jdbcType=VARCHAR},
       adress = #{adress,jdbcType=VARCHAR},
-      company_industry = #{companyIndustry,jdbcType=VARCHAR}
+      company_industry = #{companyIndustry,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateCustomerOrganizationByCid">
+  <update id="updateCustomerOrganizationByCid" parameterType="com.goafanti.common.model.CustomerOrganizationInfo">
   	 update customer_organization_info
-  	 <set>     
+  	 <set>
       <if test="companyName != null">
         company_name = #{companyName,jdbcType=VARCHAR},
       </if>
       <if test="locationProvince != null">
         location_province = #{locationProvince,jdbcType=CHAR},
       </if>
+      <if test="locationCity != null">
+        location_city = #{locationCity,jdbcType=VARCHAR},
+      </if>
+      <if test="locationArea != null">
+        location_area = #{locationArea,jdbcType=VARCHAR},
+      </if>
       <if test="adress != null">
         adress = #{adress,jdbcType=VARCHAR},
       </if>
       <if test="companyIndustry != null">
         company_industry = #{companyIndustry,jdbcType=VARCHAR},
       </if>
-    </set>    
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+     </set>  
     where cid = #{cid,jdbcType=VARCHAR}
   </update>
+  <select id="findCustomerOrganizationByName" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select count(0) from customer_organization_info  where company_name = #{companyName,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 20 - 37
src/main/java/com/goafanti/common/mapper/CustomerUserInfoMapper.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 Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="cid" jdbcType="VARCHAR" property="cid" />
@@ -17,7 +17,6 @@
     <result column="wechat" jdbcType="VARCHAR" property="wechat" />
     <result column="depatrment" jdbcType="VARCHAR" property="depatrment" />
     <result column="customer_position" jdbcType="VARCHAR" property="customerPosition" />
-    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="tel_num" jdbcType="VARCHAR" property="telNum" />
     <result column="primary_flg" jdbcType="INTEGER" property="primaryFlg" />
   </resultMap>
@@ -25,7 +24,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -59,7 +58,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -93,16 +92,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
-    id, cid, name, sex, mobile, email, qq, wechat, depatrment, customer_position, remarks, 
-    tel_num, primary_flg
+    id, cid, name, sex, mobile, email, qq, wechat, depatrment, customer_position, tel_num, 
+    primary_flg
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.CustomerUserInfoExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select
     <if test="distinct">
@@ -121,7 +120,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -132,7 +131,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     delete from customer_user_info
     where id = #{id,jdbcType=VARCHAR}
@@ -141,7 +140,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     delete from customer_user_info
     <if test="_parameter != null">
@@ -152,24 +151,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     insert into customer_user_info (id, cid, name, 
       sex, mobile, email, qq, 
       wechat, depatrment, customer_position, 
-      remarks, tel_num, primary_flg
-      )
+      tel_num, primary_flg)
     values (#{id,jdbcType=VARCHAR}, #{cid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{sex,jdbcType=CHAR}, #{mobile,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, 
       #{wechat,jdbcType=VARCHAR}, #{depatrment,jdbcType=VARCHAR}, #{customerPosition,jdbcType=VARCHAR}, 
-      #{remarks,jdbcType=VARCHAR}, #{telNum,jdbcType=VARCHAR}, #{primaryFlg,jdbcType=VARCHAR}
-      )
+      #{telNum,jdbcType=VARCHAR}, #{primaryFlg,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.CustomerUserInfo">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     insert into customer_user_info
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -203,9 +200,6 @@
       <if test="customerPosition != null">
         customer_position,
       </if>
-      <if test="remarks != null">
-        remarks,
-      </if>
       <if test="telNum != null">
         tel_num,
       </if>
@@ -244,9 +238,6 @@
       <if test="customerPosition != null">
         #{customerPosition,jdbcType=VARCHAR},
       </if>
-      <if test="remarks != null">
-        #{remarks,jdbcType=VARCHAR},
-      </if>
       <if test="telNum != null">
         #{telNum,jdbcType=VARCHAR},
       </if>
@@ -259,7 +250,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     select count(*) from customer_user_info
     <if test="_parameter != null">
@@ -270,7 +261,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_user_info
     <set>
@@ -304,9 +295,6 @@
       <if test="record.customerPosition != null">
         customer_position = #{record.customerPosition,jdbcType=VARCHAR},
       </if>
-      <if test="record.remarks != null">
-        remarks = #{record.remarks,jdbcType=VARCHAR},
-      </if>
       <if test="record.telNum != null">
         tel_num = #{record.telNum,jdbcType=VARCHAR},
       </if>
@@ -322,7 +310,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_user_info
     set id = #{record.id,jdbcType=VARCHAR},
@@ -335,7 +323,6 @@
       wechat = #{record.wechat,jdbcType=VARCHAR},
       depatrment = #{record.depatrment,jdbcType=VARCHAR},
       customer_position = #{record.customerPosition,jdbcType=VARCHAR},
-      remarks = #{record.remarks,jdbcType=VARCHAR},
       tel_num = #{record.telNum,jdbcType=VARCHAR},
       primary_flg = #{record.primaryFlg,jdbcType=INTEGER}
     <if test="_parameter != null">
@@ -346,7 +333,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_user_info
     <set>
@@ -377,9 +364,6 @@
       <if test="customerPosition != null">
         customer_position = #{customerPosition,jdbcType=VARCHAR},
       </if>
-      <if test="remarks != null">
-        remarks = #{remarks,jdbcType=VARCHAR},
-      </if>
       <if test="telNum != null">
         tel_num = #{telNum,jdbcType=VARCHAR},
       </if>
@@ -393,7 +377,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Oct 14 17:29:26 CST 2017.
+      This element was generated on Wed Oct 25 09:39:54 CST 2017.
     -->
     update customer_user_info
     set cid = #{cid,jdbcType=VARCHAR},
@@ -405,7 +389,6 @@
       wechat = #{wechat,jdbcType=VARCHAR},
       depatrment = #{depatrment,jdbcType=VARCHAR},
       customer_position = #{customerPosition,jdbcType=VARCHAR},
-      remarks = #{remarks,jdbcType=VARCHAR},
       tel_num = #{telNum,jdbcType=VARCHAR},
       primary_flg = #{primaryFlg,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
@@ -425,7 +408,7 @@
     where 1=1 and cid = #{cid,jdbcType=VARCHAR} and primary_flg=0
   </select>
   
-  <update id="updataPrimaryFlg" parameterType="java.lang.String" >
+  <update id="updataPrimaryFlg" parameterType="java.lang.String">
     update customer_user_info set primary_flg=1 where 1=1 and id = #{id,jdbcType=VARCHAR}
   </update>
   

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

@@ -409,7 +409,8 @@
 		c.name as adminName
 	from follow_up_record a left join customer_user_info b on a.cuid = b.id
 	left join admin c on a.aid = c.id
-	where a.cid = #{cid,jdbcType=VARCHAR} and a.effective = 0
+	where a.cid = #{cid,jdbcType=VARCHAR} and a.effective = 0 
+	order by followDate desc
   </select>
   
   <update id="deleteFollowUpRecord" parameterType="java.lang.String">

+ 42 - 42
src/main/java/com/goafanti/common/model/CustomerLog.java

@@ -6,74 +6,74 @@ public class CustomerLog {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.id
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.cid
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.operator_name
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String operatorName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.operator_type
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String operatorType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.operator_time
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
-	private Date operatorTime;
+	private String operatorTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.before_customer_status
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String beforeCustomerStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.after_customer_status
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String afterCustomerStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.before_customer_intention
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String beforeCustomerIntention;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.after_customer_intention
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String afterCustomerIntention;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.before_follow_situation
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String beforeFollowSituation;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.after_follow_situation
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String afterFollowSituation;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.before_admin_name
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String beforeAdminName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_log.after_admin_name
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	private String afterAdminName;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.id
 	 * @return  the value of customer_log.id
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -82,7 +82,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.id
 	 * @param id  the value for customer_log.id
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -91,7 +91,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.cid
 	 * @return  the value of customer_log.cid
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getCid() {
 		return cid;
@@ -100,7 +100,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.cid
 	 * @param cid  the value for customer_log.cid
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
@@ -109,7 +109,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.operator_name
 	 * @return  the value of customer_log.operator_name
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getOperatorName() {
 		return operatorName;
@@ -118,7 +118,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.operator_name
 	 * @param operatorName  the value for customer_log.operator_name
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setOperatorName(String operatorName) {
 		this.operatorName = operatorName;
@@ -127,7 +127,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.operator_type
 	 * @return  the value of customer_log.operator_type
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getOperatorType() {
 		return operatorType;
@@ -136,7 +136,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.operator_type
 	 * @param operatorType  the value for customer_log.operator_type
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setOperatorType(String operatorType) {
 		this.operatorType = operatorType;
@@ -145,25 +145,25 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.operator_time
 	 * @return  the value of customer_log.operator_time
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
-	public Date getOperatorTime() {
+	public String getOperatorTime() {
 		return operatorTime;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.operator_time
 	 * @param operatorTime  the value for customer_log.operator_time
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
-	public void setOperatorTime(Date operatorTime) {
+	public void setOperatorTime(String operatorTime) {
 		this.operatorTime = operatorTime;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.before_customer_status
 	 * @return  the value of customer_log.before_customer_status
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getBeforeCustomerStatus() {
 		return beforeCustomerStatus;
@@ -172,7 +172,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.before_customer_status
 	 * @param beforeCustomerStatus  the value for customer_log.before_customer_status
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setBeforeCustomerStatus(String beforeCustomerStatus) {
 		this.beforeCustomerStatus = beforeCustomerStatus;
@@ -181,7 +181,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.after_customer_status
 	 * @return  the value of customer_log.after_customer_status
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getAfterCustomerStatus() {
 		return afterCustomerStatus;
@@ -190,7 +190,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.after_customer_status
 	 * @param afterCustomerStatus  the value for customer_log.after_customer_status
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setAfterCustomerStatus(String afterCustomerStatus) {
 		this.afterCustomerStatus = afterCustomerStatus;
@@ -199,7 +199,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.before_customer_intention
 	 * @return  the value of customer_log.before_customer_intention
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getBeforeCustomerIntention() {
 		return beforeCustomerIntention;
@@ -208,7 +208,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.before_customer_intention
 	 * @param beforeCustomerIntention  the value for customer_log.before_customer_intention
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setBeforeCustomerIntention(String beforeCustomerIntention) {
 		this.beforeCustomerIntention = beforeCustomerIntention;
@@ -217,7 +217,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.after_customer_intention
 	 * @return  the value of customer_log.after_customer_intention
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getAfterCustomerIntention() {
 		return afterCustomerIntention;
@@ -226,7 +226,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.after_customer_intention
 	 * @param afterCustomerIntention  the value for customer_log.after_customer_intention
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setAfterCustomerIntention(String afterCustomerIntention) {
 		this.afterCustomerIntention = afterCustomerIntention;
@@ -235,7 +235,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.before_follow_situation
 	 * @return  the value of customer_log.before_follow_situation
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getBeforeFollowSituation() {
 		return beforeFollowSituation;
@@ -244,7 +244,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.before_follow_situation
 	 * @param beforeFollowSituation  the value for customer_log.before_follow_situation
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setBeforeFollowSituation(String beforeFollowSituation) {
 		this.beforeFollowSituation = beforeFollowSituation;
@@ -253,7 +253,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.after_follow_situation
 	 * @return  the value of customer_log.after_follow_situation
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getAfterFollowSituation() {
 		return afterFollowSituation;
@@ -262,7 +262,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.after_follow_situation
 	 * @param afterFollowSituation  the value for customer_log.after_follow_situation
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setAfterFollowSituation(String afterFollowSituation) {
 		this.afterFollowSituation = afterFollowSituation;
@@ -271,7 +271,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.before_admin_name
 	 * @return  the value of customer_log.before_admin_name
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getBeforeAdminName() {
 		return beforeAdminName;
@@ -280,7 +280,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.before_admin_name
 	 * @param beforeAdminName  the value for customer_log.before_admin_name
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setBeforeAdminName(String beforeAdminName) {
 		this.beforeAdminName = beforeAdminName;
@@ -289,7 +289,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_log.after_admin_name
 	 * @return  the value of customer_log.after_admin_name
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getAfterAdminName() {
 		return afterAdminName;
@@ -298,7 +298,7 @@ public class CustomerLog {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_log.after_admin_name
 	 * @param afterAdminName  the value for customer_log.after_admin_name
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setAfterAdminName(String afterAdminName) {
 		this.afterAdminName = afterAdminName;

+ 36 - 26
src/main/java/com/goafanti/common/model/CustomerLogExample.java

@@ -7,23 +7,23 @@ import java.util.Date;
 public class CustomerLogExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public CustomerLogExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -453,52 +453,62 @@ public class CustomerLogExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andOperatorTimeEqualTo(Date value) {
+		public Criteria andOperatorTimeEqualTo(String value) {
 			addCriterion("operator_time =", value, "operatorTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andOperatorTimeNotEqualTo(Date value) {
+		public Criteria andOperatorTimeNotEqualTo(String value) {
 			addCriterion("operator_time <>", value, "operatorTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andOperatorTimeGreaterThan(Date value) {
+		public Criteria andOperatorTimeGreaterThan(String value) {
 			addCriterion("operator_time >", value, "operatorTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andOperatorTimeGreaterThanOrEqualTo(Date value) {
+		public Criteria andOperatorTimeGreaterThanOrEqualTo(String value) {
 			addCriterion("operator_time >=", value, "operatorTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andOperatorTimeLessThan(Date value) {
+		public Criteria andOperatorTimeLessThan(String value) {
 			addCriterion("operator_time <", value, "operatorTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andOperatorTimeLessThanOrEqualTo(Date value) {
+		public Criteria andOperatorTimeLessThanOrEqualTo(String value) {
 			addCriterion("operator_time <=", value, "operatorTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andOperatorTimeIn(List<Date> values) {
+		public Criteria andOperatorTimeLike(String value) {
+			addCriterion("operator_time like", value, "operatorTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOperatorTimeNotLike(String value) {
+			addCriterion("operator_time not like", value, "operatorTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOperatorTimeIn(List<String> values) {
 			addCriterion("operator_time in", values, "operatorTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andOperatorTimeNotIn(List<Date> values) {
+		public Criteria andOperatorTimeNotIn(List<String> values) {
 			addCriterion("operator_time not in", values, "operatorTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andOperatorTimeBetween(Date value1, Date value2) {
+		public Criteria andOperatorTimeBetween(String value1, String value2) {
 			addCriterion("operator_time between", value1, value2, "operatorTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andOperatorTimeNotBetween(Date value1, Date value2) {
+		public Criteria andOperatorTimeNotBetween(String value1, String value2) {
 			addCriterion("operator_time not between", value1, value2, "operatorTime");
 			return (Criteria) this;
 		}
@@ -1066,7 +1076,7 @@ public class CustomerLogExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_log
-	 * @mbg.generated  Fri Oct 13 16:56:48 CST 2017
+	 * @mbg.generated  Wed Oct 25 15:20:07 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 47 - 24
src/main/java/com/goafanti/common/model/CustomerOrganizationInfo.java

@@ -4,49 +4,54 @@ public class CustomerOrganizationInfo {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.id
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.cid
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.company_name
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String companyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_province
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String locationProvince;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_city
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String locationCity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.location_area
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String locationArea;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.adress
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String adress;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.company_industry
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String companyIndustry;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_organization_info.remarks
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
+	 */
+	private String remarks;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.id
 	 * @return  the value of customer_organization_info.id
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -55,7 +60,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.id
 	 * @param id  the value for customer_organization_info.id
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -64,7 +69,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.cid
 	 * @return  the value of customer_organization_info.cid
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getCid() {
 		return cid;
@@ -73,7 +78,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.cid
 	 * @param cid  the value for customer_organization_info.cid
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
@@ -82,7 +87,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.company_name
 	 * @return  the value of customer_organization_info.company_name
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -91,7 +96,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.company_name
 	 * @param companyName  the value for customer_organization_info.company_name
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
@@ -100,7 +105,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.location_province
 	 * @return  the value of customer_organization_info.location_province
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getLocationProvince() {
 		return locationProvince;
@@ -109,7 +114,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.location_province
 	 * @param locationProvince  the value for customer_organization_info.location_province
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setLocationProvince(String locationProvince) {
 		this.locationProvince = locationProvince;
@@ -118,7 +123,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.location_city
 	 * @return  the value of customer_organization_info.location_city
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getLocationCity() {
 		return locationCity;
@@ -127,7 +132,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.location_city
 	 * @param locationCity  the value for customer_organization_info.location_city
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setLocationCity(String locationCity) {
 		this.locationCity = locationCity;
@@ -136,7 +141,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.location_area
 	 * @return  the value of customer_organization_info.location_area
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getLocationArea() {
 		return locationArea;
@@ -145,7 +150,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.location_area
 	 * @param locationArea  the value for customer_organization_info.location_area
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setLocationArea(String locationArea) {
 		this.locationArea = locationArea;
@@ -154,7 +159,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.adress
 	 * @return  the value of customer_organization_info.adress
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getAdress() {
 		return adress;
@@ -163,7 +168,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.adress
 	 * @param adress  the value for customer_organization_info.adress
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setAdress(String adress) {
 		this.adress = adress;
@@ -172,7 +177,7 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.company_industry
 	 * @return  the value of customer_organization_info.company_industry
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getCompanyIndustry() {
 		return companyIndustry;
@@ -181,9 +186,27 @@ public class CustomerOrganizationInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.company_industry
 	 * @param companyIndustry  the value for customer_organization_info.company_industry
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setCompanyIndustry(String companyIndustry) {
 		this.companyIndustry = companyIndustry;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_organization_info.remarks
+	 * @return  the value of customer_organization_info.remarks
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_organization_info.remarks
+	 * @param remarks  the value for customer_organization_info.remarks
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
 }

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

@@ -6,23 +6,23 @@ import java.util.List;
 public class CustomerOrganizationInfoExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public CustomerOrganizationInfoExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -30,7 +30,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -38,7 +38,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -46,7 +46,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -54,7 +54,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -62,7 +62,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -70,7 +70,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -78,7 +78,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -88,7 +88,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -100,7 +100,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -109,7 +109,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -119,7 +119,7 @@ public class CustomerOrganizationInfoExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -721,11 +721,81 @@ public class CustomerOrganizationInfoExample {
 			addCriterion("company_industry not between", value1, value2, "companyIndustry");
 			return (Criteria) this;
 		}
+
+		public Criteria andRemarksIsNull() {
+			addCriterion("remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIsNotNull() {
+			addCriterion("remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksEqualTo(String value) {
+			addCriterion("remarks =", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotEqualTo(String value) {
+			addCriterion("remarks <>", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThan(String value) {
+			addCriterion("remarks >", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("remarks >=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThan(String value) {
+			addCriterion("remarks <", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThanOrEqualTo(String value) {
+			addCriterion("remarks <=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLike(String value) {
+			addCriterion("remarks like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotLike(String value) {
+			addCriterion("remarks not like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIn(List<String> values) {
+			addCriterion("remarks in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotIn(List<String> values) {
+			addCriterion("remarks not in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksBetween(String value1, String value2) {
+			addCriterion("remarks between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotBetween(String value1, String value2) {
+			addCriterion("remarks not between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_organization_info
-	 * @mbg.generated  Fri Oct 13 20:04:10 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 36 - 59
src/main/java/com/goafanti/common/model/CustomerUserInfo.java

@@ -4,74 +4,69 @@ public class CustomerUserInfo {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.id
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.cid
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.name
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String name;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.sex
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String sex;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.mobile
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String mobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.email
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String email;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.qq
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String qq;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.wechat
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String wechat;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.depatrment
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String depatrment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.customer_position
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String customerPosition;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.remarks
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
-	 */
-	private String remarks;
-	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.tel_num
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private String telNum;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column customer_user_info.primary_flg
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	private Integer primaryFlg;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.id
 	 * @return  the value of customer_user_info.id
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getId() {
 		return id;
@@ -80,7 +75,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.id
 	 * @param id  the value for customer_user_info.id
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -89,7 +84,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.cid
 	 * @return  the value of customer_user_info.cid
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getCid() {
 		return cid;
@@ -98,7 +93,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.cid
 	 * @param cid  the value for customer_user_info.cid
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
@@ -107,7 +102,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.name
 	 * @return  the value of customer_user_info.name
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getName() {
 		return name;
@@ -116,7 +111,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.name
 	 * @param name  the value for customer_user_info.name
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -125,7 +120,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.sex
 	 * @return  the value of customer_user_info.sex
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getSex() {
 		return sex;
@@ -134,7 +129,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.sex
 	 * @param sex  the value for customer_user_info.sex
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setSex(String sex) {
 		this.sex = sex;
@@ -143,7 +138,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.mobile
 	 * @return  the value of customer_user_info.mobile
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getMobile() {
 		return mobile;
@@ -152,7 +147,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.mobile
 	 * @param mobile  the value for customer_user_info.mobile
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
@@ -161,7 +156,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.email
 	 * @return  the value of customer_user_info.email
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getEmail() {
 		return email;
@@ -170,7 +165,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.email
 	 * @param email  the value for customer_user_info.email
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -179,7 +174,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.qq
 	 * @return  the value of customer_user_info.qq
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getQq() {
 		return qq;
@@ -188,7 +183,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.qq
 	 * @param qq  the value for customer_user_info.qq
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setQq(String qq) {
 		this.qq = qq;
@@ -197,7 +192,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.wechat
 	 * @return  the value of customer_user_info.wechat
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getWechat() {
 		return wechat;
@@ -206,7 +201,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.wechat
 	 * @param wechat  the value for customer_user_info.wechat
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setWechat(String wechat) {
 		this.wechat = wechat;
@@ -215,7 +210,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.depatrment
 	 * @return  the value of customer_user_info.depatrment
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getDepatrment() {
 		return depatrment;
@@ -224,7 +219,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.depatrment
 	 * @param depatrment  the value for customer_user_info.depatrment
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setDepatrment(String depatrment) {
 		this.depatrment = depatrment;
@@ -233,7 +228,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.customer_position
 	 * @return  the value of customer_user_info.customer_position
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getCustomerPosition() {
 		return customerPosition;
@@ -242,34 +237,16 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.customer_position
 	 * @param customerPosition  the value for customer_user_info.customer_position
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setCustomerPosition(String customerPosition) {
 		this.customerPosition = customerPosition;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.remarks
-	 * @return  the value of customer_user_info.remarks
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
-	 */
-	public String getRemarks() {
-		return remarks;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.remarks
-	 * @param remarks  the value for customer_user_info.remarks
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
-	 */
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-
-	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.tel_num
 	 * @return  the value of customer_user_info.tel_num
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getTelNum() {
 		return telNum;
@@ -278,7 +255,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.tel_num
 	 * @param telNum  the value for customer_user_info.tel_num
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setTelNum(String telNum) {
 		this.telNum = telNum;
@@ -287,7 +264,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column customer_user_info.primary_flg
 	 * @return  the value of customer_user_info.primary_flg
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public Integer getPrimaryFlg() {
 		return primaryFlg;
@@ -296,7 +273,7 @@ public class CustomerUserInfo {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column customer_user_info.primary_flg
 	 * @param primaryFlg  the value for customer_user_info.primary_flg
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setPrimaryFlg(Integer primaryFlg) {
 		this.primaryFlg = primaryFlg;

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

@@ -6,23 +6,23 @@ import java.util.List;
 public class CustomerUserInfoExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public CustomerUserInfoExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -30,7 +30,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -38,7 +38,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -46,7 +46,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -54,7 +54,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -62,7 +62,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -70,7 +70,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -78,7 +78,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -88,7 +88,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -100,7 +100,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -109,7 +109,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -119,7 +119,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -862,76 +862,6 @@ public class CustomerUserInfoExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andRemarksIsNull() {
-			addCriterion("remarks is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksIsNotNull() {
-			addCriterion("remarks is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksEqualTo(String value) {
-			addCriterion("remarks =", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotEqualTo(String value) {
-			addCriterion("remarks <>", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksGreaterThan(String value) {
-			addCriterion("remarks >", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksGreaterThanOrEqualTo(String value) {
-			addCriterion("remarks >=", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksLessThan(String value) {
-			addCriterion("remarks <", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksLessThanOrEqualTo(String value) {
-			addCriterion("remarks <=", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksLike(String value) {
-			addCriterion("remarks like", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotLike(String value) {
-			addCriterion("remarks not like", value, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksIn(List<String> values) {
-			addCriterion("remarks in", values, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotIn(List<String> values) {
-			addCriterion("remarks not in", values, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksBetween(String value1, String value2) {
-			addCriterion("remarks between", value1, value2, "remarks");
-			return (Criteria) this;
-		}
-
-		public Criteria andRemarksNotBetween(String value1, String value2) {
-			addCriterion("remarks not between", value1, value2, "remarks");
-			return (Criteria) this;
-		}
-
 		public Criteria andTelNumIsNull() {
 			addCriterion("tel_num is null");
 			return (Criteria) this;
@@ -1065,7 +995,7 @@ public class CustomerUserInfoExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table customer_user_info
-	 * @mbg.generated  Sat Oct 14 17:29:26 CST 2017
+	 * @mbg.generated  Wed Oct 25 09:39:54 CST 2017
 	 */
 	public static class Criterion {
 		private String condition;

+ 1 - 0
src/main/java/com/goafanti/customer/bo/CustomerIn.java

@@ -55,6 +55,7 @@ public class CustomerIn {
 	
 	/** 跟单人 **/
 	private String adminName;
+	
 	/** 跟单人 **/
 	private String beforeAdminName;
 	

+ 14 - 3
src/main/java/com/goafanti/customer/bo/CustomerOut.java

@@ -122,10 +122,9 @@ public class CustomerOut {
 	 */
 	private String adminName;
 	
-	/**
-	 * 跟单时间
-	 */
+	/**跟单时间**/
 	private String followDate;
+	
 	/** 操作前客户状态  **/
 	private String beforeCustomerStatus;
 	
@@ -134,12 +133,16 @@ public class CustomerOut {
 	
 	/** 操作前跟进进度 **/
 	private String beforeFollowSituation;
+	
 	/** 跟单人 **/
 	private String beforeAdminName;
 	
 	/** 公司标签 **/
 	private String tag;
 	
+	/** 操作时间 **/
+	private String operatorTime;
+	
 	public Integer getCustomerType() {
 		return customerType;
 	}
@@ -444,6 +447,14 @@ public class CustomerOut {
 		this.tag = tag;
 	}
 
+	public String getOperatorTime() {
+		return operatorTime;
+	}
+
+	public void setOperatorTime(String operatorTime) {
+		this.operatorTime = operatorTime;
+	}
+
 	@Override
 	public String toString() {
 		return "CustomerOut [customerType=" + customerType + ", _customerType=" + _customerType + ", id=" + id

+ 37 - 8
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -28,6 +28,7 @@ import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.Customer;
 import com.goafanti.common.model.CustomerOrganizationInfo;
@@ -62,6 +63,11 @@ public class AdminCustomerApiController extends BaseApiController {
 	@RequestMapping(value = "/addCustomer", method = RequestMethod.POST)
 	public Result addCustomer(CustomerIn cusIn,CustomerOrganizationInfo coi,CustomerUserInfo cui,FollowUpRecord fur) throws ParseException, IllegalAccessException, InvocationTargetException {
 		Result res=new Result();
+		//查询客户是否已经存在
+		if(customerOrganizationService.findCustomerOrganizationByName(cusIn.getCompanyName())>0){
+			res.getError().add(buildError(ErrorConstants.CUSTOMER_ALREADY_EXIST));
+			return res;
+		}
 		//添加 customer
 		String customerId = UUID.randomUUID().toString();//客户记录ID
 		String  customerUsrId= UUID.randomUUID().toString();//客户联系人ID
@@ -94,7 +100,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		//插入跟进表
 		followUpService.addFollowUp(fur);
 		//添加日志
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_CREATE,customerId);
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_CREATE,customerId);
 		return res;
 	}
 	
@@ -109,7 +115,7 @@ public class AdminCustomerApiController extends BaseApiController {
 	public Result deleteCustomer(CustomerIn cusIn) throws ParseException {
 		Result res=new Result();
 		customerService.deleteCustomer(cusIn.getId());
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_DELETE,cusIn.getId());
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_DELETE,cusIn.getId());
 		return res;
 	}
 	
@@ -138,7 +144,7 @@ public class AdminCustomerApiController extends BaseApiController {
 	}
 
 	/**
-	 * 查看私有客户
+	 * 查看个人客户列表
 	 * @param request
 	 * @return
 	 */
@@ -152,7 +158,7 @@ public class AdminCustomerApiController extends BaseApiController {
 	
 	
 	/**
-	 * 查询客户资料
+	 * 查询客户详情
 	 * 
 	 * @return
 	 */
@@ -229,7 +235,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		//更新公司表
 		customerOrganizationService.updateCustomerOrganizationInfo(coi);
 		//插入日志表
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_MODIFY,cusIn.getId());
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_MODIFY,cusIn.getId());
 	    return res;
 	}
 	
@@ -249,7 +255,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		//更新主表
 		customerService.updateCustomer(c);
 		//插入日志表
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_TRANSFER,cusIn.getId());
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_TRANSFER,cusIn.getId());
 	    return res;
 	}
 	
@@ -309,6 +315,7 @@ public class AdminCustomerApiController extends BaseApiController {
 			e.printStackTrace();
 		}	
 		customerService.updateCustomer(cus);
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_FOLLOW,cusIn.getId());
 		return res;
 	}
 	
@@ -421,7 +428,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		//更新主表
 		customerService.updateCustomer(c);
 		//插入日志表
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_RECEIVE,cusIn.getId());
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_RECEIVE,cusIn.getId());
 	    return res;
 	}
 	
@@ -455,7 +462,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		//更新主表
 		customerService.updateCustomer(c);
 		//插入日志表
-		customerService.saveCustomerLogo(cusIn, AFTConstants.CUSTOMER_TO_PUBLIC,cusIn.getId());
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_TO_PUBLIC,cusIn.getId());
 	    return res;
 	}
 	
@@ -472,4 +479,26 @@ public class AdminCustomerApiController extends BaseApiController {
 		return res;
 	}
 
+	/**
+	 * 查看日志信息
+	 * @param customerId
+	 * @return
+	 */
+	@RequestMapping(value = "/listCustomerLog",method = RequestMethod.GET)
+	public Result listCustomerLog(String customerId){
+		Result  res = new Result();
+		res.setData(customerService.listCustomerLog(customerId));
+		return res;
+	}
+	
+	/**
+	 * 客户详情-操作记录
+	 * @return
+	 */
+	@RequestMapping(value = "/findCustomerHistory",method = RequestMethod.GET)
+	public Result findCustomerHistory(String customerId){
+		Result res = new Result();
+		res.setData(customerService.findCustomerHistory(customerId));
+		return res;
+	}
 }

+ 0 - 11
src/main/java/com/goafanti/customer/service/CustomerLogoService.java

@@ -1,11 +0,0 @@
-package com.goafanti.customer.service;
-
-import com.goafanti.common.model.CustomerLog;
-
-public interface CustomerLogoService {
-	/**
-	 * 添加操作日志
-	 * @param cLog
-	 */
-	public void saveLogo(CustomerLog cLog);
-}

+ 5 - 0
src/main/java/com/goafanti/customer/service/CustomerOrganizationService.java

@@ -16,4 +16,9 @@ public interface CustomerOrganizationService {
 	 * @return
 	 */
 	int updateCustomerOrganizationInfo(CustomerOrganizationInfo coi);
+	
+	/**
+	 * 查看客户是否已经存在
+	 */
+	int findCustomerOrganizationByName(String companyName);
 }

+ 18 - 2
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -1,6 +1,9 @@
 package com.goafanti.customer.service;
 
+import java.util.List;
+
 import com.goafanti.common.model.Customer;
+import com.goafanti.common.model.CustomerLog;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.customer.bo.CustomerIn;
 import com.goafanti.customer.bo.CustomerOut;
@@ -61,7 +64,7 @@ public interface CustomerService {
 	 * 
 	 * @param cus 添加日志
 	 */
-	public void saveCustomerLogo(CustomerIn cus,String operatorType,String cid);
+	public void saveCustomerLog(CustomerIn cus,String operatorType,String cid);
 	
 	/**
 	 * 
@@ -83,5 +86,18 @@ public interface CustomerService {
 	 * @return 查询公司基本信息
 	 */
 	public CustomerOut findCustomerBaseInfo(String id);
-
+
+	/**
+	 *  查看日志信息
+	 * @param customerId
+	 * @return
+	 */
+	public List<CustomerLog> listCustomerLog(String customerId);
+	
+	/**
+	 *  客户详情-历史记录
+	 * @param customerId
+	 * @return
+	 */
+	public CustomerOut findCustomerHistory(String customerId);
 }

+ 4 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerOrganizationServiceImp.java

@@ -26,6 +26,10 @@ public class CustomerOrganizationServiceImp extends BaseMybatisDao<CustomerOrgan
 	public int updateCustomerOrganizationInfo(CustomerOrganizationInfo coi) {
 		return customerOrganizationInfoMapper.updateCustomerOrganizationByCid(coi);
 	}
+	@Override
+	public int findCustomerOrganizationByName(String companyName) {
+		return customerOrganizationInfoMapper.findCustomerOrganizationByName(companyName);
+	}
 
 
 }

+ 48 - 18
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.goafanti.customer.service.impl;
 
 import java.lang.reflect.InvocationTargetException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -36,7 +37,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	@Autowired
 	private AdminMapper adminMapper;
 	@Autowired
-	private CustomerLogMapper CustomerLogMapper;
+	private CustomerLogMapper customerLogMapper;
 	@Override
 	public int addCustomer(Customer cus) {
 		Date data =new Date();
@@ -159,6 +160,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 		switch(co.getCustomerType()){
 			case 0 : co.set_customerType("个人客户") ;break;
 			case 1 : co.set_customerType("公司客户") ;break;
+			case 2 : co.set_customerType("团体单位") ;break;
 		}
 		switch(co.getCustomerStatus()){
 			case 0 : co.set_customerStatus("新客户") ;break;
@@ -177,6 +179,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 			case 5 : co.set_followSituation("已签合同") ;break;
 			case 6 : co.set_followSituation("面谈中") ;break;
 			case 7 : co.set_followSituation("已面签") ;break;
+			case 8 : co.set_followSituation("无进度") ;break;
 		}
 		String _companyIntention = "";
 		if(StringUtils.isNotBlank(co.getCompanyIntention())){
@@ -187,15 +190,20 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 				temp = new String[]{co.getCompanyIntention()};
 			}
 			for(String s:temp){
-				if(s.equals("0")) _companyIntention += "发明专利&nbsp;";
-				if(s.equals("1")) _companyIntention += "实用型新型专利&nbsp;";
-				if(s.equals("2")) _companyIntention += "外观专利&nbsp;";
-				if(s.equals("3")) _companyIntention += "软件著作权&nbsp;";
-				if(s.equals("4")) _companyIntention += "知识产权贯标&nbsp;";
-				if(s.equals("5")) _companyIntention += "高企认定&nbsp;";
-				if(s.equals("6")) _companyIntention += "技术成果&nbsp;";
+				if(s.equals("0")) _companyIntention += "发明专利-";
+				if(s.equals("1")) _companyIntention += "实用型新型专利-";
+				if(s.equals("2")) _companyIntention += "外观专利-";
+				if(s.equals("3")) _companyIntention += "软件著作权-";
+				if(s.equals("4")) _companyIntention += "知识产权贯标-";
+				if(s.equals("5")) _companyIntention += "高企认定-";
+				if(s.equals("6")) _companyIntention += "技术成果-";
+				if(s.equals("7")) _companyIntention += "技术需求-";
+				if(s.equals("8")) _companyIntention += "专家咨询-";
+				if(s.equals("9")) _companyIntention += "团单合作-";
+				if(s.equals("10")) _companyIntention += "商标-";
+				if(s.equals("11")) _companyIntention += "系统集成-";
 			}
-			_companyIntention = _companyIntention.substring(0, _companyIntention.length()-6);
+			_companyIntention = _companyIntention.substring(0, _companyIntention.length()-1);
 		}		
 		co.set_companyIntention(_companyIntention);
 		if(StringUtils.isNotBlank(co.getFollowDate())) co.setFollowDate(co.getFollowDate().substring(0,19));
@@ -224,26 +232,26 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	}
 	
 	@Override
-	public void saveCustomerLogo(CustomerIn cus,String operatorType,String cid){
+	public void saveCustomerLog(CustomerIn cus,String operatorType,String cid){
 		/* 记录日志 */
 		CustomerLog log = new CustomerLog();
 		log.setId(UUID.randomUUID().toString());
 		log.setCid(cid);
-		log.setOperatorTime(new Date());
+		log.setOperatorTime(new SimpleDateFormat(AFTConstants.YYYYMMDDHHMMSS).format(new Date()));
 		log.setOperatorName(TokenManager.getAdminToken().getName());
 		Customer c =  customerMapper.selectByPrimaryKey(cid) ;
 		if(operatorType.equals(AFTConstants.CUSTOMER_CREATE)){//创建用户
 			log.setAfterFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getFollowSituation())).getDesc()); //跟进状态
 			log.setAfterCustomerIntention(getCompanyIntention(cus.getCompanyIntention())); //跟进意向
 			log.setAfterCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getCustomerStatus())).getDesc()); //客户状态
-			log.setAfterAdminName(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getName());
+			log.setAfterAdminName(TokenManager.getAdminToken().getName());
 			log.setOperatorType(AFTConstants.CUSTOMER_CREATE);
 		}else if(operatorType.equals(AFTConstants.CUSTOMER_MODIFY)){ //修改用户
 			log.setBeforeAdminName(cus.getBeforeAdminName());//修改前操作人
 			log.setBeforeCustomerIntention(getCompanyIntention(c.getCompanyIntention())); //修改前跟进意向
 			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(c.getCustomerStatus()).getDesc()); //修改前跟进状态
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(c.getFollowSituation()).getDesc());//修改前跟进进度
-			log.setAfterFollowSituation(CustomerFollowFiled.getField(c.getFollowSituation()).getDesc()); //修改后跟进状态
+			log.setAfterFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getFollowSituation())).getDesc()); //修改后跟进状态
 			log.setAfterCustomerIntention(getCompanyIntention(cus.getCompanyIntention())); //修改后跟进意向
 			log.setAfterCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getCustomerStatus())).getDesc()); //修改后客户状态
 			log.setOperatorType(AFTConstants.CUSTOMER_MODIFY);
@@ -267,14 +275,24 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getBeforeCustomerStatus())).getDesc()); //领取前跟进状态
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getBeforeFollowSituation())).getDesc());//领取前跟进进度
 			log.setOperatorType(AFTConstants.CUSTOMER_RECEIVE);
-		}else if(operatorType.equals(AFTConstants.CUSTOMER_TO_PUBLIC)){
+		}else if(operatorType.equals(AFTConstants.CUSTOMER_TO_PUBLIC)){ //转为公共客户
 			log.setBeforeAdminName(cus.getBeforeAdminName());//转为公共客户前跟进人
 			log.setBeforeCustomerIntention(getCompanyIntention(cus.getBeforeCompanyIntention())); //修改前跟进意向
 			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getBeforeCustomerStatus())).getDesc()); //修改前跟进状态
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getBeforeFollowSituation())).getDesc());//修改前跟进进度
 			log.setOperatorType(AFTConstants.CUSTOMER_TO_PUBLIC);
+		}else if(operatorType.equals(AFTConstants.CUSTOMER_FOLLOW)){ //跟进客户
+			log.setBeforeAdminName(TokenManager.getAdminToken().getName());//跟进前操作人
+			log.setBeforeCustomerIntention(getCompanyIntention(c.getCompanyIntention())); //修改前跟进意向
+			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(c.getCustomerStatus()).getDesc()); //修改前跟进状态
+			log.setBeforeFollowSituation(CustomerFollowFiled.getField(c.getFollowSituation()).getDesc());//修改前跟进进度
+			log.setAfterAdminName(TokenManager.getAdminToken().getName());
+			log.setAfterFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getFollowSituation())).getDesc()); //修改后跟进状态
+			log.setAfterCustomerIntention(getCompanyIntention(cus.getCompanyIntention())); //修改后跟进意向
+			log.setAfterCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getCustomerStatus())).getDesc()); //修改后客户状态
+			log.setOperatorType(AFTConstants.CUSTOMER_FOLLOW);
 		}
-		CustomerLogMapper.insert(log);
+		customerLogMapper.insert(log);
 	}
 
 	/**
@@ -321,13 +339,25 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	 */
 	private List<CustomerOut> descResult(List<CustomerOut> outList){
 		for(CustomerOut out : outList){
-			out.setAdminName("***");
-			out.set_followSituation("***");
-			out.set_companyIntention("***");
+			//out.setAdminName("***");
+			//out.set_followSituation("***");
+			//out.set_companyIntention("***");
 			out.setContactName("***");
 			out.setMobile("***");
 			out.setTelNum("***");
 		}
 		return outList;
 	}
+
+	@Override
+	public List<CustomerLog> listCustomerLog(String customerId) {
+		
+		return customerLogMapper.listCustomerLog(customerId);
+	}
+
+	@Override
+	public CustomerOut findCustomerHistory(String customerId) {
+		
+		return customerMapper.findCustomerHistory(customerId);
+	}
 }

+ 1 - 1
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -84,4 +84,4 @@ public interface DemandService {
 	
 	/**猜你喜欢**/
 	List<DemandListBo> selectCsutomerLike();
-}
+}

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

@@ -757,4 +757,4 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return demandMapper.selectCsutomerLike(TokenManager.getUserId());
 	}
 
-}
+}

+ 9 - 3
src/main/java/com/goafanti/portal/bo/BoutiqueListBo.java

@@ -13,9 +13,10 @@ public class BoutiqueListBo {
 	private String industryCatalog;
 	private String pictureUrl;
 	private String technicalpictureurl;
+	private Integer boutiqueFlag;
 	/** 拥有者类别 0 - 个人, 1 - 组织 **/
 	private Integer ownerType;
-
+	
 	public String getId() {
 		return id;
 	}
@@ -76,6 +77,11 @@ public class BoutiqueListBo {
 	public void setOwnerType(Integer ownerType) {
 		this.ownerType = ownerType;
 	}
-	
-	
+	public Integer getBoutiqueFlag() {
+		return boutiqueFlag;
+	}
+	public void setBoutiqueFlag(Integer boutiqueFlag) {
+		this.boutiqueFlag = boutiqueFlag;
+	}
+
 }

+ 3 - 1
src/main/resources/props/error.properties

@@ -93,4 +93,6 @@ M_CODE_ERROR=\u624B\u673A\u9A8C\u8BC1\u7801\u83B7\u53D6\u5F02\u5E38\uFF0C\u8BF7\
 
 MOBILE_SAME_ERROR=\u65B0\u624B\u673A\u53F7\u5FC5\u987B\u548C\u539F\u624B\u673A\u53F7\u4E0D\u540C\uFF01
 
-MARKET_BOOTH_MAX = \u8425\u9500\u6D3B\u52A8\u5C55\u4F4D\u5DF2\u6EE1{0}\u4E2A
+MARKET_BOOTH_MAX = \u8425\u9500\u6D3B\u52A8\u5C55\u4F4D\u5DF2\u6EE1{0}\u4E2A
+
+CUSTOMER_ALREADY_EXIST = \u5BA2\u6237\u5DF2\u5B58\u5728

+ 7 - 3
src/main/webapp/WEB-INF/views/common.html

@@ -77,13 +77,16 @@
 			<div class="nav_right" th:if="${!isLogin}">
 				<a th:href="${basePath + '/user/signIn.html'}"> <img
 					th:src="${portalHost+'/img/index_resiter.png'}" alt="" />
-				</a> <a href="javascript:;" class="head_login">登录</a> <a href="">关于我们</a>
+				</a> 
+				<a href="javascript:;" class="head_login">登录</a> 
+				<a th:href="${basePath + '/portal/aboutUs.html'}">关于我们</a>
 				<div></div>
 			</div>
 			<div class="nav_right" th:if="${isLogin}">
 				<a th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}"
 					th:text="${#strings.isEmpty(userName)?'个人中心':userName}">个人中心</a> 
-				<a th:href="${basePath + '/user/logout'}">退出</a> <a href="">关于我们</a>
+				<a th:href="${basePath + '/user/logout'}">退出</a> 
+				<a th:href="${basePath + '/portal/aboutUs.html'}">关于我们</a>
 				<div></div>
 			</div>
 		</div>
@@ -122,7 +125,8 @@
 			<div class="bottom">
 				<div class="bottom_text">
 					<div class="text_top">
-						<a href="#">关于公司/</a> <a href="#">联系我们</a>
+						<a th:href="${basePath + '/portal/aboutUs.html'}">关于我们</a>
+						<a th:href="${basePath + '/portal/contactUs.html'}">联系我们</a>
 						<p>Copyright &copy 2016-2017 科德 版权所有 湘ICP备15019731号 -2
 							技术支持:湖南阿凡提科技有限公司</p>
 					</div>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 291 - 0
src/main/webapp/WEB-INF/views/portal/aboutUs.html


+ 231 - 0
src/main/webapp/WEB-INF/views/portal/contactUs.html

@@ -0,0 +1,231 @@
+<!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 th:replace="common::header(~{::title},~{::link})">
+<title>技淘--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+<link th:href="${portalHost + '/contactUs.css'}" rel="stylesheet">
+</head>
+<body>
+	<!--banner-->
+  	<div class="carouselt">
+		<ul class="ct-img-big clear">
+			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/contactUs.png'}" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/contactUs.png'}" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/contactUs.png'}" alt=""/></a></li>		
+		</ul>
+		<a class="btn btn-next" href="">
+			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>
+		</a>
+		<a class="btn btn-pre" href="">
+			<img th:src="${portalHost+'/img/img/index_pre.png'}" alt=""/>
+		</a>
+	</div>
+	<!--主体内容区域开始-->
+ 	<div id="contactUs">
+ 		<div class="contactUs">
+ 			<div class="contact_title">
+ 				联系我们
+ 			</div>
+			<div class="contact_cont">
+				<div class="contact_left">
+					<div class="contact_left_top">
+						
+					</div>
+					<div class="contact_left_center">
+						
+					</div>
+					<div class="contact_left_bottom">
+						
+					</div>
+				</div>
+				<div class="contact_center">
+					<div class="contact_center_top">
+						<h5>湖南科德信息咨询有限公司(总部)</h5>
+						<p>联 系 人:胡小姐</p>
+						<p>联系电话:400-8800-962</p>
+						<p>邮&nbsp;&nbsp;编:410005</p>
+						<p>E-mail:2035994611@qq.com</p>
+						<p>地&nbsp;&nbsp;址:湖南省长沙市营盘东路19号金山大厦8楼</p>
+					</div>
+					<div class="contact_center_bottom">
+						<h5>阿凡提信息科技股份有限公司(湖南分公司)</h5>
+						<p>联 系 人:王小姐</p>
+						<p>联系电话:0731-85202115</p>
+						<p>E-mail:3232358874@qq.com</p>
+						<p>地&nbsp;&nbsp;址:湖南省长沙市营盘东路19号金山大厦14楼</p>
+					</div>
+				</div>
+				<div class="contact_right">
+					<div style="width:400px;height:400px;border:#ccc solid 1px;" id="dituContent"></div>
+				</div>
+			</div>
+			<div class="contact_title">
+				全国分部
+			</div>
+			<div class="all_branch">
+				<div class="all_branch_map">
+					<div class="neimen"></div>
+					<div class="liaoning"></div>
+					<div class="beijing"></div>
+					<div class="hebei"></div>
+					<div class="shangdong"></div>
+					<div class="henan"></div>
+					<div class="jiangshu"></div>
+					<div class="anhui"></div>
+					<div class="hubei"></div>
+					<div class="sichuang"></div>
+					<div class="jiangxi"></div>
+					<div class="fujian"></div>
+					<div class="guizhou"></div>
+					<div class="yunnan"></div>
+					<div class="guanxi"></div>
+					<div class="guandong"></div>
+					<div class="hunan"></div>
+				</div>
+				<div class="all_map_case">
+					<div class="neimendiv">
+						<h5>内蒙古科发信息咨询有限公司</h5>
+						<p>联 系 人:科发信息</p>
+						<p>联系电话:18947910317 </p>
+						<p>邮&nbsp;&nbsp;编:010000</p>
+						<p>地&nbsp;&nbsp;址:呼和浩特市回民区明泽广场A座1110室</p>
+					</div>
+					<div class="liaoningdiv">
+						<h5>沈阳科德信息咨询有限公司</h5>
+						<p>联 系 人:沈阳科德</p>
+						<p>联系电话:024-31297263</p>
+						<p>邮&nbsp;&nbsp;编:110000</p>
+						<p>地&nbsp;&nbsp;址:沈阳市和平区南三经街2号金豪公寓2-11-2</p>
+					</div>
+					<div class="beijingdiv">
+						<h5>北京科德技淘信息技术有限公司</h5>
+						<p>联 系 人:冯亚娟</p>
+						<p>联系电话:400-8800-962</p>
+						<p>邮&nbsp;&nbsp;编:100000</p>
+						<p>地&nbsp;&nbsp;址:北京市朝阳区东三环南路小八里庄40号6号楼第六层614室</p>
+					</div>
+					<div class="hebeidiv">
+						<h5>石家庄科中企业管理咨询有限公司</h5>
+						<p>联 系 人:王洪垒</p>
+						<p>联系电话:18032295250</p>
+						<p>邮&nbsp;&nbsp;编:050000</p>
+						<p>地&nbsp;&nbsp;址:河北省石家庄市长安区跃进路3号天元商务大厦901室</p>
+					</div>
+					<div class="shangdongdiv">
+						<h5>青岛科德信息咨询有限公司</h5>
+						<p>联 系 人:青岛科德</p>
+						<p>联系电话:0532-58731385 </p>
+						<p>邮&nbsp;&nbsp;编:266000</p>
+						<p>地&nbsp;&nbsp;址:山东省青岛市黄岛开发区井冈山路紫金广场A座2708</p>
+					</div>
+					<div class="henandiv">
+						<h5>郑州科德企业管理咨询有限公司</h5>
+						<p>联 系 人:陈新裕</p>
+						<p>联系电话:18838010729</p>
+						<p>邮&nbsp;&nbsp;编:450000</p>
+						<p>地&nbsp;&nbsp;址:河南省郑州市金水区红专路政七街财源大厦B座1174</p>
+					</div>
+					<div class="jiangshudiv">
+						<h5>南京惟楚企业管理咨询有限公司</h5>
+						<p>联 系 人:周小姐</p>
+						<p>联系电话:025-66167661</p>
+						<p>邮&nbsp;&nbsp;编:210000</p>
+						<p>E-mail:1767604529@qq.com</p>
+						<p>地&nbsp;&nbsp;址:江苏省南京市玄武区成贤街118号科学会堂8号门701室</p>
+					</div>
+					<div class="anhuidiv">
+						<h5>合肥科稻信息咨询有限公司</h5>
+						<p>联 系 人:合肥科稻</p>
+						<p>联系电话:0551-62634195</p>
+						<p>邮&nbsp;&nbsp;编:230000</p>
+						<p>地&nbsp;&nbsp;址:合肥市庐阳区花园街安徽科技大厦11B</p>
+					</div>
+					<div class="hubeidiv">
+						<h5>武汉科汇科技咨询有限公司</h5>
+						<p>联 系 人:彭泽辉</p>
+						<p>联系电话:027-87313580</p>
+						<p>邮&nbsp;&nbsp;编:430000</p>
+						<p>地&nbsp;&nbsp;址:湖北省武汉市洪山区中北特一路楚天都市花园D座28G</p>
+					</div>
+					<div class="sichuangdiv">
+						<h5>成都科德信息技术有限公司</h5>
+						<p>联 系 人:杨根</p>
+						<p>联系电话:028-87078828</p>
+						<p>邮&nbsp;&nbsp;编:610000</p>
+						<p>地&nbsp;&nbsp;址:四川省成都市青羊区贝森南路18号B座904室</p>
+					</div>
+					<div class="jiangxidiv">
+						<h5>南昌科德信息咨询有限公司</h5>
+						<p>联 系 人:南昌科德</p>
+						<p>联系电话:0791-86259737</p>
+						<p>邮&nbsp;&nbsp;编:330000</p>
+						<p>E-mail:kcxx2012@163.com</p>
+						<p>地&nbsp;&nbsp;址:江西省南昌市东湖区省政府大院北二路53号科技情报中心二楼</p>
+					</div>
+					<div class="fujiandiv">
+						<h5>福州市科宇信息咨询有限公司</h5>
+						<p>联 系 人:吴先生</p>
+						<p>联系电话:18359155929</p>
+						<p>邮&nbsp;&nbsp;编:350000</p>
+						<p>地&nbsp;&nbsp;址:福建省福州市晋安区福马路504号科技信息大楼11楼</p>
+					</div>
+					<div class="guizhoudiv">
+						<h5>贵州科德华咨信息咨询有限公司</h5>
+						<p>联 系 人:贵州科德</p>
+						<p>联系电话:0851-88585225</p>
+						<p>邮&nbsp;&nbsp;编:550000</p>
+						<p>地&nbsp;&nbsp;址:贵州省贵阳市南明区遵义路105号万象国际A座19楼322 </p>
+					</div>
+					<div class="yunnandiv">
+						<h5>昆明科道企业管理有限公司</h5>
+						<p>联 系 人:王彪</p>
+						<p>联系电话:18987192587</p>
+						<p>邮&nbsp;&nbsp;编:650000</p>
+						<p>地&nbsp;&nbsp;址:昆明市官渡区官南大道2169号大润发商业广场2幢1410号</p>
+					</div>
+					<div class="guanxidiv">
+						<h5>广西南宁科发企业信息咨询有限公司</h5>
+						<p>联 系 人:南宁科发</p>
+						<p>联系电话:0771-6758726</p>
+						<p>邮&nbsp;&nbsp;编:530000</p>
+						<p>E-mail:2851902539@qq.com</p>
+						<p>地&nbsp;&nbsp;址:广西南宁市高新区滨河路5号中盟科技园4号6楼</p>
+					</div>
+					<div class="guandongdiv">
+						<h5>广州科丰管理咨询有限公司</h5>
+						<p>联 系 人:广州科丰</p>
+						<p>联系电话:020-29143112</p>
+						<p>邮&nbsp;&nbsp;编:510000</p>
+						<p>地&nbsp;&nbsp;址:广州市白云区黄石国际单位二期C2栋407</p>
+						<br/>
+						<h5>广州科德企业信息咨询有限公司</h5>
+						<p>联 系 人:广州科中</p>
+						<p>联系电话:18565104122 </p>
+						<p>邮&nbsp;&nbsp;编:510000</p>
+						<p>地&nbsp;&nbsp;址:广州市白云区嘉禾望岗望岗大道88号金塬大厦4018</p>
+					</div>
+					<div class="hunandiv">
+						<h5>湖南科德信息咨询有限公司</h5>
+						<p>联 系 人:胡小姐</p>
+						<p>联系电话:400-8800-962</p>
+						<p>邮&nbsp;&nbsp;编:410005</p>
+						<p>E-mail:2035994611@qq.com</p>
+						<p>地&nbsp;&nbsp;址:湖南省长沙市营盘东路19号金山大厦8楼</p>
+					</div>
+				</div>
+			</div>
+ 		</div>	
+ 	</div>
+  	<!--主体内容区域结束-->
+	<footer>
+		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
+	</footer>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/contactUs.js'}"></script>
+	</div>
+</body>
+</html>

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

@@ -1,5 +1,8 @@
 package com.goafanti.test;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;