Browse Source

客户详情BUG修改

wanghui 8 years ago
parent
commit
756d4ff969

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

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

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

@@ -86,5 +86,5 @@ public interface CustomerOrganizationInfoMapper {
 	 * @param companyName
 	 * @return
 	 */
-	int findCustomerOrganizationByName(String companyName);
+	int findCustomerOrganizationByName(@Param("companyName")String companyName);
 }

+ 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>();
 

+ 3 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -179,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())){
@@ -281,7 +282,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getBeforeFollowSituation())).getDesc());//修改前跟进进度
 			log.setOperatorType(AFTConstants.CUSTOMER_TO_PUBLIC);
 		}else if(operatorType.equals(AFTConstants.CUSTOMER_FOLLOW)){ //跟进客户
-			log.setAfterAdminName(TokenManager.getAdminToken().getName());//跟进前操作人
+			log.setBeforeAdminName(TokenManager.getAdminToken().getName());//跟进前操作人
 			log.setBeforeCustomerIntention(getCompanyIntention(c.getCompanyIntention())); //修改前跟进意向
 			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(c.getCustomerStatus()).getDesc()); //修改前跟进状态
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(c.getFollowSituation()).getDesc());//修改前跟进进度
@@ -289,6 +290,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 			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);
 	}