Procházet zdrojové kódy

1、发送邮件BUG修复
2、部门列表新增后未显示BUG修复
3、新增转交客户时转交资料

anderx před 4 roky
rodič
revize
3fde46a2ae

+ 13 - 8
.idea/workspace.xml

@@ -9,16 +9,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="configpudate">
+    <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、转交客户修改">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/common/dao/UserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/dao/UserMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/UserMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/common/utils/AsyncUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/utils/AsyncUtils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/CustomerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/CustomerService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java" afterDir="false" />
     </list>
     <list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
     <option name="SHOW_DIALOG" value="false" />
@@ -242,7 +239,7 @@
       <workItem from="1630656901862" duration="33000" />
       <workItem from="1630888067668" duration="852000" />
       <workItem from="1630893291690" duration="11740000" />
-      <workItem from="1630976664603" duration="10923000" />
+      <workItem from="1630976664603" duration="13132000" />
     </task>
     <task id="LOCAL-00001" summary="修改客户跟进列表">
       <created>1630486551669</created>
@@ -370,7 +367,14 @@
       <option name="project" value="LOCAL" />
       <updated>1631000817691</updated>
     </task>
-    <option name="localTasksCounter" value="19" />
+    <task id="LOCAL-00019" summary="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、转交客户修改">
+      <created>1631000882566</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1631000882566</updated>
+    </task>
+    <option name="localTasksCounter" value="20" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -408,7 +412,8 @@
     <MESSAGE value="客户资料维护修改" />
     <MESSAGE value="configpudate" />
     <MESSAGE value="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复" />
+    <MESSAGE value="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、转交客户修改" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、发送邮件BUG修复&#10;2、部门列表新增后未显示BUG修复&#10;3、转交客户修改" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
   </component>
   <component name="XDebuggerManager">

+ 1 - 6
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -28,14 +28,9 @@ public class AsyncUtils {
 		SendEmailUtil.getInstance().patentSend(bo);
 	}
 	
-	public void sendList(List<EmailBo> list) {
+	public void sendList(List<EmailBo> list) throws MessagingException, UnsupportedEncodingException {
 		for (EmailBo emailBo : list) {
-				try {
 					SendEmailUtil.getInstance().patentSend(emailBo);
-				} catch (UnsupportedEncodingException | MessagingException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
 		}
 		
 	}

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

@@ -808,6 +808,11 @@ public class AdminCustomerApiController extends BaseApiController{
 			res.getError().add(buildError("","对方私有客户已达最大限制"));
 			return res;
 		}
+		if(data==null)data=0;
+		if(data==1&&customerService.checkData(uid,aid)){
+			res.getError().add(buildError("","资料归属不正确,无法转交客户资料。"));
+			return res;
+		}
 		customerService.updateByOperatorType(uid,aid,oldAid,operatorType,data);
 		return res;
 	}

+ 1 - 0
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -544,4 +544,5 @@ public interface CustomerService {
 
 	int updateuserBusinessScope(String id, String businessScope);
 
+	boolean checkData(String uid, String aid);
 }

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

@@ -2022,13 +2022,21 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	public boolean checkMax(String aid) {
 		int y = 0;
 		int i = userMapper.checkUserMax(aid);
-		// 营销员100 经理200 总监500
-		if (TokenManager.hasRole(AFTConstants.SALESMAN_DIRECTOR))
-			y = 800;
-		else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER))
-			y = 200;
-		else if (TokenManager.hasRole(AFTConstants.SALESMAN))
-			y = 100;
+		List<String > roles=adminMapper.getAdminRoleListByAid(aid);
+		for (String role : roles) {
+			if (role.equals(AFTConstants.SALESMAN_DIRECTOR)){
+				y = 800;
+				continue;
+			} else if (role.equals(AFTConstants.SALESMAN_MANAGER)){
+				y = 200;
+				continue;
+			} else if (role.equals(AFTConstants.SALESMAN)){
+				y = 100;
+				continue;
+			}
+
+		}
+
 		if (i >= y) {
 			return true;
 		}
@@ -2282,5 +2290,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return organizationIdentityMapper.updateByPrimaryKeySelective(oi);
 	}
 
+	@Override
+	public boolean checkData(String uid, String aid) {
+		User u=userMapper.selectByPrimaryKey(uid);
+		if (u.getInformationMaintainer().equals(aid)){
+			return true;
+		}
+		return false;
+	}
+
 
 }

+ 10 - 1
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -1,6 +1,7 @@
 package com.goafanti.patent.service.impl;
 
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -53,6 +54,8 @@ import com.goafanti.patent.service.PatentNewService;
 
 import cn.jiguang.common.utils.StringUtils;
 
+import javax.mail.MessagingException;
+
 @Service
 public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> implements PatentNewService {
 	@Autowired
@@ -605,7 +608,13 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 						patentNew.getEndDate());
 				list.add(emailBo);
 			}
-			asyncUtils.sendList(list);
+			try {
+				asyncUtils.sendList(list);
+			} catch (MessagingException e) {
+				e.printStackTrace();
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
 		}
 		if (type == 0 || type == 1) {
 			patentNewMapper.updateBatch(ls);