楚江erp：客户拜访记录相关接口开发

@@ -929,4 +929,17 @@ create table `tbl_replenishment_order_line`
 
 
 alter table sys_dept add column user_id varchar(32) comment '部门负责人';
-alter table sys_data_dic_item modify column name varchar(50) comment '名称';
\ No newline at end of file
+alter table sys_data_dic_item modify column name varchar(50) comment '名称';
+
+
+create table if not exists customer_visit_record(
+    id varchar(32) primary key comment 'ID',
+    customer_id varchar(32) not null comment '客户ID',
+    user_id varchar(32) not null comment '拜访人员ID',
+    visit_time date not null comment '拜访时间',
+    visit_content varchar(500) comment '拜访内容',
+    create_by_id varchar(32) not null comment '创建人ID',
+    update_by_id varchar(32) not null comment '更新人ID',
+    create_time datetime default now() comment '创建时间',
+    update_time datetime default now() comment '更新时间'
+);
\ No newline at end of file

+package com.lframework.xingyun.basedata.vo.customer;
+
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import javax.validation.constraints.NotNull;
+import io.swagger.annotations.ApiModelProperty;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class CreateCustomerVisitRecordVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+    @ApiModelProperty(value = "客户ID", required = true)
+    @NotBlank(message = "请输入客户ID！")
+    @Length(message = "客户ID最多允许32个字符！")
+    private String customerId;
+
+    /**
+     * 拜访人员ID
+     */
+    @ApiModelProperty(value = "拜访人员ID", required = true)
+    @NotBlank(message = "请输入拜访人员ID！")
+    @Length(message = "拜访人员ID最多允许32个字符！")
+    private String userId;
+
+    /**
+     * 拜访时间
+     */
+    @ApiModelProperty(value = "拜访时间", required = true)
+    @NotNull(message = "请输入拜访时间！")
+    @TypeMismatch(message = "拜访时间格式有误！")
+    private LocalDate visitTime;
+
+    /**
+     * 拜访内容
+     */
+    @ApiModelProperty(value = "拜访内容", required = true)
+    @NotBlank(message = "请输入拜访内容！")
+    @Length(message = "拜访内容最多允许500个字符！")
+    private String visitContent;
+}

+package com.lframework.xingyun.basedata.vo.customer;
+
+import lombok.Data;
+import com.lframework.starter.web.core.vo.PageVo;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
+@Data
+public class QueryCustomerVisitRecordVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+    @ApiModelProperty("客户ID")
+    private String customerId;
+
+}

+package com.lframework.xingyun.basedata.vo.customer;
+
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import javax.validation.constraints.NotNull;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+
+@Data
+public class UpdateCustomerVisitRecordVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 拜访人员ID
+     */
+    @ApiModelProperty(value = "拜访人员ID", required = true)
+    @NotBlank(message = "请输入拜访人员ID！")
+    @Length(message = "拜访人员ID最多允许32个字符！")
+    private String userId;
+
+    /**
+     * 拜访时间
+     */
+    @ApiModelProperty(value = "拜访时间", required = true)
+    @TypeMismatch(message = "拜访时间格式有误！")
+    @NotNull(message = "请输入拜访时间！")
+    private LocalDate visitTime;
+
+    /**
+     * 拜访内容
+     */
+    @ApiModelProperty(value = "拜访内容", required = true)
+    @NotBlank(message = "请输入拜访内容！")
+    @Length(message = "拜访内容最多允许500个字符！")
+    private String visitContent;
+
+}

@@ -7,7 +7,9 @@ import com.lframework.xingyun.sc.entity.CustomerDevelopPlan;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDateTime;
+import java.util.List;
 
+import com.lframework.xingyun.sc.entity.CustomerVisitRecord;
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;
@@ -148,6 +150,12 @@ public class GetCustomerDevelopPlanBo extends BaseBo<CustomerDevelopPlan> implem
     private String flowTaskId;
 
     /**
+     * 拜访记录
+     */
+    @ApiModelProperty("备注")
+    private List<CustomerVisitRecord> visitRecords;
+
+    /**
      * 创建人
      */
     @ApiModelProperty("创建人")

