Browse Source

修改客户系统接口

wanghui 8 years ago
parent
commit
7bb94ba454

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

@@ -73,5 +73,5 @@ public class AFTConstants {
 	
 	public static final String CUSTOMER_TO_PUBLIC					= "转为公共客户";
 	
-	public static final String CUSTOMER_VIEW_ALL					= "查看公司客户所有信息";
+	public static final String CUSTOMER_VIEW_ALL					= "customer_view_all";
 }

+ 25 - 0
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -164,6 +164,18 @@ public class AdminCustomerApiController extends BaseApiController {
 	}
 	
 	/**
+	 * 查询公司客户资料
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/findAllCustomerDetails", method = RequestMethod.POST)
+	public Result findAllCustomerDetails(String id) {
+		Result res=new Result();
+		res.setData(customerService.findCustomerDetails(id));
+		return res;
+	}
+	
+	/**
 	 * 查询联系人姓名列表
 	 * 
 	 * @return
@@ -323,6 +335,18 @@ public class AdminCustomerApiController extends BaseApiController {
 		Result res= new Result();
 		res.setData(followUpService.listFollowUpRecord(customerId));
 		return res;
+	}
+
+	/**
+	 * 查看公司客户跟进记录
+	 * @param customerId
+	 * @return
+	 */
+	@RequestMapping(value = "/listAllFollowUpRecord" , method = RequestMethod.GET)
+	public Result listAllFollowUpRecord(String customerId){
+		Result res= new Result();
+		res.setData(followUpService.listFollowUpRecord(customerId));
+		return res;
 	}	
 	
 	/**
@@ -393,6 +417,7 @@ public class AdminCustomerApiController extends BaseApiController {
 		Customer c =new Customer();
 		c.setId(cusIn.getId());
 		c.setAid(TokenManager.getAdminId());
+		c.setShareType(0);
 		//更新主表
 		customerService.updateCustomer(c);
 		//插入日志表

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

@@ -8,6 +8,8 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -122,7 +124,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 		if(pageSize == null || pageSize < 0) pageSize = 10;
 		if(pageNumber == null || pageNumber <0 ) pageNumber = 1;
 		Pagination<CustomerOut> list = (Pagination<CustomerOut>)findPage("selectCustomer","selectCustomerCount",params, pageNumber, pageSize);
+		Subject subject = SecurityUtils.getSubject();
 		list.setList(setResult((List<CustomerOut>)list.getList()));
+		if(!subject.isPermitted("customer_view_all")||!subject.isPermitted(AFTConstants.SUPERADMIN)) {
+			list.setList(descResult((List<CustomerOut>)list.getList()));
+		}
 		return list;
 	}