Browse Source

客户转交,订单转交修改公出转交审核人

anderx 2 years ago
parent
commit
56df372a9b

+ 9 - 13
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -1,28 +1,22 @@
 package com.goafanti.common.dao;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import com.goafanti.admin.bo.AdminCustomerBo;
-import com.goafanti.customer.bo.*;
-import org.apache.ibatis.annotations.Param;
-
 import com.goafanti.app.bo.UserBasicInfo;
 import com.goafanti.common.bo.OutUser;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.User;
-import com.goafanti.user.bo.InputUserChannel;
-import com.goafanti.user.bo.OrgPartnerDetailBo;
-import com.goafanti.user.bo.UserDownLoadBo;
-import com.goafanti.user.bo.UserInterestBo;
-import com.goafanti.user.bo.UserPageHomeBo;
-import com.goafanti.user.bo.UserPartnerDetailBo;
+import com.goafanti.customer.bo.*;
 import com.goafanti.report.bo.CountMarketingStatisticsBo;
 import com.goafanti.report.bo.marketingESBo;
 import com.goafanti.report.bo.userDataListBo;
+import com.goafanti.user.bo.*;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 public interface UserMapper {
     int deleteByPrimaryKey(String id);
@@ -241,4 +235,6 @@ public interface UserMapper {
 
     List<AdminCustomerBo> selectNoChannelByaids(@Param("admins")List<AdminCustomerBo> admins,@Param("startTime") String startTime,@Param("endTime") String endTime);
     List<AdminCustomerBo> selectChannelByaids(@Param("admins")List<AdminCustomerBo> admins,@Param("startTime") String startTime,@Param("endTime") String endTime);
+
+    List<String> selectBelongByaid(String aid);
 }

+ 4 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -2339,4 +2339,8 @@ inner join(
 		</if>
 		group by a.aid
 	</select>
+	<select id="selectBelongByaid" resultType="java.lang.String">
+		SELECT id     from user
+		where aid= #{aid} and share_type in (0,2)
+	</select>
 </mapper>

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

@@ -568,4 +568,7 @@ public interface CustomerService {
 	 * @return
 	 */
 	boolean checkAid(String aid, Integer roleType);
+
+
+	void transferUser(List<String> uList, String aid, String uid);
 }

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

@@ -1312,7 +1312,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return errors;
 	}
 
-	private void transferUser(List<String> uList, String aid, String uid) {
+	@Override
+	public void transferUser(List<String> uList, String aid, String uid) {
 		if(uList.isEmpty())uList.add(uid);
 		//先查出所有在其他审核的公出
 		List<PublicReleaseTransferUserBo> list=publicExamineMapper.selectByuList(uList);

+ 9 - 11
src/main/java/com/goafanti/permission/controller/NewRoleApiController.java

@@ -1,15 +1,5 @@
 package com.goafanti.permission.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -20,6 +10,14 @@ import com.goafanti.common.model.Role;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.permission.bo.RoleBo;
 import com.goafanti.permission.service.NewRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 @RestController
 @RequestMapping("/api/admin")
@@ -165,7 +163,7 @@ public class NewRoleApiController extends BaseApiController{
 		return res;
 	}
 	/**
-	 * 离职转交
+	 * 离职转交 离职一键转交
 	 * @param aid 离职ID
 	 * @param transferId 转交ID
 	 * @return

+ 12 - 7
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -10,6 +10,7 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.customer.service.CustomerService;
 import com.goafanti.permission.bo.RoleBo;
 import com.goafanti.permission.bo.RolePermissionBo;
 import com.goafanti.permission.service.NewRoleService;
@@ -41,7 +42,7 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 	@Autowired
 	private TOrderMidMapper	tOrderMidMapper;
 	@Autowired
-	private PublicExamineMapper	publicExamineMapper;
+	private CustomerService customerService;
 	@Autowired
 	private UserTransferLogMapper	userTransferLogMapper;
 	@Autowired
@@ -191,8 +192,8 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 				userBusinessMapper.updateDimissionTransfer(aid,transferId);
 				organizationContactBookMapper.updateDimissionTransfer(aid,transferId);
 				//所有客户转交给接受者
+				transferUserUpdateExamine(aid,transferId);
 				userMapper.updateDimissionTransfer(aid,transferId);
-				publicExamineMapper.updateAidByAid(aid,transferId);
 			}else if (s==roleResources.QDYW.getCode()) {
 				userTransferLogMapper.insertUserLockLog(aid,transferId,date);
 				patentNewMapper.updateAdmin(aid,transferId);
@@ -215,11 +216,15 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 		return 1;
 	}
 
-
-
-
-
-
+	/**
+	 *
+	 * @param aid 离职id
+	 * @param transferId 转交id
+	 */
+	private void transferUserUpdateExamine(String aid, String transferId) {
+		List<String> uids=userMapper.selectBelongByaid(aid);
+		customerService.transferUser(uids,transferId,null);
+	}
 
 
 	@Override