市场活动-产品

crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingApi.java

@@ -70,10 +70,8 @@ public class ViewMeetingApi extends BaseController {
     @Log(title = "App市场活动", businessType = BusinessType.INSERT, operatorType = OperatorType.MOBILE)
     public Map<String, Object> add(
             @ApiParam(required = false, value = "活动形式编号(数据字典)") @RequestParam(required = false) String typeId,
-            // @ApiParam(required = false, value = "活动形式名称") @RequestParam(required = false) String typeName,
             @ApiParam(required = false, value = "活动内容") @RequestParam(required = false) String activityContent,
             @ApiParam(required = false, value = "活动日期") @RequestParam(required = false) String activityDate,
-            // @ApiParam(required = false, value = "业务员id(传用户的档案id)") @RequestParam(required = true) String staffId,
             @ApiParam(required = false, value = "客户id") @RequestParam(required = true) String dealersId,
             @ApiParam(required = false, value = "客户名称") @RequestParam(required = false) String distributorName,
             @ApiParam(required = false, value = "传客户的行政区域编码") @RequestParam(required = false) String region,
@@ -85,8 +83,6 @@ public class ViewMeetingApi extends BaseController {
             @ApiParam(required = false, value = "活动照片") @RequestParam(required = false) String activityImg,
             @ApiParam(required = false, value = "活动视频") @RequestParam(required = false) String videos,
             @ApiParam(required = false, value = "备注") @RequestParam(required = false) String remark,
-            @ApiParam(required = false, value = "是否同步提交审核(1.提交，反之不传)") @RequestParam(required = false) String auditType,
-            @ApiParam(required = false, value = "菜单编码(提交审核使用)") @RequestParam(required = false) String menuCode,
             HttpServletRequest request) {
         Map<String, Object> result = new HashMap<>();
         Map params = new HashMap();
@@ -135,8 +131,6 @@ public class ViewMeetingApi extends BaseController {
             @ApiParam(required = false, value = "活动照片") @RequestParam(required = false) String activityImg,
             @ApiParam(required = false, value = "活动视频") @RequestParam(required = false) String videos,
             @ApiParam(required = false, value = "备注") @RequestParam(required = false) String remark,
-            @ApiParam(required = false, value = "是否同步提交审核(1.提交，反之不传)") @RequestParam(required = false) String auditType,
-            @ApiParam(required = false, value = "菜单编码(提交审核使用)") @RequestParam(required = false) String menuCode,
             HttpServletRequest request) {
         Map<String, Object> result = new HashMap<>();
         String token = request.getHeader("token");

crm-webapp/src/main/java/com/yb/lb/webapp/view/view/entity/ViewMeeting.java

@@ -1,6 +1,7 @@
 package com.yb.lb.webapp.view.view.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -18,115 +19,149 @@ public class ViewMeeting implements Serializable {
     /**
      * 主键Id(市场活动)
      */
+    @ApiModelProperty(value = "主键id")
     private String id;
 
     /** 活动形式id */
+    @ApiModelProperty(value = "活动形式编号(数据字典)")
     private String typeId;
 
     /** 活动形式code */
+    @ApiModelProperty(hidden = true)
     private String typeCode;
 
     /** 活动形式名称 */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "活动形式", width = 15, orderNum = "0")
     private String typeName;
 
     /** 活动内容 */
+    @ApiModelProperty(value = "活动内容")
     @Excel(name = "活动内容", width = 20, orderNum = "2")
     private String activityContent;
 
     /** 活动日期 */
+    @ApiModelProperty(value = "活动日期")
     @Excel(name = "活动日期", width = 20, orderNum = "1")
     private String activityDate;
 
     /** 营销区域名称 */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "营销区域", width = 20, orderNum = "3")
     private String areaName;
 
     /** 营销区域id */
+    @ApiModelProperty(value = "营销区域id")
     private String semId;
 
     /** 营销区域祖籍列表 */
+    @ApiModelProperty(hidden = true)
     private String ancestors;
 
     /** 业务员id */
+    @ApiModelProperty(hidden = true)
     private String staffId;
 
     /** 业务员名称 */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "人员名称", width = 15, orderNum = "6")
     private String staffName;
 
     /** 经销商名称 */
+    @ApiModelProperty(value = "客户名称")
     @Excel(name = "客户", width = 20, orderNum = "4")
     private String distributorName;
 
     /** 经销商id */
+    @ApiModelProperty(value = "客户id")
     private String dealersId;
 
     /** 客户类型(数据字典) */
+    @ApiModelProperty(value = "客户类型(数据字典)")
     private String clientType;
 
     /** 客户类型名称 */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "客户类型", width = 15, orderNum = "5")
     private String clientTypeName;
 
     /** 行政区域编码 */
+    @ApiModelProperty(value = "传客户的行政区域编码")
     private String region;
 
     /** 公司组织id */
+    @ApiModelProperty(value = "公司组织id")
     private String companyId;
 
     /** 创建人id */
+    @ApiModelProperty(hidden = true)
     private String createUser;
 
     /** 人员规模 */
+    @ApiModelProperty(value = "人员规模")
     @Excel(name = "人员规模", width = 15, orderNum = "7")
     private String staffSize;
 
-    /** 地点 */
+    /** 活动地址 */
+    @ApiModelProperty(value = "活动地址")
     @Excel(name = "活动地址", width = 25, orderNum = "9")
     private String site;
 
     /** 经度 */
+    @ApiModelProperty(value = "经度")
     private String longitude;
 
     /** 纬度 */
+    @ApiModelProperty(value = "纬度")
     private String latitude;
 
     /** 活动图片地址 */
+    @ApiModelProperty(value = "活动图片地址")
     private String activityImg;
 
     /** 活动视频 */
+    @ApiModelProperty(value = "活动视频")
     private String videos;
 
     /** 创建时间 */
+    @ApiModelProperty(hidden = true)
     @Excel(name = "创建时间", width = 25, orderNum = "8")
     private String createTime;
 
     /** 单据编号 */
+    @ApiModelProperty(hidden = true)
     private String viewNo;
 
     /** 备注 */
+    @ApiModelProperty(value = "备注")
     @Excel(name = "备注", width = 20, orderNum = "10")
     private String remark;
 
     /** 状态:0待审核1审核通过2审核未通过3.审核中4.自由态 */
+    @ApiModelProperty(hidden = true)
     private String status;
 
     /** 审批人 */
+    @ApiModelProperty(hidden = true)
     private String auditor;
 
     /** 审批时间 */
+    @ApiModelProperty(hidden = true)
     private String auditTime;
 
     /** 审批意见（内容） */
+    @ApiModelProperty(hidden = true)
     private String auditContent;
 
     /** 工作流程id */
+    @ApiModelProperty(hidden = true)
     private String processInstanceId;
 
     /** 菜单编码(用于审核获取) */
+    @ApiModelProperty(hidden = true)
     private String menuCode;
 
     /** 营销区域编码 */
+    @ApiModelProperty(hidden = true)
     private String areaCode;
 }

crm-webapp/src/main/java/com/yb/lb/webapp/view/view/entity/ViewMeetingDTO.java

@@ -0,0 +1,27 @@
+package com.yb.lb.webapp.view.view.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 市场活动DTO
+ *
+ * @author mzr
+ * @date 2024/11/13
+ */
+@Data
+public class ViewMeetingDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "市场活动信息")
+    private ViewMeeting viewMeeting;
+
+    /** 市场活动-产品信息 */
+    @ApiModelProperty(value = "市场活动-产品信息")
+    private List<CrmMarketingDetail> details;
+
+}