交接单跟进

code/src/test/java/SaleDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class SaleDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:12333/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("root")
+                .password("Fjhx@pwd123")
+                .port(9989)
+                .module("hx-sale")
+                .parent("com.fjhx.sale")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/ehsdDataSource.java

@@ -4,9 +4,9 @@ public class ehsdDataSource {
 
     public static void main(String[] args) {
         GeneratorApplication.builder()
-                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
-                .username("fjhx2012mysql")
-                .password("3PN-Mzn#vnP&q6d")
+                .url("jdbc:mysql://36.134.91.96:12333/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("root")
+                .password("Fjhx@pwd123")
                 .port(9989)
                 .module("hx-ehsd")
                 .parent("com.fjhx.ehsd")

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractProductFollowUpController.java

@@ -0,0 +1,46 @@
+package com.fjhx.sale.controller.contract;
+
+import com.fjhx.sale.entity.contract.dto.ContractProductFollowUpDto;
+import com.fjhx.sale.entity.contract.dto.ContractProductFollowUpSelectDto;
+import com.fjhx.sale.entity.contract.vo.ContractProductFollowUpVo;
+import com.fjhx.sale.service.contract.ContractProductFollowUpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 外销合同-产品-跟进记录 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-06-14
+ */
+@RestController
+@RequestMapping("/contractProductFollowUp")
+public class ContractProductFollowUpController {
+
+    @Autowired
+    private ContractProductFollowUpService contractProductFollowUpService;
+
+    /**
+     * 外销合同-产品-跟进记录列表
+     */
+    @PostMapping("/list")
+    public List<ContractProductFollowUpVo> list(@RequestBody ContractProductFollowUpSelectDto dto) {
+        return contractProductFollowUpService.getList(dto);
+    }
+
+    /**
+     * 外销合同-产品-跟进记录新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ContractProductFollowUpDto contractProductFollowUpDto) {
+        contractProductFollowUpService.add(contractProductFollowUpDto);
+    }
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractProductFollowUpDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.contract.dto;
+
+import com.fjhx.sale.entity.contract.po.ContractProductFollowUp;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 外销合同-产品-跟进记录新增编辑入参实体
+ *
+ * @author
+ * @since 2023-06-14
+ */
+@Getter
+@Setter
+public class ContractProductFollowUpDto extends ContractProductFollowUp {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractProductFollowUpSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.contract.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 外销合同-产品-跟进记录列表查询入参实体
+ *
+ * @author
+ * @since 2023-06-14
+ */
+@Getter
+@Setter
+public class ContractProductFollowUpSelectDto extends BaseSelectDto {
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/ContractProductFollowUp.java

@@ -0,0 +1,43 @@
+package com.fjhx.sale.entity.contract.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 外销合同-产品-跟进记录
+ * </p>
+ *
+ * @author
+ * @since 2023-06-14
+ */
+@Getter
+@Setter
+@TableName("contract_product_follow_up")
+public class ContractProductFollowUp extends BasePo {
+
+    /**
+     * 合同产品id
+     */
+    private Long contractProductId;
+
+    /**
+     * 跟进结果 0处理中 1已处理
+     */
+    private Integer resultType;
+
+    /**
+     * 跟进时间
+     */
+    private Date followUpTime;
+
+    /**
+     * 跟进记录
+     */
+    private String remark;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractProductFollowUpVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.sale.entity.contract.vo;
+
+import com.fjhx.sale.entity.contract.po.ContractProductFollowUp;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 外销合同-产品-跟进记录列表查询返回值实体
+ *
+ * @author
+ * @since 2023-06-14
+ */
+@Getter
+@Setter
+public class ContractProductFollowUpVo extends ContractProductFollowUp {
+
+}

hx-sale/src/main/java/com/fjhx/sale/mapper/contract/ContractProductFollowUpMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.sale.mapper.contract;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.sale.entity.contract.po.ContractProductFollowUp;
+import com.fjhx.sale.entity.contract.vo.ContractProductFollowUpVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 外销合同-产品-跟进记录 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-06-14
+ */
+public interface ContractProductFollowUpMapper extends BaseMapper<ContractProductFollowUp> {
+
+    /**
+     * 外销合同-产品-跟进记录列表
+     */
+    List<ContractProductFollowUpVo> getList(@Param("ew") IWrapper<ContractProductFollowUp> wrapper);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractProductFollowUpService.java

@@ -0,0 +1,31 @@
+package com.fjhx.sale.service.contract;
+
+import com.fjhx.sale.entity.contract.dto.ContractProductFollowUpDto;
+import com.fjhx.sale.entity.contract.dto.ContractProductFollowUpSelectDto;
+import com.fjhx.sale.entity.contract.po.ContractProductFollowUp;
+import com.fjhx.sale.entity.contract.vo.ContractProductFollowUpVo;
+import com.ruoyi.common.core.service.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 外销合同-产品-跟进记录 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-14
+ */
+public interface ContractProductFollowUpService extends BaseService<ContractProductFollowUp> {
+
+    /**
+     * 外销合同-产品-跟进记录列表
+     */
+    List<ContractProductFollowUpVo> getList(ContractProductFollowUpSelectDto dto);
+
+    /**
+     * 外销合同-产品-跟进记录新增
+     */
+    void add(ContractProductFollowUpDto contractProductFollowUpDto);
+
+}

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductFollowUpServiceImpl.java

@@ -0,0 +1,39 @@
+package com.fjhx.sale.service.contract.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.sale.entity.contract.dto.ContractProductFollowUpDto;
+import com.fjhx.sale.entity.contract.dto.ContractProductFollowUpSelectDto;
+import com.fjhx.sale.entity.contract.po.ContractProductFollowUp;
+import com.fjhx.sale.entity.contract.vo.ContractProductFollowUpVo;
+import com.fjhx.sale.mapper.contract.ContractProductFollowUpMapper;
+import com.fjhx.sale.service.contract.ContractProductFollowUpService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 外销合同-产品-跟进记录 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-06-14
+ */
+@Service
+public class ContractProductFollowUpServiceImpl extends ServiceImpl<ContractProductFollowUpMapper, ContractProductFollowUp> implements ContractProductFollowUpService {
+
+    @Override
+    public List<ContractProductFollowUpVo> getList(ContractProductFollowUpSelectDto dto) {
+        IWrapper<ContractProductFollowUp> wrapper = getWrapper();
+        wrapper.orderByDesc("cpfu", ContractProductFollowUp::getId);
+        List<ContractProductFollowUpVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    @Override
+    public void add(ContractProductFollowUpDto contractProductFollowUpDto) {
+        this.save(contractProductFollowUpDto);
+    }
+
+}

hx-sale/src/main/resources/mapper/contract/ContractProductFollowUpMapper.xml

@@ -0,0 +1,18 @@
+<?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.fjhx.ehsd.mapper.contract.ContractProductFollowUpMapper">
+    <select id="getList" resultType="com.fjhx.ehsd.entity.contract.vo.ContractProductFollowUpVo">
+        select cpfu.id,
+               cpfu.contract_product_id,
+               cpfu.result_type,
+               cpfu.follow_up_time,
+               cpfu.remark,
+               cpfu.create_user,
+               cpfu.create_time,
+               cpfu.update_user,
+               cpfu.update_time
+        from contract_product_follow_up cpfu
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>