+package com.lframework.xingyun.sc.controller.customer;
+
+import com.lframework.xingyun.sc.service.customer.CustomerVisitRecordService;
+import com.lframework.xingyun.basedata.vo.customer.CreateCustomerVisitRecordVo;
+import com.lframework.xingyun.basedata.vo.customer.UpdateCustomerVisitRecordVo;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
+import io.swagger.annotations.ApiImplicitParam;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * 客户拜访记录 Controller
+ *
+ */
+@Api(tags = "客户拜访记录")
+@Validated
+@RestController
+@RequestMapping("/customer/visitRecord")
+public class CustomerVisitRecordController extends DefaultBaseController {
+
+
+    @Resource
+    private CustomerVisitRecordService customerVisitRecordService;
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreateCustomerVisitRecordVo vo) {
+        customerVisitRecordService.create(vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @PutMapping
+    public InvokeResult<Void> update(@Valid UpdateCustomerVisitRecordVo vo) {
+        customerVisitRecordService.update(vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID删除
+     */
+    @ApiOperation("根据ID删除")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @DeleteMapping
+    public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
+        customerVisitRecordService.deleteById(id);
+        return InvokeResultBuilder.success();
+    }
+}

@@ -9,6 +9,7 @@ import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -139,6 +140,12 @@ public class CustomerDevelopPlan extends BaseEntity implements BaseDto {
     private String deptCode;
 
     /**
+     * 拜访记录
+     */
+    @TableField(exist = false)
+    private List<CustomerVisitRecord> visitRecords;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * <p>
+ * 客户拜访记录
+ * </p>
+ *
+ */
+@Data
+@TableName("customer_visit_record")
+public class CustomerVisitRecord extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "CustomerVisitRecord";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 拜访人员ID
+     */
+    private String userId;
+
+    /**
+     * 拜访人员姓名
+     */
+    @TableField(exist = false)
+    private String userName;
+
+    /**
+     * 拜访时间
+     */
+    private LocalDate visitTime;
+
+    /**
+     * 拜访内容
+     */
+    private String visitContent;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

@@ -15,6 +15,7 @@ import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.office.OfficeService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
+import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVisitRecordVo;
 import com.lframework.xingyun.sc.bo.customer.develop.CustomerDevelopPlanStatisticsBo;
 import com.lframework.xingyun.sc.entity.CustomerDevelopPlan;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -25,8 +26,10 @@ import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.CustomerVisitRecord;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.handlers.MessageHandler;
+import com.lframework.xingyun.sc.service.customer.CustomerVisitRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -66,6 +69,8 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
     private CustomerService customerService;
     @Resource
     private OfficeService officeService;
+    @Resource
+    private CustomerVisitRecordService customerVisitRecordService;
 
 
 
@@ -140,7 +145,14 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
      */
     @Override
     public CustomerDevelopPlan findById(String id) {
-        return getBaseMapper().selectById(id);
+        CustomerDevelopPlan plan = getBaseMapper().selectById(id);
+
+        QueryCustomerVisitRecordVo recordVo = new QueryCustomerVisitRecordVo();
+        recordVo.setCustomerId(id);
+        List<CustomerVisitRecord> visitRecordList = customerVisitRecordService.query(recordVo);
+        plan.setVisitRecords(visitRecordList);
+
+        return plan;
     }
 
     @OpLog(type = OtherOpLogType.class, name = "新增客户开发计划，ID：{}", params = {"#id"})

+package com.lframework.xingyun.sc.impl.customer;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.mappers.CustomerVisitRecordMapper;
+import com.lframework.xingyun.sc.service.customer.CustomerVisitRecordService;
+import org.springframework.transaction.annotation.Transactional;
+import com.lframework.xingyun.basedata.vo.customer.CreateCustomerVisitRecordVo;
+import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVisitRecordVo;
+import com.lframework.xingyun.basedata.vo.customer.UpdateCustomerVisitRecordVo;
+import org.springframework.stereotype.Service;
+import com.lframework.xingyun.sc.entity.CustomerVisitRecord;
+
+import java.util.List;
+
+@Service
+public class CustomerVisitRecordServiceImpl extends BaseMpServiceImpl<CustomerVisitRecordMapper, CustomerVisitRecord> implements CustomerVisitRecordService {
+
+
+
+    @Override
+    public List<CustomerVisitRecord> query(QueryCustomerVisitRecordVo vo) {
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public CustomerVisitRecord findById(String id) {
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增客户拜访记录，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateCustomerVisitRecordVo vo) {
+
+        CustomerVisitRecord data = new CustomerVisitRecord();
+        data.setId(IdUtil.getId());
+        data.setCustomerId(vo.getCustomerId());
+        data.setUserId(vo.getUserId());
+        data.setVisitTime(vo.getVisitTime());
+        data.setVisitContent(vo.getVisitContent());
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改客户拜访记录，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateCustomerVisitRecordVo vo) {
+        CustomerVisitRecord data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("客户拜访记录不存在！");
+        }
+        LambdaUpdateWrapper<CustomerVisitRecord> updateWrapper = Wrappers.lambdaUpdate(CustomerVisitRecord.class)
+                .set(CustomerVisitRecord::getUserId, vo.getUserId())
+                .set(CustomerVisitRecord::getVisitTime, vo.getVisitTime())
+                .set(CustomerVisitRecord::getVisitContent, vo.getVisitContent())
+                .eq(CustomerVisitRecord::getId, vo.getId());
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "删除客户拜访记录，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteById(String id) {
+        getBaseMapper().deleteById(id);
+    }
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVisitRecordVo;
+import com.lframework.xingyun.sc.entity.CustomerVisitRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 客户拜访记录 Mapper 接口
+ * </p>
+ *
+ */
+public interface CustomerVisitRecordMapper extends BaseMapper<CustomerVisitRecord> {
+
+	/**
+     * 查询列表
+     *
+     * @param vo    查询条件
+     * @return      List<CustomerVisitRecord>
+     */
+    List<CustomerVisitRecord> query(@Param("vo") QueryCustomerVisitRecordVo vo);
+}

+package com.lframework.xingyun.sc.service.customer;
+
+import com.lframework.xingyun.basedata.vo.customer.CreateCustomerVisitRecordVo;
+import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVisitRecordVo;
+import com.lframework.xingyun.basedata.vo.customer.UpdateCustomerVisitRecordVo;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.xingyun.sc.entity.CustomerVisitRecord;
+
+import java.util.List;
+
+/**
+ * 客户拜访记录 Service
+ */
+public interface CustomerVisitRecordService extends BaseMpService<CustomerVisitRecord> {
+
+    /**
+     * 查询列表
+     *
+     * @param vo    查询条件
+     * @return      List<CustomerVisitRecord>
+     */
+    List<CustomerVisitRecord> query(QueryCustomerVisitRecordVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id    主键ID
+     * @return      CustomerVisitRecord
+     */
+    CustomerVisitRecord findById(String id);
+
+    /**
+     * 创建
+     *
+     * @param vo    数据实体
+     * @return      String
+     */
+    String create(CreateCustomerVisitRecordVo vo);
+
+    /**
+     * 修改
+     *
+     * @param vo    数据实体
+     */
+    void update(UpdateCustomerVisitRecordVo vo);
+
+    /**
+     * 根据ID删除
+     *
+     * @param id    主键ID
+     */
+    void deleteById(String id);
+}

+<?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.lframework.xingyun.sc.mappers.CustomerVisitRecordMapper">
+
+    <resultMap id="CustomerVisitRecord" type="com.lframework.xingyun.sc.entity.CustomerVisitRecord">
+        <id column="id" property="id"/>
+        <result column="customer_id" property="customerId"/>
+        <result column="user_id" property="userId"/>
+        <result column="user_name" property="userName"/>
+        <result column="visit_time" property="visitTime"/>
+        <result column="visit_content" property="visitContent"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="CustomerVisitRecord_sql">
+        SELECT
+            tb.id,
+            tb.customer_id,
+            tb.user_id,
+            u.name as user_name,
+            tb.visit_time,
+            tb.visit_content,
+            tb.create_by_id,
+            tb.update_by_id,
+            tb.create_time,
+            tb.update_time
+        FROM customer_visit_record AS tb
+        LEFT JOIN sys_user AS u ON tb.user_id = u.id
+    </sql>
+
+    <select id="query" resultMap="CustomerVisitRecord">
+        <include refid="CustomerVisitRecord_sql"/>
+        <where>
+            <if test="vo.customerId != null and vo.customerId != ''">
+                AND tb.customer_id = #{vo.customerId}
+            </if>
+        </where>
+    </select>
+</mapper>