CRM提交更新

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProduct.java

@@ -63,6 +63,6 @@ public class OaProduct extends BaseEntity {
     /**
      * 是否删除
      */
-    private Long deleted;
+    private Long delFlag;
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBusinessProductBo.java

@@ -25,43 +25,36 @@ public class OaBusinessProductBo extends BaseEntity {
     /**
      * 主键
      */
-    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
     private Long businessProductId;
 
     /**
      * 商机编号
      */
-    @NotNull(message = "商机编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long businessId;
 
     /**
      * 产品编号
      */
-    @NotNull(message = "产品编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long productId;
 
     /**
      * 产品单价
      */
-    @NotNull(message = "产品单价不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal productPrice;
 
     /**
      * 商机价格
      */
-    @NotNull(message = "商机价格不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal businessPrice;
 
     /**
      * 数量
      */
-    @NotNull(message = "数量不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal count;
 
     /**
      * 总计价格
      */
-    @NotNull(message = "总计价格不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal totalPrice;
 
 

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaClueBo.java

@@ -26,121 +26,101 @@ public class OaClueBo extends BaseEntity {
     /**
      * 编号，主键自增
      */
-    @NotNull(message = "编号，主键自增不能为空", groups = { EditGroup.class })
     private Long clueId;
 
     /**
      * 线索名称
      */
-    @NotBlank(message = "线索名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String clueName;
 
     /**
      * 跟进状态
      */
-    @NotNull(message = "跟进状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer followUpStatus;
 
     /**
      * 最后跟进时间
      */
-    @NotNull(message = "最后跟进时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date contactLastTime;
 
     /**
      * 最后跟进内容
      */
-    @NotBlank(message = "最后跟进内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String contactLastContent;
 
     /**
      * 下次联系时间
      */
-    @NotNull(message = "下次联系时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date contactNextTime;
 
     /**
      * 负责人的用户编号
      */
-    @NotNull(message = "负责人的用户编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long ownerUserId;
 
     /**
      * 转化状态
      */
-    @NotNull(message = "转化状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer transformStatus;
 
     /**
      * 客户编号
      */
-    @NotNull(message = "客户编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long customerId;
 
     /**
      * 手机号
      */
-    @NotBlank(message = "手机号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String mobile;
 
     /**
      * 电话
      */
-    @NotBlank(message = "电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String telephone;
 
     /**
      * QQ
      */
-    @NotBlank(message = "QQ不能为空", groups = { AddGroup.class, EditGroup.class })
     private String qq;
 
     /**
      * 微信
      */
-    @NotBlank(message = "微信不能为空", groups = { AddGroup.class, EditGroup.class })
     private String wechat;
 
     /**
      * 邮箱
      */
-    @NotBlank(message = "邮箱不能为空", groups = { AddGroup.class, EditGroup.class })
     private String email;
 
     /**
      * 地区编号
      */
-    @NotNull(message = "地区编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long areaId;
 
     /**
      * 详细地址
      */
-    @NotBlank(message = "详细地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String detailAddress;
 
     /**
      * 所属行业
      */
-    @NotNull(message = "所属行业不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long industryId;
 
     /**
      * 客户等级
      */
-    @NotNull(message = "客户等级不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long level;
 
     /**
      * 客户来源
      */
-    @NotNull(message = "客户来源不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long source;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaCustomerBo.java

@@ -26,121 +26,101 @@ public class OaCustomerBo extends BaseEntity {
     /**
      * 编号，主键自增
      */
-    @NotNull(message = "编号，主键自增不能为空", groups = { EditGroup.class })
     private Long customerId;
 
     /**
      * 客户名称
      */
-    @NotBlank(message = "客户名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 跟进状态
      */
-    @NotNull(message = "跟进状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer followUpStatus;
 
     /**
      * 最后跟进时间
      */
-    @NotNull(message = "最后跟进时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date contactLastTime;
 
     /**
      * 最后跟进内容
      */
-    @NotBlank(message = "最后跟进内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String contactLastContent;
 
     /**
      * 下次联系时间
      */
-    @NotNull(message = "下次联系时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date contactNextTime;
 
     /**
      * 负责人的用户编号
      */
-    @NotNull(message = "负责人的用户编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long ownerUserId;
 
     /**
      * 成为负责人的时间
      */
-    @NotNull(message = "成为负责人的时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ownerTime;
 
     /**
      * 成交状态
      */
-    @NotNull(message = "成交状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long dealStatus;
 
     /**
      * 手机
      */
-    @NotBlank(message = "手机不能为空", groups = { AddGroup.class, EditGroup.class })
     private String mobile;
 
     /**
      * 电话
      */
-    @NotBlank(message = "电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String telephone;
 
     /**
      * QQ
      */
-    @NotBlank(message = "QQ不能为空", groups = { AddGroup.class, EditGroup.class })
     private String qq;
 
     /**
      * 微信
      */
-    @NotBlank(message = "微信不能为空", groups = { AddGroup.class, EditGroup.class })
     private String wechat;
 
     /**
      * 邮箱
      */
-    @NotBlank(message = "邮箱不能为空", groups = { AddGroup.class, EditGroup.class })
     private String email;
 
     /**
      * 地区编号
      */
-    @NotNull(message = "地区编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long areaId;
 
     /**
      * 详细地址
      */
-    @NotBlank(message = "详细地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String detailAddress;
 
     /**
      * 所属行业
      */
-    @NotNull(message = "所属行业不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long industryId;
 
     /**
      * 客户等级
      */
-    @NotNull(message = "客户等级不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long level;
 
     /**
      * 客户来源
      */
-    @NotNull(message = "客户来源不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long source;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFollowUpRecordBo.java

@@ -26,55 +26,48 @@ public class OaFollowUpRecordBo extends BaseEntity {
     /**
      * 编号
      */
-    @NotNull(message = "编号不能为空", groups = { EditGroup.class })
     private Long followId;
 
     /**
      * 跟进类型
      */
-    @NotNull(message = "跟进类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long type;
 
     /**
      * 跟进内容
      */
-    @NotBlank(message = "跟进内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String content;
 
     /**
      * 下次联系时间
      */
-    @NotNull(message = "下次联系时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date nextTime;
 
     /**
      * 图片
      */
-    @NotBlank(message = "图片不能为空", groups = { AddGroup.class, EditGroup.class })
     private String picUrls;
 
     /**
      * 附件
      */
-    @NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
+
     private String fileUrls;
 
     /**
      * 关联的商机编号数组
      */
-    @NotBlank(message = "关联的商机编号数组不能为空", groups = { AddGroup.class, EditGroup.class })
+
     private String businessIds;
 
     /**
      * 暂用此代替商机记录
      */
-    @NotNull(message = "暂用此代替商机记录不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long businessId;
 
     /**
      * 关联的联系人编号数组
      */
-    @NotBlank(message = "关联的联系人编号数组不能为空", groups = { AddGroup.class, EditGroup.class })
     private String contactIds;
 
 

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProductBo.java

@@ -25,7 +25,6 @@ public class OaProductBo extends BaseEntity {
     /**
      * 产品编号
      */
-    @NotNull(message = "产品编号不能为空", groups = { EditGroup.class })
     private Long productId;
 
     /**
@@ -43,44 +42,38 @@ public class OaProductBo extends BaseEntity {
     /**
      * 单位
      */
-    @NotNull(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long unit;
 
     /**
      * 价格，单位：元
      */
-    @NotNull(message = "价格，单位：元不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal price;
 
     /**
      * 状态
      */
-    @NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long status;
 
     /**
      * 产品分类编号
      */
-    @NotNull(message = "产品分类编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long categoryId;
 
     /**
      * 产品描述
      */
-    @NotBlank(message = "产品描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
     /**
      * 负责人的用户编号
      */
-    @NotNull(message = "负责人的用户编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long ownerUserId;
 
     /**
      * 是否删除
      */
-    @NotNull(message = "是否删除不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long deleted;
+
+    private Long delFlag;
 
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaClueVo.java

@@ -143,5 +143,6 @@ public class OaClueVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private String nickName;
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaCustomerVo.java

@@ -144,4 +144,11 @@ public class OaCustomerVo {
     private String remark;
 
 
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String nickName;
+
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProductVo.java

@@ -73,14 +73,7 @@ public class OaProductVo {
     /**
      * 负责人的用户编号
      */
-    @ExcelProperty(value = "负责人的用户编号")
     private Long ownerUserId;
 
-    /**
-     * 是否删除
-     */
-    @ExcelProperty(value = "是否删除")
-    private Long deleted;
-
 
 }