活动修改申请单表结构提交

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

@@ -85,4 +85,7 @@ public class BaseActive {
     @ApiModelProperty(value = "是否有效")
     private Integer valid;
 
+    @ApiModelProperty(value = "有修改活动申请单 1-是 0-不是")
+    private Integer isModifyApply;
+
 }

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

@@ -0,0 +1,89 @@
+package com.abi.qms.platform.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 活动编辑申请表
+ * </p>
+ *
+ * @author Andy.Tan
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(name="活动编辑申请表对象", description="活动编辑申请表")
+public class BaseActiveModifyApply {
+
+	@Schema(name = "id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+	@Schema(name = "base_active活动表的id")
+    private Long activeId;
+
+	@Schema(name = "活动code（即页面上的手输的活动id）")
+    private String activeCode;
+
+	@Schema(name = "活动名称")
+    private String activeName;
+
+	@Schema(name = "活动类型 1-utc 2-bof 3-品质信息")
+    private Integer activeType;
+
+	@Schema(name = "活动审核状态 1-待审核 2-通过 9-驳回 ")
+    private Integer auditStatus;
+
+	@Schema(name = "申请时间")
+    private LocalDateTime applyTime;
+
+	@Schema(name = "申请人id")
+    private Long applyUserId;
+
+	@Schema(name = "申请人姓名")
+    private String applyUserName;
+
+	@Schema(name = "审核人id")
+    private Long auditUserId;
+
+	@Schema(name = "审核人姓名")
+    private String auditUserName;
+
+	@Schema(name = "活动开始日期")
+    private LocalDateTime beginTime;
+
+	@Schema(name = "活动结束日期")
+    private LocalDateTime endTime;
+
+	@Schema(name = "品牌code")
+    private String brandCode;
+
+	@Schema(name = "子品牌code")
+    private String subBrandCode;
+
+	@Schema(name = "活动域名")
+    private String activeUrl;
+
+	@Schema(name = "创建时间")
+    private LocalDateTime createTime;
+
+	@Schema(name = "创建人id")
+    private Long createBy;
+
+	@Schema(name = "修改时间")
+    private LocalDateTime updateTime;
+
+	@Schema(name = "修改人id")
+    private Long updateBy;
+
+	@Schema(name = "是否删除")
+    private Integer isDelete;
+
+
+
+}

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

@@ -0,0 +1,56 @@
+package com.abi.qms.platform.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 活动编辑申请码包关联子表
+ * </p>
+ *
+ * @author Andy.Tan
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(name="活动编辑申请码包关联子表对象", description="活动编辑申请码包关联子表")
+public class BaseActiveModifyApplyQrPackageMapping {
+
+	@Schema(name = "id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+	@Schema(name = "修改申请表id(base_active_modify_apply表的主键id)")
+    private Long applyId;
+
+	@Schema(name = "活动id(base_active表的主键id)")
+    private Long activeId;
+
+	@Schema(name = "码包id")
+    private Long qrPackageId;
+
+	@Schema(name = "修改类型: 1-新增 2-删除 ")
+    private Integer modifyType;
+
+	@Schema(name = "创建时间")
+    private LocalDateTime createTime;
+
+	@Schema(name = "创建人id")
+    private Long createBy;
+
+	@Schema(name = "修改时间")
+    private LocalDateTime updateTime;
+
+	@Schema(name = "修改人id")
+    private Long updateBy;
+
+	@Schema(name = "是否删除")
+    private Integer isDelete;
+
+
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/BaseActiveModifyApplyMapper.java

@@ -0,0 +1,15 @@
+package com.abi.qms.platform.dao.mapper;
+
+import com.abi.qms.platform.dao.entity.BaseActiveModifyApply;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 活动编辑申请表 Mapper 接口
+ * </p>
+ *
+ * @author Andy.Tan
+ */
+public interface BaseActiveModifyApplyMapper extends BaseMapper<BaseActiveModifyApply> {
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/BaseActiveModifyApplyQrPackageMappingMapper.java

@@ -0,0 +1,15 @@
+package com.abi.qms.platform.dao.mapper;
+
+import com.abi.qms.platform.dao.entity.BaseActiveModifyApplyQrPackageMapping;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 活动编辑申请码包关联子表 Mapper 接口
+ * </p>
+ *
+ * @author Andy.Tan
+ */
+public interface BaseActiveModifyApplyQrPackageMappingMapper extends BaseMapper<BaseActiveModifyApplyQrPackageMapping> {
+
+}

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

@@ -25,11 +25,12 @@
         <result column="update_by" property="updateBy" />
         <result column="is_delete" property="isDelete" />
         <result column="valid" property="valid" />
+        <result column="is_modify_apply" property="isModifyApply" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <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
+        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
     </sql>
 
     <select id="listActivePage" resultMap="BaseResultMap">

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

@@ -0,0 +1,35 @@
+<?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.abi.qms.platform.dao.mapper.BaseActiveModifyApplyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseActiveModifyApply">
+        <id column="ID" property="id" />
+        <result column="ACTIVE_ID" property="activeId" />
+        <result column="ACTIVE_CODE" property="activeCode" />
+        <result column="ACTIVE_NAME" property="activeName" />
+        <result column="ACTIVE_TYPE" property="activeType" />
+        <result column="AUDIT_STATUS" property="auditStatus" />
+        <result column="APPLY_TIME" property="applyTime" />
+        <result column="APPLY_USER_ID" property="applyUserId" />
+        <result column="APPLY_USER_NAME" property="applyUserName" />
+        <result column="AUDIT_USER_ID" property="auditUserId" />
+        <result column="AUDIT_USER_NAME" property="auditUserName" />
+        <result column="BEGIN_TIME" property="beginTime" />
+        <result column="END_TIME" property="endTime" />
+        <result column="BRAND_CODE" property="brandCode" />
+        <result column="SUB_BRAND_CODE" property="subBrandCode" />
+        <result column="ACTIVE_URL" property="activeUrl" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="CREATE_BY" property="createBy" />
+        <result column="UPDATE_TIME" property="updateTime" />
+        <result column="UPDATE_BY" property="updateBy" />
+        <result column="IS_DELETE" property="isDelete" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <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
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,24 @@
+<?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.abi.qms.platform.dao.mapper.BaseActiveModifyApplyQrPackageMappingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.BaseActiveModifyApplyQrPackageMapping">
+        <id column="ID" property="id" />
+        <result column="APPLY_ID" property="applyId" />
+        <result column="ACTIVE_ID" property="activeId" />
+        <result column="QR_PACKAGE_ID" property="qrPackageId" />
+        <result column="MODIFY_TYPE" property="modifyType" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="CREATE_BY" property="createBy" />
+        <result column="UPDATE_TIME" property="updateTime" />
+        <result column="UPDATE_BY" property="updateBy" />
+        <result column="IS_DELETE" property="isDelete" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, apply_id, active_id, qr_package_id, modify_type, create_time, create_by, update_time, update_by, is_delete
+    </sql>
+
+</mapper>