Browse Source

修改冲突

zou_ht 8 years ago
parent
commit
9988342b26

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

@@ -238,7 +238,6 @@ public class AdminCustomerApiController extends BaseController {
 	}
 	
 	/**
-<<<<<<< HEAD
 	 * 查询单个联系人信息
 	 * @return
 	 */
@@ -289,33 +288,4 @@ public class AdminCustomerApiController extends BaseController {
 	}
 	
 	
-=======
-	 * 添加跟进记录
-	 * @param fur
-	 * @return
-	 * @throws ParseException 
-	 */
-	@RequestMapping(value = "addFollow", method = RequestMethod.POST)
-	public Result addFollowUpRecord(FollowUpRecord fur, CustomerIn cusIn ,String followDate) throws ParseException{
-		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);	
-		Customer cus = new Customer();
-		try {
-			BeanUtils.copyProperties(cus, cusIn);
-			if(StringUtils.isNotBlank(cusIn.getFollowSituation()))
-				cus.setFollowSituation(Integer.parseInt(cusIn.getFollowSituation()));	
-			if(StringUtils.isNotBlank(cusIn.getCustomerStatus()))
-				cus.setCustomerStatus(Integer.parseInt(cusIn.getCustomerStatus()));
-		} catch (IllegalAccessException | InvocationTargetException e) {			
-			e.printStackTrace();
-		}
-		customerService.updateCustomer(cus);
-		return res;
-	}
->>>>>>> refs/remotes/origin/dev
 }