市场活动

src/main/java/com/dk/mdm/controller/mst/ActivityController.java

@@ -52,6 +52,17 @@ public class ActivityController{
     }
 
     /**
+     * @desc   : 编辑
+     * @author : 常皓宁
+     * @date   : 2024/4/15 15:02
+     */
+    @ApiOperation( value = "新建", notes = "新建" )
+    @PostMapping({"update"})
+    public ResponseResultVO<?> update(@RequestBody ActivityVO activityVO) {
+        return activityService.update(activityVO);
+    }
+
+    /**
      * @desc   : 通过ID查询
      * @author : 常皓宁
      * @date   : 2024/4/15 16:32

src/main/java/com/dk/mdm/mapper/mst/ActivityMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        activity_id, activity_name, activity_describe, activity_type, activity_status, begin_date, end_date, flg_banner, activity_path, activity_url, grade_code, fun_id, app_code, cp_ids, display_no, flg_valid, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        activity_id, activity_name, activity_describe, activity_type, activity_status, begin_date, end_date, flg_banner, annex_paths, activity_url, grade_code, fun_id, app_code, cp_ids, display_no, flg_valid, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -18,7 +18,7 @@
             <result column="begin_date" property="beginDate" typeHandler="TimestampTypeHandler"/>
             <result column="end_date" property="endDate" typeHandler="TimestampTypeHandler"/>
                 <result column="flg_banner" property="flgBanner"/>
-                <result column="activity_path" property="activityPath"/>
+                <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
                 <result column="activity_url" property="activityUrl"/>
                 <result column="grade_code" property="gradeCode"/>
                 <result column="fun_id" property="funId" typeHandler="UuidTypeHandler"/>
@@ -59,8 +59,8 @@
             <if test="flgBanner != null">
                 AND flg_banner = #{flgBanner}
             </if>
-            <if test="activityPath != null and activityPath != ''">
-                AND activity_path = #{activityPath}
+            <if test="annexPaths != null and annexPaths != ''">
+                AND annex_paths = #{annexPaths}
             </if>
             <if test="activityUrl != null and activityUrl != ''">
                 AND activity_url = #{activityUrl}
@@ -117,7 +117,7 @@
         tma.begin_date,
         tma.end_date,
         tma.flg_banner,
-        tma.activity_path,
+        tma.annex_paths,
         tma.activity_url,
         tma.grade_code,
         tma.fun_id,
@@ -144,7 +144,7 @@
         <result column="begin_date" property="beginDate" typeHandler="TimestampTypeHandler"/>
         <result column="end_date" property="endDate" typeHandler="TimestampTypeHandler"/>
         <result column="flg_banner" property="flgBanner"/>
-        <result column="activity_path" property="activityPath"/>
+        <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
         <result column="activity_url" property="activityUrl"/>
         <result column="grade_code" property="gradeCode"/>
         <result column="fun_id" property="funId" typeHandler="UuidTypeHandler"/>
@@ -186,8 +186,8 @@
             <if test="flgBanner != null">
                 AND tma.flg_banner = #{flgBanner}
             </if>
-            <if test="activityPath != null and activityPath != ''">
-                AND tma.activity_path = #{activityPath}
+            <if test="annexPaths != null and annexPaths != ''">
+                AND tma.annex_paths = #{annexPaths}
             </if>
             <if test="activityUrl != null and activityUrl != ''">
                 AND tma.activity_url = #{activityUrl}
@@ -305,7 +305,7 @@
             begin_date,
             end_date,
             flg_banner,
-            activity_path,
+            annex_paths,
             activity_url,
             grade_code,
             fun_id,
@@ -326,7 +326,7 @@
                 #{item.beginDate},
                 #{item.endDate},
                 #{item.flgBanner},
-                #{item.activityPath},
+                #{item.annexPaths},
                 #{item.activityUrl},
                 #{item.gradeCode},
                 #{item.funId}::uuid,

src/main/java/com/dk/mdm/model/pojo/mst/Activity.java

@@ -1,6 +1,7 @@
 package com.dk.mdm.model.pojo.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 
@@ -112,7 +113,8 @@ public class Activity extends PageInfo<Activity> implements Serializable {
      */
     @Excel(name = "图片路径")
     @ApiModelProperty(value = "图片路径")
-    private String activityPath;
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray annexPaths;
 
 
     /**

src/main/java/com/dk/mdm/model/query/mst/ActivityQuery.java

@@ -1,6 +1,7 @@
 package com.dk.mdm.model.query.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 
@@ -111,7 +112,8 @@ public class ActivityQuery extends PageInfo<ActivityQuery> implements Serializab
      */
     @Excel(name = "图片路径")
     @ApiModelProperty(value = "图片路径")
-    private String activityPath;
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray annexPaths;
 
 
     /**

src/main/java/com/dk/mdm/model/response/mst/ActivityResponse.java

@@ -1,6 +1,7 @@
 package com.dk.mdm.model.response.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 
@@ -112,7 +113,8 @@ public class ActivityResponse extends PageInfo<ActivityResponse> implements Seri
      */
     @Excel(name = "图片路径")
     @ApiModelProperty(value = "图片路径")
-    private String activityPath;
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray annexPaths;
 
 
     /**

src/main/java/com/dk/mdm/model/vo/mst/ActivityVO.java

@@ -1,6 +1,7 @@
 package com.dk.mdm.model.vo.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
 
@@ -113,7 +114,8 @@ public class ActivityVO extends PageInfo<ActivityVO> implements Serializable {
      */
     @Excel(name = "图片路径")
     @ApiModelProperty(value = "图片路径")
-    private String activityPath;
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray annexPaths;
 
 
     /**

src/main/java/com/dk/mdm/service/mst/ActivityService.java

@@ -49,7 +49,7 @@ public class ActivityService extends BaseService<Activity> {
 	 */
 	@Override
 	public String getPrimaryKey() {
-		return "activityId";
+		return "activity_id";
 	}
 
 	/**
@@ -82,6 +82,20 @@ public class ActivityService extends BaseService<Activity> {
 	}
 
 	/**
+	 * @desc   : 保存方法
+	 * @author : 常皓宁
+	 * @date   : 2024/4/15 15:03
+	 */
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<?> update(ActivityVO activityVO) {
+		// 转化实体
+		Activity activity = activityConvert.convertToPo(activityVO);
+		return super.updateByUuid(activity);
+	}
+
+	/**
 	 * @desc   : 发布
 	 * @author : 常皓宁
 	 * @date   : 2024/4/15 14:53