Просмотр исходного кода

按客户名称搜索客户修改分为默认和APP公出

anderx лет назад: 2
Родитель
Сommit
3d6c18eb42

+ 6 - 9
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -2207,21 +2207,18 @@ inner join(
   </select>
 
   <select id="getUserByNameList" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerSimpleBo">
-  	select id,nickname name,aid
-  	from `user` where type = 1 and status =0 and source in (1,2,3)
-	and nickname like concat('%',#{name},'%')
-	<if test="type==1">
-	and share_type in (0,2,3,4)
-	</if>
+	  select a.id,a.nickname name,a.aid,a.channel,a.share_type shareType ,
+	  a.new_channel newChannel,b.name aname
+	  from `user` a left join admin b on a.aid =b.id
+	  where a.type = 1 and a.status =0 and a.source in (1,2,3)
+	and a.nickname like concat('%',#{name},'%')
+
   	<if test="page_sql != null">
    		${page_sql}
 	</if>
     </select>
     <select id="getUserByNameCount" resultType="java.lang.Integer" >
   	select count(*) from `user` where type = 1 and status =0 and source in (1,2,3) and  nickname like concat('%',#{name},'%')
-		<if test="type==1">
-			and share_type in (0,2,3,4)
-		</if>
     </select>
     <select id="getAllUser" resultType="com.goafanti.common.bo.OutUser">
 		select id,name ,province ,name_mobile nameMobile from user_now

+ 41 - 5
src/main/java/com/goafanti/customer/bo/CustomerSimpleBo.java

@@ -4,14 +4,50 @@ public class CustomerSimpleBo {
 	private String id;
 	private String name;
 	private String aid;
-	private Integer myStatus;
+	private Integer shareType;
+	private Integer channel;
+	private Integer newChannel;
+	private String aname;
+	private Integer status;
 
-	public Integer getMyStatus() {
-		return myStatus;
+	public Integer getShareType() {
+		return shareType;
 	}
 
-	public void setMyStatus(Integer myStatus) {
-		this.myStatus = myStatus;
+	public void setShareType(Integer shareType) {
+		this.shareType = shareType;
+	}
+
+	public Integer getChannel() {
+		return channel;
+	}
+
+	public void setChannel(Integer channel) {
+		this.channel = channel;
+	}
+
+	public Integer getNewChannel() {
+		return newChannel;
+	}
+
+	public void setNewChannel(Integer newChannel) {
+		this.newChannel = newChannel;
+	}
+
+	public String getAname() {
+		return aname;
+	}
+
+	public void setAname(String aname) {
+		this.aname = aname;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
 	}
 
 	public String getAid() {

+ 15 - 14
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2465,30 +2465,31 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Override
 	public Object getUserByNames(String name, Integer type,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
-		if (type!=null&&type==1){
-			Admin admin = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
-			if (admin.getPublicPurview()==0){
-				//根据白名单设置查询权限
-				params.put("type", 1);
-			}else {
-				params.put("type", 0);
-			}
-		}
 		params.put("name", name);
 		Pagination<?> page =findPage("getUserByNameList", "getUserByNameCount", params, pageNo, pageSize);
+		return  pushRetrun(page);
+	}
+
+	private Object pushRetrun(Pagination<?> page) {
+		Admin admin = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
 		List<CustomerSimpleBo> list = (List<CustomerSimpleBo>) page.getList();
 		list.forEach(e ->{
-			if (e.getAid().equals(TokenManager.getAdminId())){
-				e.setMyStatus(1);
+			if (admin.getPublicPurview()==1){
+				//如果是白名单不管是不是自己都可以公出
+				e.setStatus(0);
 			}else {
-				e.setMyStatus(0);
+				//不是白名单不是自己的需要审核
+				if (admin.getId().equals(e.getAid())){
+					e.setStatus(0);
+				}else {
+					e.setStatus(1);
+				}
 			}
 		});
-		return  page;
+		return page;
 	}
 
 
-
 	@Override
 	public int updateUserName(String uid, String userName) {
 		userNamesMapper.updateAddUserName(uid,userName);

+ 19 - 16
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -97,22 +97,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					prd.setMainStatus(1);
 				}else {
 					prd.setMainStatus(0);
-					StringBuffer str2=new StringBuffer();
-					//如果是白名单只通当事人不审核
-					if (my.getPublicPurview()==1){
-						str2=str2.append(my.getName()).append("业务员(无需审核),发起对您的企业");
-						str2=str2.append("[").append(u.getNickname()).append("]发起公出。");
-
-						sendNoticeAndSoucket(u.getAid(),3,str2.toString());
-					}else {
-
-						str2=str2.append(my.getName()).append("(需审核),发起对您的企业");
-						str2=str2.append("[").append(u.getNickname()).append("]发起公出。");
-						sendEmailAndNoticeAndSoucket(u.getAid(),3,str2.toString());
-						//不是自己的企业则需要审核并设置非自己客户待审核
-						addPublicExamine(in.getId(),u.getAid());
-						if(in.getPublicType()==null||in.getPublicType()==0)in.setPublicType(1);
-					}
+					if(in.getType()==0) pushPublicToNotice(in, my, u);
 				}
 				prd.setPrid(in.getId());
 				prd.setUid(s);
@@ -149,6 +134,24 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return map;
 	}
 
+	private void pushPublicToNotice(InputPublicRelease in, AdminListBo my, User u) {
+
+			StringBuffer str2=new StringBuffer();
+			//如果是白名单只通当事人不审核
+			if (my.getPublicPurview()==1){
+				str2=str2.append(my.getName()).append("业务员(无需审核),发起对您的企业");
+				str2=str2.append("[").append(u.getNickname()).append("]发起公出。");
+				sendNoticeAndSoucket(u.getAid(),3,str2.toString());
+			}else {
+				str2=str2.append(my.getName()).append("(需审核),发起对您的企业");
+				str2=str2.append("[").append(u.getNickname()).append("]发起公出。");
+				sendEmailAndNoticeAndSoucket(u.getAid(),3,str2.toString());
+				//不是自己的企业则需要审核并设置非自己客户待审核
+				addPublicExamine(in.getId(), u.getAid());
+				if(in.getPublicType()==null|| in.getPublicType()==0) in.setPublicType(1);
+			}
+	}
+
 	private void addPublicExamine(Integer id, String aid) {
 		PublicExamine pe=new PublicExamine();
 		pe.setPrid(id);