Bladeren bron

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

anderx 2 jaren geleden
bovenliggende
commit
e08fd284e5

+ 1 - 0
src/main/java/com/goafanti/common/enums/NoticeStatus.java

@@ -78,6 +78,7 @@ public enum NoticeStatus {
 	AMB_INVEST_START(69,"阿米巴投资发起"),
 	AMB_INVEST_YES(70,"阿米巴投资通过"),
 	AMB_INVEST_NO(71,"阿米巴投资拒绝"),
+	PUBLIC_OTHERS_USER(72,"公出他人企业"),
 	OTHER(0, "其他");
 
 	private NoticeStatus(Integer code, String desc) {

+ 2 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -2207,7 +2207,8 @@ inner join(
   </select>
 
   <select id="getUserByNameList" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerSimpleBo">
-  	select id,nickname name from `user` where type = 1 and status =0 and source in (1,2,3)
+  	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)

+ 19 - 0
src/main/java/com/goafanti/customer/bo/CustomerSimpleBo.java

@@ -3,6 +3,25 @@ package com.goafanti.customer.bo;
 public class CustomerSimpleBo {
 	private String id;
 	private String name;
+	private String aid;
+	private Integer myStatus;
+
+	public Integer getMyStatus() {
+		return myStatus;
+	}
+
+	public void setMyStatus(Integer myStatus) {
+		this.myStatus = myStatus;
+	}
+
+	public String getAid() {
+		return aid;
+	}
+
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
 	public String getId() {
 		return id;
 	}

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

@@ -24,6 +24,7 @@ import com.goafanti.order.bo.TOrderNewBo;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.ibatis.builder.BuilderException;
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -2474,7 +2475,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			}
 		}
 		params.put("name", name);
-		return  findPage("getUserByNameList", "getUserByNameCount", params, pageNo,pageSize);
+		Pagination<?> page =findPage("getUserByNameList", "getUserByNameCount", params, pageNo, pageSize);
+		List<CustomerSimpleBo> list = (List<CustomerSimpleBo>) page.getList();
+		list.forEach(e ->{
+			if (e.getAid().equals(TokenManager.getAdminId())){
+				e.setMyStatus(1);
+			}else {
+				e.setMyStatus(0);
+			}
+		});
+		return  page;
 	}
 
 

+ 26 - 6
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -100,16 +100,19 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					StringBuffer str2=new StringBuffer();
 					//如果是白名单只通当事人不审核
 					if (my.getPublicPurview()==1){
-						str2=str2.append("业务员(无需审核),发起对您的企业");
+						str2=str2.append(my.getName()).append("业务员(无需审核),发起对您的企业");
 						str2=str2.append("[").append(u.getNickname()).append("]发起公出。");
+
+						sendNoticeAndSoucket(u.getAid(),3,str2.toString());
 					}else {
-						str2=str2.append("(需审核),发起对您的企业");
+
+						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()==0)in.setPublicType(1);
+						if(in.getPublicType()==null||in.getPublicType()==0)in.setPublicType(1);
 					}
-					addWeChatNotice(u.getAid(),1,str2.toString(),in.getId());
 				}
 				prd.setPrid(in.getId());
 				prd.setUid(s);
@@ -185,8 +188,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				sendEmail(my, a,1);
 			}
 			map.put("code", res);
-
-
 		}else {
 			sendEmail(my, a,1);
 			map.put("code", 2);
@@ -205,11 +206,28 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return  sb.deleteCharAt(sb.length() - 1).toString();
 	}
 
+	private void sendEmailAndNoticeAndSoucket(String id,Integer type,String content){
+		sendNoticeAndSoucket(id,type,content);
+		Admin admin = adminMapper.selectByPrimaryKey(id);
+		String title="暂无标题";
+		if (type==3)title=NoticeStatus.PUBLIC_OTHERS_USER.getDesc();
+		EmailBo emailBo=new EmailBo(title,admin.getEmail(),content);
+		asyncUtils.send(emailBo);
+
+	}
 
+	/**
+	 *
+	 * @param id 接受者编号
+	 * @param type 状态 0驳回 1发起 2同意 3 公出他人企业
+	 * @param content 内容
+	 */
 	private void sendNoticeAndSoucket(String id,Integer type,String content) {
 		Integer noticeType=NoticeStatus.PUBLIC_RELEASE_START.getCode();
 		if(type==0)noticeType=NoticeStatus.PUBLIC_RELEASE_NO.getCode();
 			else if (type==2)noticeType=NoticeStatus.PUBLIC_RELEASE_YES.getCode();
+			else if (type==3)noticeType=NoticeStatus.PUBLIC_OTHERS_USER.getCode();
+			//触发通知有未读消息
 		systemWebSocketHandler.sendMessageToUser(id, new TextMessage("unread"));
 		Notice n =new Notice();
 		n.setId(UUID.randomUUID().toString());
@@ -237,6 +255,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 	}
 
+
+
 	@Override
 	public int updatePublicRelease(InputPublicRelease in) {
 		Date date = new Date();