活动管理和活动申请单都添加字段活动营销页

活动的新增，修改，编辑功能都增加活动营销页的修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseActive.java

@@ -66,6 +66,9 @@ public class BaseActive {
 	@ApiModelProperty(value = "子品牌code")
     private String subBrandCode;
 
+    @ApiModelProperty(value = "活动tab页 1-统一URL ")
+    private Integer urlTab;
+
 	@ApiModelProperty(value = "活动域名")
     private String activeUrl;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseActiveModifyApply.java

@@ -68,6 +68,9 @@ public class BaseActiveModifyApply {
 	@Schema(name = "子品牌code")
     private String subBrandCode;
 
+    @Schema(name = "活动tab页 1-统一URL")
+    private Integer urlTab;
+
 	@Schema(name = "活动域名")
     private String activeUrl;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/ListActiveVO.java

@@ -43,6 +43,9 @@ public class ListActiveVO implements Serializable {
     @ApiModelProperty(value = "活动结束日期")
     private LocalDateTime endTime;
 
+    @ApiModelProperty(value = "活动tab页 1-统一URL ")
+    private Integer urlTab;
+
     @ApiModelProperty(value = "活动域名")
     private String activeUrl;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/AddActiveReq.java

@@ -45,6 +45,9 @@ public class AddActiveReq implements Serializable {
     @ApiModelProperty(value = "所属品牌")
     private List<String> brandCodeList;
 
+    @ApiModelProperty(value = "活动tab页 1-统一URL ")
+    private Integer urlTab;
+
     @NotEmpty(message = "活动域名为空")
     @ApiModelProperty(value = "活动域名")
     private String activeUrl;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ResubmitActiveReq.java

@@ -39,6 +39,9 @@ public class ResubmitActiveReq implements Serializable {
     @ApiModelProperty(value = "品牌code")
     private List<String> brandCodeList;
 
+    @ApiModelProperty(value = "活动tab页 1-统一URL ")
+    private Integer urlTab;
+
     @ApiModelProperty(value = "活动域名")
     private String activeUrl;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdateActiveReq.java

@@ -38,6 +38,9 @@ public class UpdateActiveReq implements Serializable {
     @ApiModelProperty(value = "品牌code")
     private List<String> brandCodeList;
 
+    @ApiModelProperty(value = "活动tab页 1-统一URL ")
+    private Integer urlTab;
+
     @ApiModelProperty(value = "活动域名")
     private String activeUrl;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetActiveModifyApplyRes.java

@@ -64,6 +64,9 @@ public class GetActiveModifyApplyRes implements Serializable {
 
         @ApiModelProperty(value = "活动域名")
         private String activeUrl;
+
+        @ApiModelProperty(value = "活动tab页 1-统一URL ")
+        private Integer urlTab;
     }
 
     @Data
@@ -103,5 +106,8 @@ public class GetActiveModifyApplyRes implements Serializable {
 
         @ApiModelProperty(value = "活动域名")
         private String activeUrl;
+
+        @ApiModelProperty(value = "活动tab页 1-统一URL ")
+        private Integer urlTab;
     }
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetActiveRes.java

@@ -43,6 +43,9 @@ public class GetActiveRes implements Serializable {
     @ApiModelProperty(value = "品牌名称")
     private List<String> brandNameList;
 
+    @ApiModelProperty(value = "活动tab页 1-统一URL ")
+    private Integer urlTab;
+
     @ApiModelProperty(value = "活动域名")
     private String activeUrl;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListActiveRes.java

@@ -64,6 +64,9 @@ public class ListActiveRes extends PageResp implements Serializable {
         @JsonFormat(pattern = "yyyy-MM-dd")
         private LocalDateTime endTime;
 
+        @ApiModelProperty(value = "活动tab页 1-统一URL ")
+        private Integer urlTab;
+
         @ApiModelProperty(value = "活动域名")
         private String activeUrl;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/ActiveServiceImpl.java

@@ -90,6 +90,7 @@ public class ActiveServiceImpl implements ActiveService {
         active.setBeginTime(req.getBeginTime());
         active.setEndTime(req.getEndTime());
         active.setBrandCode(CollectionUtil.isNotEmpty(req.getBrandCodeList()) ? String.join(",", req.getBrandCodeList()) : null);
+        active.setUrlTab(req.getUrlTab());
         active.setActiveUrl(req.getActiveUrl());
         active.setCreateBy(userId);
         active.setUpdateBy(userId);
@@ -131,6 +132,7 @@ public class ActiveServiceImpl implements ActiveService {
         active.setBeginTime(req.getBeginTime());
         active.setEndTime(req.getEndTime());
         active.setBrandCode(CollectionUtil.isNotEmpty(req.getBrandCodeList()) ? String.join(",", req.getBrandCodeList()) : null);
+        active.setUrlTab(req.getUrlTab());
         active.setActiveUrl(req.getActiveUrl());
         active.setUpdateBy(userId);
         baseActiveMapper.updateById(active);
@@ -174,6 +176,7 @@ public class ActiveServiceImpl implements ActiveService {
         baseActiveModifyApply.setBeginTime(req.getBeginTime());
         baseActiveModifyApply.setEndTime(req.getEndTime());
         baseActiveModifyApply.setBrandCode(CollectionUtil.isNotEmpty(req.getBrandCodeList()) ? String.join(",", req.getBrandCodeList()) : null);
+        baseActiveModifyApply.setUrlTab(req.getUrlTab());
         baseActiveModifyApply.setActiveUrl(req.getActiveUrl());
         baseActiveModifyApply.setUpdateBy(userId);
         baseActiveModifyApply.setCreateBy(userId);
@@ -435,6 +438,7 @@ public class ActiveServiceImpl implements ActiveService {
         active.setBeginTime(activeModifyApply.getBeginTime());
         active.setEndTime(activeModifyApply.getEndTime());
         active.setBrandCode(activeModifyApply.getBrandCode());
+        active.setUrlTab(activeModifyApply.getUrlTab());
         active.setActiveUrl(activeModifyApply.getActiveUrl());
         active.setAuditUserId(userId);
         active.setAuditUserName(userUtil.getUser().getUserName());

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseActiveMapper.xml

@@ -18,6 +18,7 @@
         <result column="end_time" property="endTime" />
         <result column="brand_code" property="brandCode" />
         <result column="sub_brand_code" property="subBrandCode" />
+        <result column="url_tab" property="urlTab" />
         <result column="active_url" property="activeUrl" />
         <result column="create_time" property="createTime" />
         <result column="create_by" property="createBy" />
@@ -30,7 +31,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, active_code, active_name, active_type, audit_status, apply_time, apply_user_id, apply_user_name, audit_user_id, audit_user_name, begin_time, end_time, brand_code, sub_brand_code, active_url, create_time, create_by, update_time, update_by, is_delete, valid, is_modify_apply
+        id, active_code, active_name, active_type, audit_status, apply_time, apply_user_id, apply_user_name, audit_user_id, audit_user_name, begin_time, end_time, brand_code, sub_brand_code, url_tab, active_url, create_time, create_by, update_time, update_by, is_delete, valid, is_modify_apply
     </sql>
 
     <select id="listActivePage" resultType="com.abi.qms.platform.dao.vo.result.ListActiveVO">

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseActiveModifyApplyMapper.xml

@@ -19,6 +19,7 @@
         <result column="END_TIME" property="endTime" />
         <result column="BRAND_CODE" property="brandCode" />
         <result column="SUB_BRAND_CODE" property="subBrandCode" />
+        <result column="url_tab" property="urlTab" />
         <result column="ACTIVE_URL" property="activeUrl" />
         <result column="CREATE_TIME" property="createTime" />
         <result column="CREATE_BY" property="createBy" />
@@ -29,7 +30,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, active_id, active_code, active_name, active_type, audit_status, apply_time, apply_user_id, apply_user_name, audit_user_id, audit_user_name, begin_time, end_time, brand_code, sub_brand_code, active_url, create_time, create_by, update_time, update_by, is_delete
+        id, active_id, active_code, active_name, active_type, audit_status, apply_time, apply_user_id, apply_user_name, audit_user_id, audit_user_name, begin_time, end_time, brand_code, sub_brand_code, url_tab, active_url, create_time, create_by, update_time, update_by, is_delete
     </sql>
 
 </mapper>