1

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

@@ -1,8 +1,11 @@
 package com.management.platform.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.BusinessOpportunity;
+import com.management.platform.entity.Clue;
 import com.management.platform.entity.User;
+import com.management.platform.mapper.BusinessOpportunityMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.BusinessOpportunityService;
 import com.management.platform.service.SysFunctionService;
@@ -16,6 +19,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -38,6 +42,8 @@ public class BusinessOpportunityController {
 
     @Resource
     private BusinessOpportunityService bOservice;
+    @Resource
+    private BusinessOpportunityMapper bOMapper;
 
 
     @RequestMapping("insertAndUpdate")
@@ -45,18 +51,36 @@ public class BusinessOpportunityController {
         User user = userMapper.selectById(request.getHeader("Token"));
         HttpRespMsg msg = new HttpRespMsg();
         if (bo.getId() == null){
+            if(bOMapper.selectCount(new QueryWrapper<BusinessOpportunity>().eq("name",bo.getName())) > 0){
+                msg.setError("商机名称重复");
+                return msg;
+            }
             //新增
             bo.setCompanyId(user.getCompanyId());
             bo.setCreatorId(user.getId());
+            bo.setCreateTime(new Date());
             bOservice.insert(bo);
         }else {
+            String name = bOMapper.selectById(bo).getName();
+            if(bOMapper.selectCount(new QueryWrapper<BusinessOpportunity>().eq("name",bo.getName()).ne("name",name)) > 0){
+                msg.setError("商机名称已存在");
+                return msg;
+            }
             //修改
-            bOservice.update(bo);
+            bOservice.update(bo,user.getId());
         }
         msg.setMsg("操作成功");
         return msg;
     }
 
+    @RequestMapping("claim")
+    public Object claim(Clue clue, HttpServletRequest request) {
+        User user = userMapper.selectById(request.getHeader("Token"));
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setMsg("操作成功");
+        bOservice.getAndTransfer(clue, user);
+        return msg;
+    }
     @RequestMapping("list")
     public HttpRespMsg list(@RequestBody BusinessOpportunity bo, HttpServletRequest request) {
         HashMap<Object, Object> r = new HashMap<>();
@@ -89,6 +113,7 @@ public class BusinessOpportunityController {
         User user = userMapper.selectById(request.getHeader("Token"));
         bo.setIsDelete(1);
         bo.setCompanyId(user.getCompanyId());
+        setNull(bo);
         List<BusinessOpportunity> list = new ArrayList<>();
         boolean isAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部商机");
         boolean isNotAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看负责部门商机");
@@ -108,6 +133,24 @@ public class BusinessOpportunityController {
         msg.setData(r);
         return msg;
     }
+    private BusinessOpportunity setNull(BusinessOpportunity bo) {
+        if (bo.getPlate1() == "") {
+            bo.setPlate1(null);
+        }
+        if (bo.getPlate2() == "") {
+            bo.setPlate2(null);
+        }
+        if (bo.getPlate3() == "") {
+            bo.setPlate3(null);
+        }
+        if (bo.getPlate4() == "") {
+            bo.setPlate4(null);
+        }
+        if (bo.getPlate5() == "") {
+            bo.setPlate5(null);
+        }
+        return bo;
+    }
 
 
 

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

@@ -37,6 +37,10 @@ public class CustomController {
     public HttpRespMsg list(Custom custom , HttpServletRequest request){
         return customService.getList(custom,request);
     }
+    @RequestMapping("deleteList")
+    public HttpRespMsg deleteList(Custom custom , HttpServletRequest request){
+        return customService.getDeleteList(custom,request);
+    }
 
 
     @RequestMapping("insertAndUpdate")

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

@@ -2,6 +2,7 @@ package com.management.platform.service;
 
 import com.management.platform.entity.BusinessOpportunity;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.management.platform.entity.Clue;
 import com.management.platform.entity.User;
 
 import java.util.List;
@@ -28,5 +29,7 @@ public interface BusinessOpportunityService extends IService<BusinessOpportunity
 
     void insert(BusinessOpportunity bo);
 
-    void update(BusinessOpportunity bo);
+    void update(BusinessOpportunity bo,String userId);
+
+    void getAndTransfer(Clue clue, User user);
 }

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

@@ -32,4 +32,6 @@ public interface CustomService extends IService<Custom> {
     HttpRespMsg getInfo(Custom custom, HttpServletRequest request);
 
     HttpRespMsg getList(Custom custom, HttpServletRequest request);
+
+    HttpRespMsg getDeleteList(Custom custom, HttpServletRequest request);
 }

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

@@ -1,8 +1,11 @@
 package com.management.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.management.platform.entity.ActionLog;
 import com.management.platform.entity.BusinessOpportunity;
+import com.management.platform.entity.Clue;
 import com.management.platform.entity.User;
+import com.management.platform.mapper.ActionLogMapper;
 import com.management.platform.mapper.BusinessOpportunityMapper;
 import com.management.platform.service.BusinessOpportunityService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,6 +28,8 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
 
     @Resource
     private BusinessOpportunityMapper bOMapper;
+    @Resource
+    private ActionLogMapper actionLogMapper;
     @Override
     public List<BusinessOpportunity> getAll(BusinessOpportunity bo) {
         return bOMapper.selectAllList(bo);
@@ -59,12 +64,44 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
     public void insert(BusinessOpportunity bo) {
         bo.setCreateTime(new Date());
         bOMapper.insert(bo);
+
+    }
+
+    @Override
+    public void update(BusinessOpportunity bo,String userId) {
+        setNull(bo);
+        bOMapper.updateById(bo);
+        ActionLog log = new ActionLog();
+        log.setItemId(bo.getId());
+        log.setName("编辑了商机");
+        log.setCode("business");
+        log.setUserId(userId);
+        log.setCreatTime(new Date());
+        actionLogMapper.insert(log);
     }
 
     @Override
-    public void update(BusinessOpportunity bo) {
-        UpdateWrapper<Object> update = new UpdateWrapper<>();
+    public void getAndTransfer(Clue clue, User user) {
 
-//        bOMapper.update(bo);
     }
+    private BusinessOpportunity setNull(BusinessOpportunity bo) {
+        if (bo.getPlate1() == "") {
+            bo.setPlate1(null);
+        }
+        if (bo.getPlate2() == "") {
+            bo.setPlate2(null);
+        }
+        if (bo.getPlate3() == "") {
+            bo.setPlate3(null);
+        }
+        if (bo.getPlate4() == "") {
+            bo.setPlate4(null);
+        }
+        if (bo.getPlate5() == "") {
+            bo.setPlate5(null);
+        }
+        return bo;
+    }
+
+
 }

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

@@ -71,13 +71,20 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
         setNull(clue);
         clue.setCreateTime(new Date());
         clueMapper.insert(clue);
-        Integer id = clue.getId();
-        ClueLog clueLog = new ClueLog();
-        clueLog.setClueId(id);
-        clueLog.setName("创建了线索");
+//        Integer id = clue.getId();
+//        ClueLog clueLog = new ClueLog();
+//        clueLog.setClueId(id);
+//        clueLog.setName("创建了线索");
 //        clueLog.setUserId(clue.getCreateId());
-        clueLog.setCreatTime(new Date());
-        clueLogMapper.insert(clueLog);
+//        clueLog.setCreatTime(new Date());
+//        clueLogMapper.insert(clueLog);
+        ActionLog log = new ActionLog();
+        log.setItemId(clue.getId());
+        log.setName("创建了线索");
+        log.setCode("clue");
+        log.setUserId(clue.getCreateId());
+        log.setCreatTime(new Date());
+        actionLogMapper.insert(log);
     }
 
     @Override
@@ -85,12 +92,13 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
     public void update(Clue clue) {
         setNull(clue);
         clueMapper.updateById(clue);
-        ClueLog clueLog = new ClueLog();
-        clueLog.setClueId(clue.getId());
-        clueLog.setName("编辑了线索");
-//        clueLog.setUserId(clue.getCreateId());
-        clueLog.setCreatTime(new Date());
-        clueLogMapper.insert(clueLog);
+        ActionLog log = new ActionLog();
+        log.setItemId(clue.getId());
+        log.setName("编辑了线索");
+        log.setCode("clue");
+        log.setUserId(clue.getCreateId());
+        log.setCreatTime(new Date());
+        actionLogMapper.insert(log);
     }
 
     private Clue setNull(Clue clue) {

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

@@ -170,6 +170,39 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         return msg;
     }
 
+    @Override
+    public HttpRespMsg getDeleteList(Custom custom, HttpServletRequest request) {
+        User user = userMapper.selectById(request.getHeader("Token"));
+        custom.setCompanyId(user.getCompanyId());
+        custom.setIsDelete(1);
+        custom.setUserId(user.getId());
+        custom.setEndTime(custom.getEndTime() + " 23:59:59");
+        custom.setPageIndex((custom.getPageIndex()-1) * custom.getPageFrom() );
+        boolean isAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部客户");
+        boolean isNotAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看负责部门客户");
+        List<Custom> list = new ArrayList<>();
+        int i = 0;
+        if (!isAll) {
+            //查看全部线索
+            list = customMapper.getList(custom);
+            i = customMapper.getTotal(custom);
+        } else if (!isNotAll) {
+            //查看负责部门线索 找出所处部门下所有的负责人
+            list = customMapper.getList1(custom);
+            i = customMapper.getTotal1(custom);
+        } else {
+            // 查看负责人为 自己 和 null的数据
+            list = customMapper.getList2(custom);
+            i = customMapper.getTotal2(custom);
+        }
+        HashMap<Object, Object> map = new HashMap<>();
+        map.put("data", list);
+        map.put("total", i);
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setData(map);
+        return msg;
+    }
+
 
     private Custom setNull(Custom clue) {
         if (clue.getPlate1() == "") {