给余水明等写的代码bug擦屁股

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/BusinessOpportunityController.java

@@ -253,8 +253,15 @@ public class BusinessOpportunityController {
         HttpRespMsg msg = new HttpRespMsg();
         if (bo.getId() == null){
             //新增
+            Integer count = businessOpportunityMapper.selectCount(new LambdaQueryWrapper<BusinessOpportunity>()
+                    .eq(BusinessOpportunity::getName, bo.getName())
+                    .eq(BusinessOpportunity::getCompanyId,user.getCompanyId())
+            );
+            if(count>0){
+                msg.setError("已存在同名商机");
+                return msg;
+            }
             if (bo.getClueId()!= null ){
-
                 clueMapper.update(null, new UpdateWrapper<Clue>().eq("id",bo.getClueId()).set("is_bo",1));
             }
             bo.setCompanyId(user.getCompanyId());
@@ -282,6 +289,15 @@ public class BusinessOpportunityController {
             bOservice.insert(bo);
         }else {
             //修改
+            Integer count = businessOpportunityMapper.selectCount(new LambdaQueryWrapper<BusinessOpportunity>()
+                    .eq(BusinessOpportunity::getName, bo.getName())
+                    .eq(BusinessOpportunity::getCompanyId,user.getCompanyId())
+                    .ne(BusinessOpportunity::getId,bo.getId())
+            );
+            if(count>0){
+                msg.setError("已存在同名商机");
+                return msg;
+            }
             bo.setEditTime(new Date());
             bOservice.update(bo,user.getId());
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/ClueController.java

@@ -282,36 +282,37 @@ public class ClueController {
     @RequestMapping("/insertAndUpdate")
     public Object inserANdUpdate(Clue clue, HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
-        if (clue.getClueName() == null && clue.getClueName().trim().equals("")){
-            msg.setError("请填写名称");
-            return msg;
-        }
-        //操作前校验
-        User user = userMapper.selectById(request.getHeader("Token"));
-        if (user == null) {
-            msg.setError("获取创建人失败");
-            return msg;
-        }
-        clue.setCompanyId(user.getCompanyId());
-        if (null == clue.getClueName() || "".equals(clue.getClueName())) {
-            msg.setError("线索名称不能为空");
-            return msg;
-        }
-        if (null == clue.getClueSourceId()) {
-            msg.setError("线索来源不能为空");
-            return msg;
-        }
-        clue.setIsDelete(0);
-        if (null != clue.getId()) {
-            //修改
-            clueService.update(clue);
-            msg.setMsg("操作成功");
-        } else {
-            //新增
-            clue.setCreateId(user.getId());
-            clueService.insert(clue);
-            msg.setMsg("操作成功");
-        }
+//        if (clue.getClueName() == null && clue.getClueName().trim().equals("")){
+//            msg.setError("请填写名称");
+//            return msg;
+//        }
+//        //操作前校验
+//        User user = userMapper.selectById(request.getHeader("Token"));
+//        if (user == null) {
+//            msg.setError("获取创建人失败");
+//            return msg;
+//        }
+//        clue.setCompanyId(user.getCompanyId());
+//        if (null == clue.getClueName() || "".equals(clue.getClueName())) {
+//            msg.setError("线索名称不能为空");
+//            return msg;
+//        }
+//        if (null == clue.getClueSourceId()) {
+//            msg.setError("线索来源不能为空");
+//            return msg;
+//        }
+//        clue.setIsDelete(0);
+//        if (null != clue.getId()) {
+//            //修改
+//            clueService.update(clue);
+//            msg.setMsg("操作成功");
+//        } else {
+//            //新增
+//            clue.setCreateId(user.getId());
+//            clueService.insert(clue);
+//            msg.setMsg("操作成功");
+//        }
+        msg = clueService.insertAndUpdate(clue,request);
         return msg;
     }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -3,11 +3,6 @@ package com.management.platform.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dingtalk.api.DefaultDingTalkClient;
-import com.dingtalk.api.DingTalkClient;
-import com.dingtalk.api.request.OapiV2DepartmentListsubRequest;
-import com.dingtalk.api.response.OapiV2DepartmentListsubResponse;
-import com.google.gson.JsonObject;
 import com.management.platform.constant.Constant;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.UserVO;
@@ -15,16 +10,13 @@ import com.management.platform.mapper.*;
 import com.management.platform.service.*;
 import com.management.platform.service.impl.ExcelExportServiceImpl;
 import com.management.platform.service.impl.ReportServiceImpl;
-import com.management.platform.service.impl.TaskServiceImpl;
 import com.management.platform.service.impl.UserServiceImpl;
 import com.management.platform.util.*;
 import com.qq.weixin.mp.aes.AesException;
 import com.qq.weixin.mp.aes.WXBizMsgCrypt;
 import com.taobao.api.ApiException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Select;
 import org.json.XML;
-import org.junit.Test;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -38,15 +30,12 @@ import org.springframework.web.servlet.view.RedirectView;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.net.URLEncoder;
-import java.sql.Timestamp;
-import java.time.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @RestController
 @RequestMapping("/wxcorp")
@@ -172,6 +161,9 @@ public class WeiXinCorpController {
     @Resource
     private StageService stageService;
 
+    @Resource
+    private SysDictService sysDictService;
+
     public static String SUITE_ACCESS_TOKEN = null;
     public static long suiteTokenExpireTime = 0L;
 
@@ -1335,6 +1327,32 @@ public class WeiXinCorpController {
                         company.setRegFrom("企业微信");
                         companyMapper.insert(company);
 
+                        List<SysDict> originalDictList = new ArrayList<>();
+                        SysDict goalDict1 = new SysDict("VisitGoal","建立客情",1,company.getId());
+                        SysDict goalDict2 = new SysDict("VisitGoal","收集客户信息",2,company.getId());
+                        SysDict goalDict3 = new SysDict("VisitGoal","了解客户需求",3,company.getId());
+                        SysDict goalDict4 = new SysDict("VisitGoal","方案沟通",4,company.getId());
+                        SysDict goalDict5 = new SysDict("VisitGoal","商务谈判",5,company.getId());
+                        SysDict goalDict6 = new SysDict("VisitGoal","促单",6,company.getId());
+                        SysDict goalDict7 = new SysDict("VisitGoal","签约",7,company.getId());
+                        SysDict goalDict8 = new SysDict("VisitGoal","客户服务",8,company.getId());
+                        originalDictList.add(goalDict1);originalDictList.add(goalDict2);originalDictList.add(goalDict3);
+                        originalDictList.add(goalDict4);originalDictList.add(goalDict5);originalDictList.add(goalDict6);
+                        originalDictList.add(goalDict7);originalDictList.add(goalDict8);
+
+                        SysDict remindDict1 = new SysDict("RemindType","不提醒",1,company.getId());
+                        SysDict remindDict2 = new SysDict("RemindType","提前5分钟",2,company.getId());remindDict2.setExt1("300");
+                        SysDict remindDict3 = new SysDict("RemindType","提前10分钟",3,company.getId());remindDict3.setExt1("600");
+                        SysDict remindDict4 = new SysDict("RemindType","提前20分钟",4,company.getId());remindDict4.setExt1("1200");
+                        SysDict remindDict5 = new SysDict("RemindType","提前1小时",5,company.getId());remindDict5.setExt1("3600");
+                        SysDict remindDict6 = new SysDict("RemindType","提前1天",6,company.getId());remindDict6.setExt1("86400");
+                        SysDict remindDict7 = new SysDict("RemindType","提前3天",7,company.getId());remindDict7.setExt1("259200");
+                        SysDict remindDict8 = new SysDict("RemindType","提前1周",8,company.getId());remindDict8.setExt1("604800");
+                        originalDictList.add(remindDict1);originalDictList.add(remindDict2);originalDictList.add(remindDict3);
+                        originalDictList.add(remindDict4);originalDictList.add(remindDict5);originalDictList.add(remindDict6);
+                        originalDictList.add(remindDict7);originalDictList.add(remindDict8);
+                        sysDictService.saveBatch(originalDictList);
+
                         //设置默认表单配置
                         List<SysForm> baseList = getBaseList();
                         Company finalCompany = company;

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/SysDict.java

@@ -60,6 +60,15 @@ public class SysDict extends Model<SysDict> {
     @TableField("ext3")
     private String ext3;
 
+    public SysDict(String code, String name, Integer seq, Integer companyId) {
+        this.code = code;
+        this.name = name;
+        this.seq = seq;
+        this.companyId = companyId;
+    }
+
+    public SysDict() {
+    }
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/SysDictMapper.java

@@ -2,6 +2,9 @@ package com.management.platform.mapper;
 
 import com.management.platform.entity.SysDict;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
+    void batchInsertDict(@Param("dicts") List<SysDict> originalDictList);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ClueService.java

@@ -66,4 +66,6 @@ public interface ClueService extends IService<Clue> {
     HttpRespMsg pinClue(Clue clue, HttpServletRequest request);
 
     HttpRespMsg undoPin(Clue clue, HttpServletRequest request);
+
+    HttpRespMsg insertAndUpdate(Clue clue, HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ClueServiceImpl.java

@@ -688,5 +688,41 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
         return respMsg;
     }
 
+    @Override
+    public HttpRespMsg insertAndUpdate(Clue clue, HttpServletRequest request) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if (clue.getClueName() == null && clue.getClueName().trim().equals("")){
+            msg.setError("请填写名称");
+            return msg;
+        }
+        //操作前校验
+        User user = userMapper.selectById(request.getHeader("Token"));
+        if (user == null) {
+            msg.setError("获取创建人失败");
+            return msg;
+        }
+        clue.setCompanyId(user.getCompanyId());
+        if (null == clue.getClueName() || "".equals(clue.getClueName())) {
+            msg.setError("线索名称不能为空");
+            return msg;
+        }
+        if (null == clue.getClueSourceId()) {
+            msg.setError("线索来源不能为空");
+            return msg;
+        }
+        clue.setIsDelete(0);
+        if (null != clue.getId()) {
+            //修改
+            clueMapper.updateById(clue);
+            msg.setMsg("操作成功");
+        } else {
+            //新增
+            clue.setCreateId(user.getId());
+            clueMapper.insert(clue);
+            msg.setMsg("操作成功");
+        }
+        return msg;
+    }
+
 
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ContactsServiceImpl.java

@@ -895,7 +895,7 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
         Page<ContactsVo> pageContacts = contactsMapper.pageContactsByPin(new Page( pageIndex, pageSize), map);
         List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId()));
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
+//        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
         Map<String, User> companyUserMap = new HashMap<>();
         if(CollectionUtils.isNotEmpty(userList)){
             companyUserMap  = userList.stream().collect(Collectors.toMap(User::getId, t -> t));
@@ -914,16 +914,17 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
                 if(null != createUser){
                     record.setCreatorName("$username="+createUser.getCorpwxUserid()+"$");
                 }
-            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                User ownUser = companyUserMap.getOrDefault(record.getOwnerId(), null);
-                if(null != ownUser){
-                    record.setOwnerName("$username="+ownUser.getDingdingUserid()+"$");
-                }
-                User createUser = companyUserMap.getOrDefault(record.getCreatorId(), null);
-                if(null != createUser){
-                    record.setCreatorName("$username="+createUser.getDingdingUserid()+"$");
-                }
             }
+//            else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                User ownUser = companyUserMap.getOrDefault(record.getOwnerId(), null);
+//                if(null != ownUser){
+//                    record.setOwnerName("$username="+ownUser.getDingdingUserid()+"$");
+//                }
+//                User createUser = companyUserMap.getOrDefault(record.getCreatorId(), null);
+//                if(null != createUser){
+//                    record.setCreatorName("$username="+createUser.getDingdingUserid()+"$");
+//                }
+//            }
         }
 
         HashMap<String, Object> hashMap = new HashMap<>();

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -1533,7 +1533,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             User user = userMapper.selectById(token);
             WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
             List<SysRichFunction> functionContractList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部合同");
-            CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
+//            CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
             List<User> companyUserList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, user.getCompanyId()));
             Map<String, User> companyUserMap = new HashMap<>();
             if(CollectionUtils.isNotEmpty(companyUserList)){
@@ -1605,9 +1605,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                 if(null != tmpUser){
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                         contractPageVO.setCreatorName("$username="+tmpUser.getCorpwxUserid()+"$");
-                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                        contractPageVO.setCreatorName("$username="+tmpUser.getDingdingUserid()+"$");
-                    }else{
+                    }
+//                    else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                        contractPageVO.setCreatorName("$username="+tmpUser.getDingdingUserid()+"$");
+//                    }
+                    else{
                         contractPageVO.setCreatorName(contract.getCreatorName());
                     }
                 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomServiceImpl.java

@@ -113,6 +113,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         if (custom.getId() != null) {
             Custom custom1 = customMapper.selectById(custom.getId());
             if (customMapper.selectCount(new QueryWrapper<Custom>()
+                    .eq("company_id",user.getCompanyId())
                     .eq("custom_name", custom.getCustomName())
                     .ne("custom_name", custom1.getCustomName())) > 0) {
                 msg.setError("客户名称重复了");
@@ -120,12 +121,14 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
             }
             if (customMapper.selectCount(new QueryWrapper<Custom>()
                     .eq("tel_phone", custom.getTelPhone())
+                    .eq("company_id",user.getCompanyId())
                     .ne("tel_phone", custom1.getTelPhone())
             ) > 0) {
                 msg.setError("电话号码重复了");
                 return msg;
             } if (customMapper.selectCount(new QueryWrapper<Custom>()
                     .eq("company_phone", custom.getCompanyPhone())
+                    .eq("company_id",user.getCompanyId())
                     .ne("company_phone", custom1.getCompanyPhone())
             ) > 0) {
                 msg.setError("电话号码重复了");
@@ -140,11 +143,15 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
             actionLogMapper.insert(actionLog);
             customMapper.updateById(custom);
         } else {
-            if (customMapper.selectCount(new QueryWrapper<Custom>().eq("custom_name", custom.getCustomName())) > 0) {
+            if (customMapper.selectCount(new QueryWrapper<Custom>().eq("custom_name", custom.getCustomName())
+                    .eq("company_id",user.getCompanyId())
+            ) > 0) {
                 msg.setError("客户名称重复了");
                 return msg;
             }
-            if (customMapper.selectCount(new QueryWrapper<Custom>().eq("tel_phone", custom.getTelPhone())) > 0) {
+            if (customMapper.selectCount(new QueryWrapper<Custom>().eq("tel_phone", custom.getTelPhone())
+                    .eq("company_id",user.getCompanyId())
+            ) > 0) {
                 msg.setError("电话号码重复了");
                 return msg;
             }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ProductServiceImpl.java

@@ -96,7 +96,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         boolean hasPriviledgeDept = sysFunctionService.hasPriviledge(targetUsr.getRoleId(), "查看负责部门产品数据");
 
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", targetUsr.getCompanyId()));
-        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, targetUsr.getCompanyId()));
+//        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, targetUsr.getCompanyId()));
 
         //判断查看全部的权限
         if(!hasPriviledgeAll){
@@ -163,9 +163,11 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             if(user.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setCreatorName("$username="+user.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setCreatorName("$username="+user.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setCreatorName("$username="+user.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setInchargerName(user.get().getName());
                 }
             }
@@ -173,9 +175,11 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             if(creator.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setCreatorName("$username="+creator.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setCreatorName("$username="+creator.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setCreatorName("$username="+creator.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setCreatorName(creator.get().getName());
                 }
             }
@@ -660,7 +664,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         boolean hasPriviledgeAll = sysFunctionService.hasPriviledge(targetUsr.getRoleId(), "查看全部产品数据");
         boolean hasPriviledgeDept = sysFunctionService.hasPriviledge(targetUsr.getRoleId(), "查看负责部门产品数据");
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", targetUsr.getCompanyId()));
-        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, targetUsr.getCompanyId()));
+//        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, targetUsr.getCompanyId()));
 
         //判断查看全部的权限
         if(!hasPriviledgeAll){
@@ -727,9 +731,11 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             if(user.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setInchargerName("$username="+user.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setInchargerName("$username="+user.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setInchargerName("$username="+user.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setInchargerName(user.get().getName());
                 }
             }
@@ -737,9 +743,11 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             if(creator.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setCreatorName("$username="+creator.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setCreatorName("$username="+creator.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setCreatorName("$username="+creator.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setCreatorName(creator.get().getName());
                 }
             }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/SalesOrderServiceImpl.java

@@ -111,7 +111,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         List<BusinessOpportunity> businessOpportunityList = businessOpportunityService.list(new LambdaQueryWrapper<BusinessOpportunity>().eq(BusinessOpportunity::getCompanyId, user.getCompanyId()));
 
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
+//        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
 
         orderLambdaQueryWrapper.eq(SalesOrder::getCompanyId,user.getCompanyId());
         if(isDelete!=null){
@@ -211,9 +211,11 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             if(item.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setCreatorName("$username="+item.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setCreatorName("$username="+item.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setCreatorName("$username="+item.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setCreatorName(item.get().getName());
                 }
             }
@@ -221,9 +223,11 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             if(incharger.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setInchargerName("$username="+incharger.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setInchargerName("$username="+incharger.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setInchargerName("$username="+incharger.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setInchargerName(incharger.get().getName());
                 }
             }
@@ -231,9 +235,11 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             if(companySigner.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setCompanySignerName("$username="+companySigner.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setCompanySignerName("$username="+companySigner.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setCompanySignerName("$username="+companySigner.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setCompanySignerName(companySigner.get().getName());
                 }
             }
@@ -241,9 +247,11 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             if(customSigner.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setCustomSignerName("$username="+customSigner.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setCustomSignerName("$username="+customSigner.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setCustomSignerName("$username="+customSigner.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setCustomSignerName(customSigner.get().getName());
                 }
             }
@@ -331,7 +339,7 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         List<Custom> customList = customService.list(new LambdaQueryWrapper<Custom>().eq(Custom::getCompanyId, user.getCompanyId()));
         List<BusinessOpportunity> businessOpportunityList = businessOpportunityService.list(new LambdaQueryWrapper<BusinessOpportunity>().eq(BusinessOpportunity::getCompanyId, user.getCompanyId()));
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", user.getCompanyId()));
-        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
+//        CompanyDingding dingding = companyDingdingMapper.selectOne(new LambdaQueryWrapper<CompanyDingding>().eq(CompanyDingding::getCompanyId, user.getCompanyId()));
 
         orderLambdaQueryWrapper.eq(SalesOrder::getCompanyId,user.getCompanyId());
         if(isDelete!=null){
@@ -437,9 +445,11 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             if(item.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setCreatorName("$username="+item.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setCreatorName("$username="+item.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setCreatorName("$username="+item.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setCreatorName(item.get().getName());
                 }
 
@@ -448,9 +458,11 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             if(incharger.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setInchargerName("$username="+incharger.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setInchargerName("$username="+incharger.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setInchargerName("$username="+incharger.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setInchargerName(incharger.get().getName());
                 }
 
@@ -459,9 +471,11 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             if(companySigner.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setCompanySignerName("$username="+companySigner.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setCompanySignerName("$username="+companySigner.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setCompanySignerName("$username="+companySigner.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setCompanySignerName(companySigner.get().getName());
                 }
             }
@@ -469,9 +483,11 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             if(customSigner.isPresent()){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     r.setCustomSignerName("$username="+customSigner.get().getCorpwxUserid()+"$");
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    r.setCustomSignerName("$username="+customSigner.get().getDingdingUserid()+"$");
-                }else{
+                }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    r.setCustomSignerName("$username="+customSigner.get().getDingdingUserid()+"$");
+//                }
+                else{
                     r.setCustomSignerName(customSigner.get().getName());
                 }
             }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java

@@ -1258,12 +1258,13 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 if(null != tmpUser){
                     tasKVo.setCreaterName("$username="+tmpUser.getCorpwxUserid()+"$");
                 }
-            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                User tmpUser = companyUserMap.getOrDefault(tasKVo.getCreaterId(), null);
-                if(null != tmpUser){
-                    tasKVo.setCreaterName("$username="+tmpUser.getDingdingUserid()+"$");
-                }
             }
+//            else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                User tmpUser = companyUserMap.getOrDefault(tasKVo.getCreaterId(), null);
+//                if(null != tmpUser){
+//                    tasKVo.setCreaterName("$username="+tmpUser.getDingdingUserid()+"$");
+//                }
+//            }
             if (!taskExecutorList.isEmpty()){
                 List<TaskExecutor> collect = taskExecutorList.stream().
                         filter(taskExecutor -> taskExecutor.getTaskId().equals(tasKVo.getId())).
@@ -1342,12 +1343,13 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 if(null != createUser){
                     task.setCreaterName("$username="+createUser.getCorpwxUserid()+"$");
                 }
-            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                User createUser = companyUserMap.getOrDefault(task.getCreaterId(), null);
-                if(null != createUser){
-                    task.setCreaterName("$username="+createUser.getDingdingUserid()+"$");
-                }
             }
+//            else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                User createUser = companyUserMap.getOrDefault(task.getCreaterId(), null);
+//                if(null != createUser){
+//                    task.setCreaterName("$username="+createUser.getDingdingUserid()+"$");
+//                }
+//            }
             if (task.getContactsId()!=null){
                 Contacts contacts = contactsMapper.selectById(task.getContactsId());
                 if (contacts!=null){

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -235,6 +235,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     public static String provider_access_token = null;
     public static long providerTokenExpireTime = 0L;
+    @Resource
+    private SysDictMapper sysDictMapper;
+
+    @Resource
+    private SysDictService sysDictService;
+
     //登录网页端
     @Override
     public HttpRespMsg loginAdmin(String username, String password){
@@ -1126,6 +1132,34 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             company.setRegFrom(from);
             companyMapper.insert(company);
 
+            List<SysDict> originalDictList = new ArrayList<>();
+            SysDict goalDict1 = new SysDict("VisitGoal","建立客情",1,company.getId());
+            SysDict goalDict2 = new SysDict("VisitGoal","收集客户信息",2,company.getId());
+            SysDict goalDict3 = new SysDict("VisitGoal","了解客户需求",3,company.getId());
+            SysDict goalDict4 = new SysDict("VisitGoal","方案沟通",4,company.getId());
+            SysDict goalDict5 = new SysDict("VisitGoal","商务谈判",5,company.getId());
+            SysDict goalDict6 = new SysDict("VisitGoal","促单",6,company.getId());
+            SysDict goalDict7 = new SysDict("VisitGoal","签约",7,company.getId());
+            SysDict goalDict8 = new SysDict("VisitGoal","客户服务",8,company.getId());
+            originalDictList.add(goalDict1);originalDictList.add(goalDict2);originalDictList.add(goalDict3);
+            originalDictList.add(goalDict4);originalDictList.add(goalDict5);originalDictList.add(goalDict6);
+            originalDictList.add(goalDict7);originalDictList.add(goalDict8);
+
+            SysDict remindDict1 = new SysDict("RemindType","不提醒",1,company.getId());
+            SysDict remindDict2 = new SysDict("RemindType","提前5分钟",2,company.getId());remindDict2.setExt1("300");
+            SysDict remindDict3 = new SysDict("RemindType","提前10分钟",3,company.getId());remindDict3.setExt1("600");
+            SysDict remindDict4 = new SysDict("RemindType","提前20分钟",4,company.getId());remindDict4.setExt1("1200");
+            SysDict remindDict5 = new SysDict("RemindType","提前1小时",5,company.getId());remindDict5.setExt1("3600");
+            SysDict remindDict6 = new SysDict("RemindType","提前1天",6,company.getId());remindDict6.setExt1("86400");
+            SysDict remindDict7 = new SysDict("RemindType","提前3天",7,company.getId());remindDict7.setExt1("259200");
+            SysDict remindDict8 = new SysDict("RemindType","提前1周",8,company.getId());remindDict8.setExt1("604800");
+            originalDictList.add(remindDict1);originalDictList.add(remindDict2);originalDictList.add(remindDict3);
+            originalDictList.add(remindDict4);originalDictList.add(remindDict5);originalDictList.add(remindDict6);
+            originalDictList.add(remindDict7);originalDictList.add(remindDict8);
+
+//            sysDictMapper.batchInsertDict(originalDictList);
+            sysDictService.saveBatch(originalDictList);
+
             List<SysForm> baseList = getBaseList();
             baseList.forEach(b->{
                 b.setCompanyId(company.getId());
@@ -1958,12 +1992,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         if(null != tmpUser){
                             map.put("label","$username="+tmpUser.getCorpwxUserid()+"$");
                         }
-                    }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                        User tmpUser = companyUserMap.getOrDefault(map.get("value"),null);
-                        if(null != tmpUser){
-                            map.put("label","$username="+tmpUser.getDingdingUserid()+"$");
-                        }
                     }
+//                    else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                        User tmpUser = companyUserMap.getOrDefault(map.get("value"),null);
+//                        if(null != tmpUser){
+//                            map.put("label","$username="+tmpUser.getDingdingUserid()+"$");
+//                        }
+//                    }
                 }
                 msg.data = realUser;
                 return msg;
@@ -1996,12 +2031,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     if(null != tmpUser){
                         map.put("label","$username="+tmpUser.getCorpwxUserid()+"$");
                     }
-                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
-                    User tmpUser = companyUserMap.getOrDefault(map.get("value"),null);
-                    if(null != tmpUser){
-                        map.put("label","$username="+tmpUser.getDingdingUserid()+"$");
-                    }
                 }
+//                else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+//                    User tmpUser = companyUserMap.getOrDefault(map.get("value"),null);
+//                    if(null != tmpUser){
+//                        map.put("label","$username="+tmpUser.getDingdingUserid()+"$");
+//                    }
+//                }
             }
             msg.data = userList;
             return msg;

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/SysDictMapper.xml

@@ -15,5 +15,12 @@
     <sql id="Base_Column_List">
         id, code, name, seq, company_id
     </sql>
+    <insert id="batchInsertDict">
+        insert into sys_dict(code, name, seq, company_id, ext1, ext2, ext3)
+        values
+            <foreach collection="dicts" separator="," item="dict">
+                (#{dict.code},#{dict.name},#{dict.seq},#{dict.companyId},#{dict.ext1},#{dict.ext2},#{dict.ext3})
+            </foreach>
+    </insert>
 
 </mapper>