BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 02324f9e6091fbaa6c867e830ea1294717a2033a

Authored by YunaiV
1 parent cff6e520

✨ CRM：【联系人】统一字段

Inline Side-by-side
Showing 3 changed files with 39 additions and 31 deletions
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactBaseVO.java
  View file @02324f9
... ... @@ -8,11 +8,11 @@ import cn.iocoder.yudao.module.infra.enums.DictTypeConstants;
8 8 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
9 9 import com.alibaba.excel.annotation.ExcelProperty;
10 10 import io.swagger.v3.oas.annotations.media.Schema;
  11 +import jakarta.validation.constraints.Email;
  12 +import jakarta.validation.constraints.NotNull;
11 13 import lombok.Data;
12 14 import org.springframework.format.annotation.DateTimeFormat;
13 15  
14   -import jakarta.validation.constraints.Email;
15   -import jakarta.validation.constraints.NotNull;
16 16 import java.time.LocalDateTime;
17 17  
18 18 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
... ... @@ -75,29 +75,29 @@ public class CrmContactBaseVO {
75 75 @ExcelProperty(value = "邮箱",order = 4)
76 76 private String email;
77 77  
  78 + @Schema(description = "地区编号", example = "20158")
  79 + private Integer areaId;
  80 +
78 81 @ExcelProperty(value = "地址",order = 5)
79 82 @Schema(description = "地址")
80   - private String address;
81   -
82   - @Schema(description = "下次联系时间")
83   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
84   - @ExcelProperty(value = "下次联系时间",order = 6)
85   - private LocalDateTime nextTime;
  83 + private String detailAddress;
86 84  
87 85 @Schema(description = "备注", example = "你说的对")
88 86 @ExcelProperty(value = "备注",order = 6)
89 87 private String remark;
90 88  
91   - @Schema(description = "最后跟进时间")
92   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
93   - @ExcelProperty(value = "最后跟进时间",order = 6)
94   - private LocalDateTime lastTime;
95   -
96 89 @Schema(description = "负责人用户编号", example = "14334")
97 90 @NotNull(message = "负责人不能为空")
98 91 private Long ownerUserId;
99 92  
100   - @Schema(description = "地区编号", example = "20158")
101   - private Integer areaId;
  93 + @Schema(description = "最后跟进时间")
  94 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  95 + @ExcelProperty(value = "最后跟进时间",order = 6)
  96 + private LocalDateTime contactLastTime;
  97 +
  98 + @Schema(description = "下次联系时间")
  99 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
  100 + @ExcelProperty(value = "下次联系时间",order = 6)
  101 + private LocalDateTime contactNextTime;
102 102  
103 103 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contact/CrmContactDO.java
  View file @02324f9
1 1 package cn.iocoder.yudao.module.crm.dal.dataobject.contact;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
4 5 import com.baomidou.mybatisplus.annotation.KeySequence;
5 6 import com.baomidou.mybatisplus.annotation.TableId;
6 7 import com.baomidou.mybatisplus.annotation.TableName;
... ... @@ -29,9 +30,11 @@ public class CrmContactDO extends BaseDO {
29 30 @TableId
30 31 private Long id;
31 32 /**
32   - * 下次联系时间
  33 + * 客户编号
  34 + *
  35 + * 关联 {@link CrmCustomerDO#getId()}
33 36 */
34   - private LocalDateTime nextTime;
  37 + private Long customerId;
35 38 /**
36 39 * 手机号
37 40 */
... ... @@ -45,21 +48,20 @@ public class CrmContactDO extends BaseDO {
45 48 */
46 49 private String email;
47 50 /**
48   - * 客户编号
  51 + * 所在地
  52 + *
  53 + * 关联 {@link cn.iocoder.yudao.framework.ip.core.Area#getId()} 字段
49 54 */
50   - private Long customerId;
  55 + private Integer areaId;
51 56 /**
52   - * 地址
  57 + * 详细地址
53 58 */
54   - private String address;
  59 + private String detailAddress;
55 60 /**
56 61 * 备注
57 62 */
58 63 private String remark;
59   - /**
60   - * 最后跟进时间
61   - */
62   - private LocalDateTime lastTime;
  64 +
63 65 /**
64 66 * 直属上级
65 67 *
... ... @@ -100,10 +102,13 @@ public class CrmContactDO extends BaseDO {
100 102 private Long ownerUserId;
101 103  
102 104 /**
103   - * 所在地
104   - *
105   - * 关联 {@link cn.iocoder.yudao.framework.ip.core.Area#getId()} 字段
  105 + * 最后跟进时间
106 106 */
107   - private Integer areaId;
  107 + private LocalDateTime contactLastTime;
  108 + // TODO @puhui999：增加一个字段 contactLastContent；最后跟进内容
  109 + /**
  110 + * 下次联系时间
  111 + */
  112 + private LocalDateTime contactNextTime;
108 113  
109 114 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/customer/CrmCustomerDO.java
  View file @02324f9
... ... @@ -12,7 +12,7 @@ import java.time.LocalDateTime;
12 12 // TODO 芋艿：调整下字段
13 13  
14 14 /**
15   - * 客户 DO
  15 + * CRM 客户 DO
16 16 *
17 17 * @author Wanwan
18 18 */
... ... @@ -104,13 +104,16 @@ public class CrmCustomerDO extends BaseDO {
104 104 */
105 105 private Long ownerUserId;
106 106 /**
107   - * 地区编号
  107 + * 所在地
  108 + *
  109 + * 关联 {@link cn.iocoder.yudao.framework.ip.core.Area#getId()} 字段
108 110 */
109 111 private Integer areaId;
110 112 /**
111 113 * 详细地址
112 114 */
113 115 private String detailAddress;
  116 +
114 117 /**
115 118 * 最后跟进时间
116 119 */
... ...