为商机线索添加网点名称和品牌名称字段

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/BusinessOpportunitiesClue.java

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.entity;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -7,28 +8,69 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.demo.entity.vo.TurnBusinessOpportunitiesVo;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.UUID;
 
 @Data
 @TableName("bl_business_opportunities_clue")
 public class BusinessOpportunitiesClue implements Serializable {
     @TableField("clue_id")
     private String clueId;
+
     @TableField("attention_id")
     private String attentionId;
+
+    @TableField("wd_id")
+    private String wdId;
+
+    @TableField("wd_name")
+    private String wdName;
+
+    @TableField("wd_addr_info")
+    private String wdAddrInfo;
+
+    @TableField("brand_id")
+    private String brandId;
+
+    @TableField("brand_name")
+    private String brandName;
+
     @TableField("contact")
     private String contact;
+
     @TableField("telephone")
     private String telephone;
+
     @TableField("follow_up_count")
     private Integer followUpCount;
+
     @TableField("user_id")
     private String userId;
+
     @TableField("create_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
+
+    public BusinessOpportunitiesClue() {
+    }
+
+    public BusinessOpportunitiesClue(TurnBusinessOpportunitiesVo vo, AttentionPool pool, String userId) {
+        this.clueId = UUID.randomUUID().toString().replace("-", "");
+        this.attentionId = vo.getAttentionId();
+        this.wdId = pool.getWdId();
+        this.wdName = pool.getWdName();
+        this.wdAddrInfo = pool.getWdAddrInfo();
+        this.brandId = pool.getBrandId();
+        this.brandName = pool.getBrandName();
+        this.contact = vo.getContact();
+        this.telephone = vo.getTelephone();
+        this.followUpCount = 0;
+        this.userId = userId;
+        this.createTime = DateUtil.date();
+    }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/BusinessOpportunitiesClueBo.java

@@ -11,6 +11,8 @@ import java.util.Date;
 public class BusinessOpportunitiesClueBo implements Serializable {
     private String clueId;
     private String attentionId;
+    private String wdName;
+    private String brandName;
     private String contact;
     private String telephone;
     private Integer followUpCount;
@@ -23,6 +25,8 @@ public class BusinessOpportunitiesClueBo implements Serializable {
     public BusinessOpportunitiesClueBo(BusinessOpportunitiesClue clue) {
         this.clueId = clue.getClueId();
         this.attentionId = clue.getAttentionId();
+        this.wdName = clue.getWdName();
+        this.brandName = clue.getBrandName();
         this.contact = clue.getContact();
         this.telephone = clue.getTelephone();
         this.followUpCount = clue.getFollowUpCount();

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/AttentionPoolServiceImpl.java

@@ -38,7 +38,7 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
 
     @Override
     public PageInfo<List<AttentionPoolBo>> searchList(WorkTableSearchVo workVo, String userId) {
-        PageHelper.startPage(workVo.getPageNum(),workVo.getPageSize(),true);
+        PageHelper.startPage(workVo.getPageNum(), workVo.getPageSize(), true);
         List<AttentionPool> pools = attentionPoolDao.searchByMulti(workVo.getText(), userId);
         List<AttentionPoolBo> bos = new ArrayList<>();
         pools.forEach(pool -> bos.add(new AttentionPoolBo(pool)));
@@ -48,7 +48,7 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
     @Override
     public int cancelAttention(String attentionId, String userId) {
         BusinessOpportunitiesClue clue = businessOpportunitiesDao.searchByClueIdOrAttentionIdAndUserId(null, attentionId, userId);
-        if (clue != null){ // 协同删除
+        if (clue != null) { // 协同删除
             List<FollowUpRecord> followUpRecords = followUpDao.searchAllByClueIdAndUserId(clue.getClueId(), userId);
             if (!followUpRecords.isEmpty())
                 followUpDao.deleteByClueIdAndUserId(clue.getClueId(), userId);
@@ -66,31 +66,23 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
         if (businessOpportunitiesClue != null)
             return 2;
 
-        BusinessOpportunitiesClue clue = new BusinessOpportunitiesClue();
-        clue.setClueId(UUID.randomUUID().toString().replace("-",""));
-        clue.setAttentionId(turnVo.getAttentionId());
-        clue.setContact(turnVo.getContact());
-        clue.setTelephone(turnVo.getTelephone());
-        clue.setFollowUpCount(0);
-        clue.setUserId(userId);
-        clue.setCreateTime(DateUtil.date());
-        return businessOpportunitiesDao.insert(clue);
+        return businessOpportunitiesDao.insert(new BusinessOpportunitiesClue(turnVo, pool, userId));
     }
 
     @Override
     public int attentionBrand(String brandId, String userId) {
-        AttentionPool attentionPool = attentionPoolDao.searchByBrandIdOrWdIdAndUserId(brandId,null, userId);
+        AttentionPool attentionPool = attentionPoolDao.searchByBrandIdOrWdIdAndUserId(brandId, null, userId);
         if (attentionPool != null) // 判断是否已经关注
             return 2;
 
         QueryWrapper<Brand> brandQueryWrapper = new QueryWrapper<>();
-        brandQueryWrapper.eq("brand_id",brandId)
-            .eq("show_delete",0);
+        brandQueryWrapper.eq("brand_id", brandId)
+            .eq("show_delete", 0);
         Brand brand = brandMapper.selectOne(brandQueryWrapper);
         if (brand == null) // 判断是否有该品牌
             return 3;
         AttentionPool pool = new AttentionPool();
-        pool.setAttentionId(UUID.randomUUID().toString().replace("-",""));
+        pool.setAttentionId(UUID.randomUUID().toString().replace("-", ""));
         pool.setContact(brand.getContact());
         if (brand.getContact() == null)
             pool.setContact("");
@@ -113,13 +105,13 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
         if (attentionPool == null)
             return 1;
         BusinessOpportunitiesClue clue = businessOpportunitiesDao.searchByClueIdOrAttentionIdAndUserId(null, attentionPool.getAttentionId(), userId);
-        if (clue != null){ // 协同删除
+        if (clue != null) { // 协同删除
             if (followUpDao.deleteByClueIdAndUserId(clue.getClueId(), userId) == 0)
                 return 0;
-            if (businessOpportunitiesDao.deleteByAttentionIdAndUserId(attentionPool.getAttentionId(),userId) == 0)
+            if (businessOpportunitiesDao.deleteByAttentionIdAndUserId(attentionPool.getAttentionId(), userId) == 0)
                 return 0;
         }
-        return attentionPoolDao.deleteByBrandIdOrWdIdAndUserId(brnadId,null,userId);
+        return attentionPoolDao.deleteByBrandIdOrWdIdAndUserId(brnadId, null, userId);
     }
 
     @Override
@@ -131,35 +123,35 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
         if (wdInfo == null) // 判断是否有该网点
             return 3;
         AttentionPool pool = new AttentionPool();
-        pool.setAttentionId(UUID.randomUUID().toString().replace("-",""));
+        pool.setAttentionId(UUID.randomUUID().toString().replace("-", ""));
         pool.setWdId(wdInfo.getWdId());
         pool.setWdName(wdInfo.getWdName());
         pool.setWdAddrInfo(wdInfo.getAddrInfo());
         // 补齐信息
         StoreWd storeWd = storeWdDao.selectById(wdId);
-        if (storeWd != null){
+        if (storeWd != null) {
             pool.setContact(storeWd.getContact());
             if (storeWd.getContact() == null)
                 pool.setContact("");
             pool.setTelephone(storeWd.getTelephone());
             if (storeWd.getTelephone() == null)
                 pool.setTelephone("");
-            if (storeWd.getBrandId() != null){
-                if (!storeWd.getBrandId().equals("")){
+            if (storeWd.getBrandId() != null) {
+                if (!storeWd.getBrandId().equals("")) {
                     QueryWrapper<Brand> brandQueryWrapper = new QueryWrapper<>();
-                    brandQueryWrapper.eq("brand_id",storeWd.getBrandId())
-                        .eq("show_delete",0);
+                    brandQueryWrapper.eq("brand_id", storeWd.getBrandId())
+                        .eq("show_delete", 0);
                     Brand brand = brandMapper.selectOne(brandQueryWrapper);
-                    if (brand != null){
+                    if (brand != null) {
                         pool.setBrandId(brand.getBrandId());
                         pool.setBrandName(brand.getBrandName());
-                    }else {
+                    } else {
                         pool.setBrandId("");
                         pool.setBrandName("");
                     }
                 }
             }
-        }else {
+        } else {
             pool.setContact("");
             pool.setTelephone("");
             pool.setBrandId("");
@@ -176,12 +168,12 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
         if (attentionPool == null)
             return 1;
         BusinessOpportunitiesClue clue = businessOpportunitiesDao.searchByClueIdOrAttentionIdAndUserId(null, attentionPool.getAttentionId(), userId);
-        if (clue != null){ // 协同删除
+        if (clue != null) { // 协同删除
             if (followUpDao.deleteByClueIdAndUserId(clue.getClueId(), userId) == 0)
                 return 0;
-            if (businessOpportunitiesDao.deleteByAttentionIdAndUserId(attentionPool.getAttentionId(),userId) == 0)
+            if (businessOpportunitiesDao.deleteByAttentionIdAndUserId(attentionPool.getAttentionId(), userId) == 0)
                 return 0;
         }
-        return attentionPoolDao.deleteByBrandIdOrWdIdAndUserId(null,wdId,userId);
+        return attentionPoolDao.deleteByBrandIdOrWdIdAndUserId(null, wdId, userId);
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/BusinessOpportunitiesServiceImpl.java

@@ -40,7 +40,13 @@ public class BusinessOpportunitiesServiceImpl implements BusinessOpportunitiesSe
             clueQueryWrapper.and(businessOpportunitiesClueQueryWrapper -> {
                 businessOpportunitiesClueQueryWrapper.like("contact", workVo.getText())
                     .or()
-                    .like("telephone", workVo.getText());
+                    .like("telephone", workVo.getText())
+                    .or()
+                    .like("wd_name", workVo.getText())
+                    .or()
+                    .like("wd_addr_info", workVo.getText())
+                    .or()
+                    .like("brand_name", workVo.getText());
             });
         List<BusinessOpportunitiesClue> clues = businessOpportunitiesDao.selectList(clueQueryWrapper);