Procházet zdrojové kódy

跟进锁定业务修改

Signed-off-by: anderx <anderx@qq.com>
anderx před 5 roky
rodič
revize
36f9518a5d

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

@@ -572,11 +572,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 					}
 					
 					
-					if (us.getFollowSituation()!=5&&ub.getFollowSituation()==5) {//如果改成已签合同,则锁定业务
-						if (StringUtils.isNotBlank(fbb.getUid())) ub.setUid(fbb.getUid());
-						lockProject(ub);//锁定客户业务
-						x=1;
-					}		
+//					if (us.getFollowSituation()!=5&&ub.getFollowSituation()==5) {//如果改成已签合同,则锁定业务
+//						if (StringUtils.isNotBlank(fbb.getUid())) ub.setUid(fbb.getUid());
+//						lockProject(ub);//锁定客户业务
+//						x=1;
+//					}		
 					userBusiness.setBusinessProjectId(ub.getBusinessProjectId());
 					userBusiness.setCustomerStatus(ub.getCustomerStatus());
 					userBusiness.setFollowSituation(ub.getFollowSituation());
@@ -613,11 +613,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 					if(userBusinessMapper.judgeBusiness(fbb.getUid(), ub.getBusinessProjectId(), "")>0){
 						throw new BusinessException(new Error(ErrorConstants.BUSINESS_ALREADY_EXIST,businessName,""));
 					}
-					if (ub.getFollowSituation()==5) {//如果改成已签合同,则锁定业务
-						if (StringUtils.isNotBlank(fbb.getUid())) ub.setUid(fbb.getUid());
-						lockProject(ub);//锁定客户业务
-						x=1;
-					}
+//					if (ub.getFollowSituation()==5) {//如果改成已签合同,则锁定业务
+//						if (StringUtils.isNotBlank(fbb.getUid())) ub.setUid(fbb.getUid());
+//						lockProject(ub);//锁定客户业务
+//						x=1;
+//					}
 					String ubId = UUID.randomUUID().toString();
 					//更新业务表
 					userBusiness.setId(ubId);
@@ -1454,12 +1454,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	public Pagination<CustomerListOut> listSignOrganizationCustomer(CustomerListIn cli, Integer pageNo,
 			Integer pageSize) {
 		cli.setAid(TokenManager.getAdminId());
-//		cli.setAid("1");
 		Map<String,Object> params = disposeParams(cli);
 		Pagination<CustomerListOut> list = (Pagination<CustomerListOut>) findPage("selectSignOrganizationCustomerList","selectSignOrganizationCustomerCount",params,pageNo,pageSize);
-//		List<CustomerListOut> tmpList = (List<CustomerListOut>)list.getList();
-//		setCustomerList(tmpList,1,0);
-//		list.setList(tmpList);
 		return list;
 	}
 	
@@ -1692,20 +1688,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		List<LockingReleaseBo> list=userLockReleaseMapper.checkUserProject(uid, pid,TokenManager.getAdminId());
 		if (list.isEmpty()) {
 			throw new BusinessException(new Error("客户归属错误","客户归属错误"));
-		}else if(list.size()>1) {
-			throw new BusinessException(new Error("业务数量错误","业务数量错误"));
 		}
 		LockingReleaseBo l=list.get(0);
 		UserLockRelease ul=new UserLockRelease();
 		ul.setId(l.getId());
-//		不做释放与锁定的动作
-//		ul.setStatus(2);
+
 		ul.setAid(inputId);
-//		不修改时间
-//		ul.setReleaseTime(now);
 		userLockReleaseMapper.updateByPrimaryKeySelective(ul);
 		addtransferLog(uid,pid,TokenManager.getAdminId(),inputId,1,false);
-//		addUserLock(uid,inputId,1,pid,now); //指定用户锁定客户
 		List<BusinessListBo> bl=userBusinessMapper.selectBusinessProjectByUAPid(uid, TokenManager.getAdminId(), pid);
 		if (bl.size()==1) {
 			UserBusiness ub=new UserBusiness();

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -5,7 +5,7 @@ jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.username=dev
 #jdbc.password=123456
 #测试
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20201022?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
 jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e