Browse Source

修改跟进客户跟进记录

wanghui 8 years ago
parent
commit
b151c01b96

+ 4 - 3
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -74,8 +74,7 @@ public class AdminCustomerApiController extends BaseController {
 		
 		fur.setId(followId);//跟进记录的ID
 		fur.setCid(customerId);//跟进记录表中的cid
-		fur.setCuid(customerUsrId);//跟进记录表中的联系人id
-		fur.setAid(TokenManager.getUserId());
+		fur.setCuid(customerUsrId);//跟进记录表中的联系人id		
 		/*if(StringUtils.isNotBlank(cusIn.getAid())) fur.setAid(cusIn.getAid());*//*暂时注释*/
 		
 		BeanUtils.copyProperties(c, cusIn);
@@ -241,7 +240,9 @@ public class AdminCustomerApiController extends BaseController {
 		Result res = new Result();
 		SimpleDateFormat format = new SimpleDateFormat(AFTConstants.YYYYMMDDHHMMSS);
 		if(StringUtils.isNotBlank(followDate)) fur.setFollowDate(format.parse(followDate));
-		
+		String followId = UUID.randomUUID().toString();
+		fur.setId(followId);
+		cusIn.setFollowId(followId);
 		followUpService.addFollowUp(fur, cusIn);
 		return res;
 	}

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

@@ -37,7 +37,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	public int addCustomer(Customer cus) {
 		Date data =new Date();
 		cus.setCreateTime(data);
-		cus.setAid(TokenManager.getUserId().toString());
+		cus.setAid(TokenManager.getAdminId());
 		int res = customerMapper.insert(cus);
 		return res;
 	}
@@ -76,7 +76,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	@Override
 	public Pagination<CustomerOut> getPrivateCustomer(CustomerIn cin, Integer pageSize, Integer pageNumber) {
 		cin.setShareTyp("0");
-		cin.setAid(TokenManager.getUserId());
+		cin.setAid(TokenManager.getAdminId());
 		Map<String,Object> params = disposeParams(cin);
 		if(pageSize == null || pageSize < 0) pageSize = 10;
 		if(pageNumber == null || pageNumber <0 ) pageNumber = 1;
@@ -179,7 +179,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.setAfterAdminName(adminMapper.selectByPrimaryKey(TokenManager.getUserId()).getName());
+			log.setAfterAdminName(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getName());
 			log.setOperatorType(AFTConstants.CUSTOMER_CREATE);
 		}else if(operatorType.equals(AFTConstants.CUSTOMER_MODIFY)){ //修改用户
 			log.setBeforeAdminName(cus.getBeforeAdminName());//修改前操作人
@@ -189,7 +189,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.setAfterAdminName(adminMapper.selectByPrimaryKey(TokenManager.getUserId()).getName());
+			log.setAfterAdminName(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getName());
 			log.setOperatorType(AFTConstants.CUSTOMER_MODIFY);
 		}else if(operatorType.equals(AFTConstants.CUSTOMER_DELETE)){ //删除用户
 			log.setBeforeAdminName(cus.getAdminName());

+ 5 - 2
src/main/java/com/goafanti/customer/service/impl/FollowUpServiceImp.java

@@ -1,6 +1,7 @@
 package com.goafanti.customer.service.impl;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.UUID;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -13,6 +14,7 @@ import com.goafanti.common.dao.FollowUpRecordMapper;
 import com.goafanti.common.model.Customer;
 import com.goafanti.common.model.FollowUpRecord;
 import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.CustomerIn;
 import com.goafanti.customer.service.FollowUpService;
 @Service
@@ -33,9 +35,10 @@ public class FollowUpServiceImp extends BaseMybatisDao<CustomerUserInfoMapper>
 		} catch (IllegalAccessException | InvocationTargetException e) {			
 			e.printStackTrace();
 		}
-		 followUpRecordMapper.insert(fur);
+		fur.setCid(cusIn.getId());
+		fur.setAid(TokenManager.getAdminId());
+		followUpRecordMapper.insert(fur);
 		return  customerMapper.updateByPrimaryKeySelective(cus);
 	}
 
-
 }