Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -1,8 +1,14 @@
 package com.management.platform.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.Clue;
+import com.management.platform.entity.SysDict;
+import com.management.platform.entity.User;
+import com.management.platform.mapper.SysDictMapper;
+import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ClueService;
+import com.management.platform.service.UserService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,7 +17,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,17 +35,55 @@ import java.util.List;
 public class ClueController {
     @Resource
     private ClueService clueService;
+    @Resource
+    private UserMapper userMapper;
+
+    @Resource
+    private SysDictMapper sysDictMapper;
 
-//    @RequestMapping("listClue")
-//    public Object list(@RequestBody Clue clue){
-//        clueService.getList(clue);
-//        return
-//    }
-    @RequestMapping("/inserANdUpdate")
-    public Object inserANdUpdate(@RequestBody Clue clue){
+
+    @RequestMapping("getClueSources")
+    public Object getClueSources(){
+        QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("code", "ClueSources");
+        return sysDictMapper.selectList(queryWrapper);
+    }
+    @RequestMapping("getDetail")
+    public Object getDetail(@RequestBody Clue clue){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setData(clueService.getInfo(clue));
+        return msg;
+    }
+    @RequestMapping("listClue")
+    public Object list(@RequestBody Clue clue, HttpServletRequest request){
+        //TODO token待定
+        // User user = userMapper.selectById(request.getHeader(  "Token"));
+        // clue.setCompanyId(user.getCompanyId());
+        List<Clue> list =  clueService.getList(clue);
+        HashMap<Object, Object> map = new HashMap<>();
+        map.put("data",list);
+        map.put("total",clueService.getTotal(clue));
+        return map;
+    }
+    @RequestMapping("listDeleterClue")
+    public Object listDeleterClue(@RequestBody Clue clue, HttpServletRequest request){
+        //TODO token待定
+        // User user = userMapper.selectById(request.getHeader(  "Token"));
+        // clue.setCompanyId(user.getCompanyId());
+        List<Clue> list =  clueService.getDeleterList(clue);
+        HashMap<Object, Object> map = new HashMap<>();
+        map.put("data",list);
+        map.put("total",clueService.getDeleterTotal(clue));
+        return map;
+    }
+    @RequestMapping("/insertAndUpdate")
+    public Object inserANdUpdate(@RequestBody Clue clue, HttpServletRequest request){
         HttpRespMsg msg = new HttpRespMsg();
         //操作前校验
-        if (null == clue.getClueName() || "" == clue.getClueName()){
+        //TODO token待定
+        // User user = userMapper.selectById(request.getHeader(  "Token"));
+        // Integer companyId = user.getCompanyId();
+        if (null == clue.getClueName() || "".equals(clue.getClueName())){
             msg.setError("线索名称不能为空");
             return msg;
         }
@@ -51,7 +98,12 @@ public class ClueController {
             msg.setMsg("操作成功");
         }else {
             //新增
+            //TODO token待定
+            // clue.setCompanyId(companyId);
+            // clue.setCreateId(user.getId());
+
             clueService.insert(clue);
+
             msg.setMsg("操作成功");
         }
         return  msg;

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

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@RestController
+@RequestMapping("/clue-log")
+public class ClueLogController {
+
+}
+

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,6 +35,9 @@ public class Clue extends Model<Clue> {
      */
     @TableField("company_id")
     private Integer companyId;
+    //创建人
+    @TableField("create_id")
+    private String createId;
 
     /**
      * 线索名称
@@ -41,6 +45,8 @@ public class Clue extends Model<Clue> {
     @TableField("clue_name")
     private String clueName;
 
+    private String companyName;
+
     /**
      * 线索来源
      */
@@ -130,6 +136,14 @@ public class Clue extends Model<Clue> {
      */
     @TableField("create_time")
     private Date createTime;
+    private Date startTime;
+    private Date endTime;
+
+    private Integer pageIndex;
+    private Integer pageFrom;
+
+    private List<ClueLog> clueLogList;
+
 
 
     @Override

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

@@ -0,0 +1,56 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ClueLog extends Model<ClueLog> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId("id")
+    private Long id;
+
+    @TableField("clue_id")
+    private Integer clueId;
+
+    /**
+     * 操作时间
+     */
+    @TableField("creat_time")
+    private Date creatTime;
+
+    /**
+     * 操作内容
+     */
+    @TableField("name")
+    private String name;
+
+    @TableField("user_id")
+    private String userId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ClueLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+public interface ClueLogMapper extends BaseMapper<ClueLog> {
+
+}

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

@@ -3,6 +3,8 @@ package com.management.platform.mapper;
 import com.management.platform.entity.Clue;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +15,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ClueMapper extends BaseMapper<Clue> {
 
+    List<Clue> list(Clue clue);
+    List<Clue> Deleterlist(Clue clue);
+
+    Integer getTotal(Clue clue);
+    Integer getDeleterTotal(Clue clue);
 }

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ClueLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+public interface ClueLogService extends IService<ClueLog> {
+
+}

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

@@ -3,6 +3,7 @@ package com.management.platform.service;
 import com.management.platform.entity.Clue;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -19,4 +20,12 @@ public interface ClueService extends IService<Clue> {
     void update(Clue clue);
 
     void isDelete(List<Integer> ids);
+
+    List<Clue> getList(Clue clue);
+    List<Clue> getDeleterList(Clue clue);
+
+    Integer getTotal(Clue clue);
+    Integer getDeleterTotal(Clue clue);
+
+    Clue getInfo(Clue clue);
 }

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ClueLog;
+import com.management.platform.mapper.ClueLogMapper;
+import com.management.platform.service.ClueLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@Service
+public class ClueLogServiceImpl extends ServiceImpl<ClueLogMapper, ClueLog> implements ClueLogService {
+
+}

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

@@ -3,6 +3,8 @@ package com.management.platform.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.management.platform.entity.Clue;
+import com.management.platform.entity.ClueLog;
+import com.management.platform.mapper.ClueLogMapper;
 import com.management.platform.mapper.ClueMapper;
 import com.management.platform.service.ClueService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.beans.Transient;
 import java.util.Date;
 import java.util.List;
@@ -30,6 +33,8 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
     private SysFunctionService sysFunctionService;
     @Autowired
     private ClueMapper clueMapper;
+    @Autowired
+    private ClueLogMapper clueLogMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -37,7 +42,13 @@ 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("创建了线索");
+//        clueLog.setUserId(clue.getCreateId());
+        clueLog.setCreatTime(new Date());
+        clueLogMapper.insert(clueLog);
     }
 
     @Override
@@ -45,6 +56,12 @@ 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);
     }
 
     private Clue setNull(Clue clue) {
@@ -75,4 +92,35 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
         clue.setIsDelete(1);
         clueMapper.update(clue, updateWrapper);
     }
+
+    @Override
+    public List<Clue> getList(Clue clue) {
+        return clueMapper.list(clue);
+    }
+
+    @Override
+    public List<Clue> getDeleterList(Clue clue) {
+        return clueMapper.Deleterlist(clue);
+    }
+
+    @Override
+    public Integer getTotal(Clue clue) {
+        return clueMapper.getTotal(clue);
+    }
+    @Override
+    public Integer getDeleterTotal(Clue clue) {
+        return clueMapper.getDeleterTotal(clue);
+    }
+
+    @Override
+    public Clue getInfo(Clue clue) {
+        Clue clue1 = clueMapper.selectById(clue.getId());
+        QueryWrapper<ClueLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("clue_id",clue.getId());
+        List<ClueLog> logs = clueLogMapper.selectList(queryWrapper);
+        clue1.setClueLogList(logs);
+        return clue1;
+    }
+
+
 }

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.ClueLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ClueLog">
+        <id column="id" property="id" />
+        <result column="clue_id" property="clueId" />
+        <result column="creat_time" property="creatTime" />
+        <result column="name" property="name" />
+        <result column="user_id" property="userId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, clue_id, creat_time, name, user_id
+    </sql>
+
+</mapper>

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

@@ -8,7 +8,8 @@
         <result column="company_id" property="companyId" />
         <result column="clue_name" property="clueName" />
         <result column="clue_source_id" property="clueSourceId" />
-        <result column="contact_information" property="contactInformation" />
+        <result column="phone" property="phone" />
+        <result column="email" property="email" />
         <result column="customer_industry_id" property="customerIndustryId" />
         <result column="customer_level_id" property="customerLevelId" />
         <result column="address" property="address" />
@@ -20,11 +21,126 @@
         <result column="plate3" property="plate3" />
         <result column="plate4" property="plate4" />
         <result column="plate5" property="plate5" />
+        <result column="company_name" property="companyName" />
+        <result column="create_time" property="createTime" />
+        <result column="create_id" property="createId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, clue_name, clue_source_id, contact_information, customer_industry_id, customer_level_id, address, incharger_id, remark, is_delete, plate1, plate2, plate3, plate4, plate5
+        id, company_id, clue_name, clue_source_id, phone , email, customer_industry_id, customer_level_id, address, incharger_id, remark, is_delete, plate1, plate2, plate3, plate4, plate5,create_time,createId
     </sql>
+    <select id="list" resultType="com.management.platform.entity.Clue">
+        select c.id,
+               c.company_id,
+               (select company_name from company where company_id = c.id) companyName,
+               c.clue_name,
+               c.clue_source_id,
+               c.phone,
+               c.email,
+               c.customer_industry_id,
+               c.customer_level_id,
+               c.address,
+               c.incharger_id,
+               c.remark,
+               c.is_delete,
+               c.plate1,
+               c.plate2,
+               c.plate3,
+               c.plate4,
+               c.plate5,
+               c.create_time,
+               c.create_id
+        from Clue c
+        where
+            c.company_id = #{companyId} and is_delete = 0
+        <if test="startTime != null and endTime != null ">
+        and  c.create_time BETWEEN  #{startTime} and #{endTime}
+        </if>
+        <if test="clueName != null and clueName != '' ">
+        and  c.clue_name =  #{clueName}
+        </if>
+        <if test="clueSourceId != null">
+        and  c.clue_source_id =  #{clueSourceId}
+        </if>
+        <if test="customerIndustryId != null">
+        and  c.customer_industry_id =  #{customerIndustryId}
+        </if>
+        limit #{pageIndex},#{pageFrom}
+    </select>
+    <select id="Deleterlist" resultType="com.management.platform.entity.Clue">
+        select c.id,
+               c.company_id,
+               (select company_name from company where company_id = c.id) companyName,
+               c.clue_name,
+               c.clue_source_id,
+               c.phone,
+               c.email,
+               c.customer_industry_id,
+               c.customer_level_id,
+               c.address,
+               c.incharger_id,
+               c.remark,
+               c.is_delete,
+               c.plate1,
+               c.plate2,
+               c.plate3,
+               c.plate4,
+               c.plate5,
+               c.create_time,
+               c.create_id
+        from Clue c
+        where
+            c.company_id = #{companyId} and is_delete = 1
+        <if test="startTime != null and endTime != null ">
+        and  c.create_time BETWEEN  #{startTime} and #{endTime}
+        </if>
+        <if test="clueName != null and clueName != '' ">
+        and  c.clue_name =  #{clueName}
+        </if>
+        <if test="clueSourceId != null">
+        and  c.clue_source_id =  #{clueSourceId}
+        </if>
+        <if test="customerIndustryId != null">
+        and  c.customer_industry_id =  #{customerIndustryId}
+        </if>
+        limit #{pageIndex},#{pageFrom}
+    </select>
+    <select id="getTotal" resultType="java.lang.Integer">
+        select count(*)
+        from Clue c
+        where
+        c.company_id = #{companyId} and is_delete = 0
+        <if test="startTime != null and endTime != null ">
+            and  c.create_time BETWEEN  #{startTime} and #{endTime}
+        </if>
+        <if test="clueName != null and clueName != '' ">
+            and  c.clue_name =  #{clueName}
+        </if>
+        <if test="clueSourceId != null">
+            and  c.clue_source_id =  #{clueSourceId}
+        </if>
+        <if test="customerIndustryId != null">
+            and  c.customer_industry_id =  #{customerIndustryId}
+        </if>
+    </select>
+    <select id="getDeleterTotal" resultType="java.lang.Integer">
+        select count(*)
+        from Clue c
+        where
+        c.company_id = #{companyId} and is_delete = 1
+        <if test="startTime != null and endTime != null ">
+            and  c.create_time BETWEEN  #{startTime} and #{endTime}
+        </if>
+        <if test="clueName != null and clueName != '' ">
+            and  c.clue_name =  #{clueName}
+        </if>
+        <if test="clueSourceId != null">
+            and  c.clue_source_id =  #{clueSourceId}
+        </if>
+        <if test="customerIndustryId != null">
+            and  c.customer_industry_id =  #{customerIndustryId}
+        </if>
+    </select>
 
 </mapper>