1、联调

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 @Api(tags="han_hai_member")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 @Data
@@ -159,7 +159,8 @@ public class HanHaiMember implements Serializable {
     @ApiModelProperty(value = "shareId")
     private java.lang.String shareId;
 	/**邀请人*/
-	@Excel(name = "邀请人", width = 15)
+	@Excel(name = "邀请人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "邀请人")
     private java.lang.String vid;
 	/**邀请时间*/
@@ -200,4 +201,8 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "是否分销商", width = 15)
     @ApiModelProperty(value = "是否分销商")
     private java.lang.String isDai;
+	/**总佣金*/
+	@Excel(name = "总佣金", width = 15)
+    @ApiModelProperty(value = "总佣金")
+    private java.math.BigDecimal commission;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 public interface IHanHaiMemberService extends IService<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import HanHaiMemberModal from './modules/HanHaiMemberModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'HanHaiMemberList',
@@ -140,7 +141,7 @@
           {
             title:'邀请人',
             align:"center",
-            dataIndex: 'vid'
+            dataIndex: 'vid_dictText'
           },
           {
             title:'邀请时间',
@@ -155,6 +156,11 @@
             align:"center",
             dataIndex: 'price'
           },
+          {
+            title:'总佣金',
+            align:"center",
+            dataIndex: 'commission'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -192,9 +198,10 @@
         fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''})
         fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
-        fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:''})
+        fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:"han_hai_member,nick_name,id"})
         fieldList.push({type:'date',value:'vtime',text:'邀请时间'})
         fieldList.push({type:'BigDecimal',value:'price',text:'余额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'commission',text:'总佣金',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -20,7 +20,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="邀请人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="vid">
-              <a-input v-model="model.vid" placeholder="请输入邀请人"  ></a-input>
+              <j-dict-select-tag type="list" v-model="model.vid" dictCode="han_hai_member,nick_name,id" placeholder="请选择邀请人" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -33,6 +33,11 @@
               <a-input-number v-model="model.price" placeholder="请输入余额" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="总佣金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="commission">
+              <a-input-number v-model="model.commission" placeholder="请输入总佣金" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts

@@ -23,7 +23,7 @@ export const columns: BasicColumn[] = [
    {
     title: '邀请人',
     align:"center",
-    dataIndex: 'vid'
+    dataIndex: 'vid_dictText'
    },
    {
     title: '邀请时间',
@@ -38,6 +38,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'price'
    },
+   {
+    title: '总佣金',
+    align:"center",
+    dataIndex: 'commission'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -70,7 +75,10 @@ export const formSchema: FormSchema[] = [
   {
     label: '邀请人',
     field: 'vid',
-    component: 'Input',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"han_hai_member,nick_name,id"
+     },
   },
   {
     label: '邀请时间',
@@ -82,4 +90,9 @@ export const formSchema: FormSchema[] = [
     field: 'price',
     component: 'InputNumber',
   },
+  {
+    label: '总佣金',
+    field: 'commission',
+    component: 'InputNumber',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourActivity/entity/StudytourActivity.java

@@ -146,9 +146,45 @@ public class StudytourActivity implements Serializable {
 	@ApiModelProperty(value = "活动团期")
 	List<StudytourActivityDate> dateList;
 
-	//活动活动评论
+
+	//是否被收藏
+	@TableField(exist = false)
+	@ApiModelProperty(value = "是否被收藏：0-否 1是")
+	String isCollection;
+
+	//价格下限
+	@TableField(exist = false)
+	@ApiModelProperty(value = "价格下限")
+	BigDecimal priceLow;
+
+	//价格上限
+	@TableField(exist = false)
+	@ApiModelProperty(value = "价格上限")
+	BigDecimal priceHigh;
+
+	//出发日期下限
 	@TableField(exist = false)
-	@ApiModelProperty(value = "活动评论")
-	List<StudytourComment> commentList;
+	@ApiModelProperty(value = "出发日期下限")
+	String dateLow;
+
+	//出发日期上限
+	@TableField(exist = false)
+	@ApiModelProperty(value = "出发日期上限")
+	String dateHigh;
+
+	//销量排序
+	@TableField(exist = false)
+	@ApiModelProperty(value = "销量排序：0-从高到低 1-从低到高")
+	String saleOrder;
+
+	//价格排序
+	@TableField(exist = false)
+	@ApiModelProperty(value = "价格排序：0-从高到低 1-从低到高")
+	String priceOrder;
+
+//	//活动活动评论
+//	@TableField(exist = false)
+//	@ApiModelProperty(value = "活动评论")
+//	List<StudytourComment> commentList;
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/controller/StudytourCommentController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Api(tags="订单评价表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/entity/StudytourComment.java

@@ -4,8 +4,6 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -24,7 +22,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Data
@@ -71,6 +69,10 @@ public class StudytourComment implements Serializable {
 	@Excel(name = "导师分数", width = 15)
     @ApiModelProperty(value = "导师分数")
     private java.lang.Integer teacherScore;
+	/**活动标题*/
+	@Excel(name = "活动标题", width = 15)
+    @ApiModelProperty(value = "活动标题")
+    private java.lang.String activityTitle;
 	/**关联订单id*/
 	@Excel(name = "关联订单id", width = 15, dictTable = "studytour_order", dicText = "id", dicCode = "id")
 	@Dict(dictTable = "studytour_order", dicText = "id", dicCode = "id")
@@ -82,7 +84,7 @@ public class StudytourComment implements Serializable {
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
 
-    //活动活动评论
+    //用户信息
     @TableField(exist = false)
     @ApiModelProperty(value = "用户信息")
     HanHaiMember user;

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/mapper/StudytourCommentMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 public interface StudytourCommentMapper extends BaseMapper<StudytourComment> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/IStudytourCommentService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 public interface IStudytourCommentService extends IService<StudytourComment> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/impl/StudytourCommentServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/StudytourCommentList.vue

@@ -148,6 +148,11 @@
             align:"center",
             dataIndex: 'teacherScore'
           },
+          {
+            title:'活动标题',
+            align:"center",
+            dataIndex: 'activityTitle'
+          },
           {
             title:'关联订单id',
             align:"center",
@@ -197,6 +202,7 @@
         fieldList.push({type:'int',value:'processScore',text:'行程分数',dictCode:''})
         fieldList.push({type:'int',value:'spotScore',text:'景点分数',dictCode:''})
         fieldList.push({type:'int',value:'teacherScore',text:'导师分数',dictCode:''})
+        fieldList.push({type:'Text',value:'activityTitle',text:'活动标题',dictCode:''})
         fieldList.push({type:'string',value:'orderId',text:'关联订单id',dictCode:"studytour_order,id,id"})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/modules/StudytourCommentForm.vue

@@ -28,6 +28,11 @@
               <a-input-number v-model="model.teacherScore" placeholder="请输入导师分数" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="活动标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="activityTitle">
+              <a-input v-model="model.activityTitle" placeholder="请输入活动标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联订单id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
               <j-dict-select-tag type="list" v-model="model.orderId" dictCode="studytour_order,id,id" placeholder="请选择关联订单id" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue3/StudytourComment.data.ts

@@ -30,6 +30,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'teacherScore'
    },
+   {
+    title: '活动标题',
+    align:"center",
+    dataIndex: 'activityTitle'
+   },
    {
     title: '关联订单id',
     align:"center",
@@ -73,6 +78,11 @@ export const formSchema: FormSchema[] = [
     field: 'teacherScore',
     component: 'InputNumber',
   },
+  {
+    label: '活动标题',
+    field: 'activityTitle',
+    component: 'Input',
+  },
   {
     label: '关联订单id',
     field: 'orderId',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/controller/StudytourCommentOptionController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.studytourCommentOption.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.studytourCommentOption.entity.StudytourCommentOption;
+import org.jeecg.modules.studytourCommentOption.service.IStudytourCommentOptionService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 评论选项表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+@Api(tags="评论选项表")
+@RestController
+@RequestMapping("/studytourCommentOption/studytourCommentOption")
+@Slf4j
+public class StudytourCommentOptionController extends JeecgController<StudytourCommentOption, IStudytourCommentOptionService> {
+	@Autowired
+	private IStudytourCommentOptionService studytourCommentOptionService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param studytourCommentOption
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "评论选项表-分页列表查询")
+	@ApiOperation(value="评论选项表-分页列表查询", notes="评论选项表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<StudytourCommentOption>> queryPageList(StudytourCommentOption studytourCommentOption,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<StudytourCommentOption> queryWrapper = QueryGenerator.initQueryWrapper(studytourCommentOption, req.getParameterMap());
+		Page<StudytourCommentOption> page = new Page<StudytourCommentOption>(pageNo, pageSize);
+		IPage<StudytourCommentOption> pageList = studytourCommentOptionService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param studytourCommentOption
+	 * @return
+	 */
+	@AutoLog(value = "评论选项表-添加")
+	@ApiOperation(value="评论选项表-添加", notes="评论选项表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody StudytourCommentOption studytourCommentOption) {
+		studytourCommentOptionService.save(studytourCommentOption);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param studytourCommentOption
+	 * @return
+	 */
+	@AutoLog(value = "评论选项表-编辑")
+	@ApiOperation(value="评论选项表-编辑", notes="评论选项表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody StudytourCommentOption studytourCommentOption) {
+		studytourCommentOptionService.updateById(studytourCommentOption);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "评论选项表-通过id删除")
+	@ApiOperation(value="评论选项表-通过id删除", notes="评论选项表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		studytourCommentOptionService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "评论选项表-批量删除")
+	@ApiOperation(value="评论选项表-批量删除", notes="评论选项表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.studytourCommentOptionService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "评论选项表-通过id查询")
+	@ApiOperation(value="评论选项表-通过id查询", notes="评论选项表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<StudytourCommentOption> queryById(@RequestParam(name="id",required=true) String id) {
+		StudytourCommentOption studytourCommentOption = studytourCommentOptionService.getById(id);
+		if(studytourCommentOption==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(studytourCommentOption);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param studytourCommentOption
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, StudytourCommentOption studytourCommentOption) {
+        return super.exportXls(request, studytourCommentOption, StudytourCommentOption.class, "评论选项表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, StudytourCommentOption.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/entity/StudytourCommentOption.java

@@ -0,0 +1,54 @@
+package org.jeecg.modules.studytourCommentOption.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 评论选项表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("studytour_comment_option")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="studytour_comment_option对象", description="评论选项表")
+public class StudytourCommentOption implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**评论选项内容*/
+	@Excel(name = "评论选项内容", width = 15)
+    @ApiModelProperty(value = "评论选项内容")
+    private java.lang.String title;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/mapper/StudytourCommentOptionMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.studytourCommentOption.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.studytourCommentOption.entity.StudytourCommentOption;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 评论选项表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+public interface StudytourCommentOptionMapper extends BaseMapper<StudytourCommentOption> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/mapper/xml/StudytourCommentOptionMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.studytourCommentOption.mapper.StudytourCommentOptionMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/service/IStudytourCommentOptionService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.studytourCommentOption.service;
+
+import org.jeecg.modules.studytourCommentOption.entity.StudytourCommentOption;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 评论选项表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+public interface IStudytourCommentOptionService extends IService<StudytourCommentOption> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/service/impl/StudytourCommentOptionServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.studytourCommentOption.service.impl;
+
+import org.jeecg.modules.studytourCommentOption.entity.StudytourCommentOption;
+import org.jeecg.modules.studytourCommentOption.mapper.StudytourCommentOptionMapper;
+import org.jeecg.modules.studytourCommentOption.service.IStudytourCommentOptionService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 评论选项表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+@Service
+public class StudytourCommentOptionServiceImpl extends ServiceImpl<StudytourCommentOptionMapper, StudytourCommentOption> implements IStudytourCommentOptionService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/StudytourCommentOptionList.vue

@@ -0,0 +1,171 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('评论选项表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <studytour-comment-option-modal ref="modalForm" @ok="modalFormOk"></studytour-comment-option-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import StudytourCommentOptionModal from './modules/StudytourCommentOptionModal'
+
+  export default {
+    name: 'StudytourCommentOptionList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      StudytourCommentOptionModal
+    },
+    data () {
+      return {
+        description: '评论选项表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'评论选项内容',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/studytourCommentOption/studytourCommentOption/list",
+          delete: "/studytourCommentOption/studytourCommentOption/delete",
+          deleteBatch: "/studytourCommentOption/studytourCommentOption/deleteBatch",
+          exportXlsUrl: "/studytourCommentOption/studytourCommentOption/exportXls",
+          importExcelUrl: "studytourCommentOption/studytourCommentOption/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'title',text:'评论选项内容',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionForm.vue

@@ -0,0 +1,104 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="评论选项内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入评论选项内容"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'StudytourCommentOptionForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/studytourCommentOption/studytourCommentOption/add",
+          edit: "/studytourCommentOption/studytourCommentOption/edit",
+          queryById: "/studytourCommentOption/studytourCommentOption/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <studytour-comment-option-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></studytour-comment-option-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import StudytourCommentOptionForm from './StudytourCommentOptionForm'
+
+  export default {
+    name: 'StudytourCommentOptionModal',
+    components: {
+      StudytourCommentOptionForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <studytour-comment-option-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></studytour-comment-option-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import StudytourCommentOptionForm from './StudytourCommentOptionForm'
+  export default {
+    name: 'StudytourCommentOptionModal',
+    components: {
+      StudytourCommentOptionForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/StudytourCommentOption.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/studytourCommentOption/studytourCommentOption/list',
+  save='/studytourCommentOption/studytourCommentOption/add',
+  edit='/studytourCommentOption/studytourCommentOption/edit',
+  deleteOne = '/studytourCommentOption/studytourCommentOption/delete',
+  deleteBatch = '/studytourCommentOption/studytourCommentOption/deleteBatch',
+  importExcel = '/studytourCommentOption/studytourCommentOption/importExcel',
+  exportXls = '/studytourCommentOption/studytourCommentOption/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/StudytourCommentOption.data.ts

@@ -0,0 +1,23 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '评论选项内容',
+    align:"center",
+    dataIndex: 'title'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '评论选项内容',
+    field: 'title',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/StudytourCommentOptionList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <StudytourCommentOptionModal @register="registerModal" @success="handleSuccess"></StudytourCommentOptionModal>
+  </div>
+</template>
+
+<script lang="ts" name="studytourCommentOption-studytourCommentOption" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import StudytourCommentOptionModal from './components/StudytourCommentOptionModal.vue'
+  import {columns, searchFormSchema} from './studytourCommentOption.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './studytourCommentOption.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '评论选项表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"评论选项表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/components/StudytourCommentOptionModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../studytourCommentOption.data';
+    import {saveOrUpdate} from '../studytourCommentOption.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/controller/StudytourCommissionLogController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.studytourCommissionLog.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.studytourCommissionLog.entity.StudytourCommissionLog;
+import org.jeecg.modules.studytourCommissionLog.service.IStudytourCommissionLogService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 佣金记录表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-19
+ * @Version: V1.0
+ */
+@Api(tags="佣金记录表")
+@RestController
+@RequestMapping("/studytourCommissionLog/studytourCommissionLog")
+@Slf4j
+public class StudytourCommissionLogController extends JeecgController<StudytourCommissionLog, IStudytourCommissionLogService> {
+	@Autowired
+	private IStudytourCommissionLogService studytourCommissionLogService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param studytourCommissionLog
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "佣金记录表-分页列表查询")
+	@ApiOperation(value="佣金记录表-分页列表查询", notes="佣金记录表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<StudytourCommissionLog>> queryPageList(StudytourCommissionLog studytourCommissionLog,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<StudytourCommissionLog> queryWrapper = QueryGenerator.initQueryWrapper(studytourCommissionLog, req.getParameterMap());
+		Page<StudytourCommissionLog> page = new Page<StudytourCommissionLog>(pageNo, pageSize);
+		IPage<StudytourCommissionLog> pageList = studytourCommissionLogService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param studytourCommissionLog
+	 * @return
+	 */
+	@AutoLog(value = "佣金记录表-添加")
+	@ApiOperation(value="佣金记录表-添加", notes="佣金记录表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody StudytourCommissionLog studytourCommissionLog) {
+		studytourCommissionLogService.save(studytourCommissionLog);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param studytourCommissionLog
+	 * @return
+	 */
+	@AutoLog(value = "佣金记录表-编辑")
+	@ApiOperation(value="佣金记录表-编辑", notes="佣金记录表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody StudytourCommissionLog studytourCommissionLog) {
+		studytourCommissionLogService.updateById(studytourCommissionLog);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "佣金记录表-通过id删除")
+	@ApiOperation(value="佣金记录表-通过id删除", notes="佣金记录表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		studytourCommissionLogService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "佣金记录表-批量删除")
+	@ApiOperation(value="佣金记录表-批量删除", notes="佣金记录表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.studytourCommissionLogService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "佣金记录表-通过id查询")
+	@ApiOperation(value="佣金记录表-通过id查询", notes="佣金记录表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<StudytourCommissionLog> queryById(@RequestParam(name="id",required=true) String id) {
+		StudytourCommissionLog studytourCommissionLog = studytourCommissionLogService.getById(id);
+		if(studytourCommissionLog==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(studytourCommissionLog);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param studytourCommissionLog
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, StudytourCommissionLog studytourCommissionLog) {
+        return super.exportXls(request, studytourCommissionLog, StudytourCommissionLog.class, "佣金记录表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, StudytourCommissionLog.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/entity/StudytourCommissionLog.java

@@ -0,0 +1,70 @@
+package org.jeecg.modules.studytourCommissionLog.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 佣金记录表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("studytour_commission_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="studytour_commission_log对象", description="佣金记录表")
+public class StudytourCommissionLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**佣金金额*/
+	@Excel(name = "佣金金额", width = 15)
+    @ApiModelProperty(value = "佣金金额")
+    private java.math.BigDecimal amount;
+	/**来源用户*/
+	@Excel(name = "来源用户", width = 15)
+    @ApiModelProperty(value = "来源用户")
+    private java.lang.String commissionId;
+	/**获得用户*/
+	@Excel(name = "获得用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "获得用户")
+    private java.lang.String userId;
+
+    //用户信息
+    @TableField(exist = false)
+    @ApiModelProperty(value = "佣金来源用户信息")
+    HanHaiMember commissionUser;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/StudytourCommissionLogMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.studytourCommissionLog.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.studytourCommissionLog.entity.StudytourCommissionLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 佣金记录表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-19
+ * @Version: V1.0
+ */
+public interface StudytourCommissionLogMapper extends BaseMapper<StudytourCommissionLog> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/xml/StudytourCommissionLogMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.studytourCommissionLog.mapper.StudytourCommissionLogMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/IStudytourCommissionLogService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.studytourCommissionLog.service;
+
+import org.jeecg.modules.studytourCommissionLog.entity.StudytourCommissionLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 佣金记录表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-19
+ * @Version: V1.0
+ */
+public interface IStudytourCommissionLogService extends IService<StudytourCommissionLog> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/impl/StudytourCommissionLogServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.studytourCommissionLog.service.impl;
+
+import org.jeecg.modules.studytourCommissionLog.entity.StudytourCommissionLog;
+import org.jeecg.modules.studytourCommissionLog.mapper.StudytourCommissionLogMapper;
+import org.jeecg.modules.studytourCommissionLog.service.IStudytourCommissionLogService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 佣金记录表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-19
+ * @Version: V1.0
+ */
+@Service
+public class StudytourCommissionLogServiceImpl extends ServiceImpl<StudytourCommissionLogMapper, StudytourCommissionLog> implements IStudytourCommissionLogService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/StudytourCommissionLogList.vue

@@ -0,0 +1,184 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('佣金记录表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <studytour-commission-log-modal ref="modalForm" @ok="modalFormOk"></studytour-commission-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import StudytourCommissionLogModal from './modules/StudytourCommissionLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'StudytourCommissionLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      StudytourCommissionLogModal
+    },
+    data () {
+      return {
+        description: '佣金记录表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'佣金金额',
+            align:"center",
+            dataIndex: 'amount_dictText'
+          },
+          {
+            title:'来源用户',
+            align:"center",
+            dataIndex: 'commissionId'
+          },
+          {
+            title:'获得用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/studytourCommissionLog/studytourCommissionLog/list",
+          delete: "/studytourCommissionLog/studytourCommissionLog/delete",
+          deleteBatch: "/studytourCommissionLog/studytourCommissionLog/deleteBatch",
+          exportXlsUrl: "/studytourCommissionLog/studytourCommissionLog/exportXls",
+          importExcelUrl: "studytourCommissionLog/studytourCommissionLog/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_search',value:'amount',text:'佣金金额',dictTable:"", dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'commissionId',text:'来源用户',dictCode:"han_hai_member,nick_name,id"})
+        fieldList.push({type:'sel_search',value:'userId',text:'获得用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogForm.vue

@@ -0,0 +1,114 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="佣金金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amount">
+              <j-search-select-tag v-model="model.amount" dict=""  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="来源用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="commissionId">
+              <a-input v-model="model.commissionId" placeholder="请输入来源用户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="获得用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'StudytourCommissionLogForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/studytourCommissionLog/studytourCommissionLog/add",
+          edit: "/studytourCommissionLog/studytourCommissionLog/edit",
+          queryById: "/studytourCommissionLog/studytourCommissionLog/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <studytour-commission-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></studytour-commission-log-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import StudytourCommissionLogForm from './StudytourCommissionLogForm'
+
+  export default {
+    name: 'StudytourCommissionLogModal',
+    components: {
+      StudytourCommissionLogForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <studytour-commission-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></studytour-commission-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import StudytourCommissionLogForm from './StudytourCommissionLogForm'
+  export default {
+    name: 'StudytourCommissionLogModal',
+    components: {
+      StudytourCommissionLogForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLog.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/studytourCommissionLog/studytourCommissionLog/list',
+  save='/studytourCommissionLog/studytourCommissionLog/add',
+  edit='/studytourCommissionLog/studytourCommissionLog/edit',
+  deleteOne = '/studytourCommissionLog/studytourCommissionLog/delete',
+  deleteBatch = '/studytourCommissionLog/studytourCommissionLog/deleteBatch',
+  importExcel = '/studytourCommissionLog/studytourCommissionLog/importExcel',
+  exportXls = '/studytourCommissionLog/studytourCommissionLog/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLog.data.ts

@@ -0,0 +1,49 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '佣金金额',
+    align:"center",
+    dataIndex: 'amount_dictText'
+   },
+   {
+    title: '来源用户',
+    align:"center",
+    dataIndex: 'commissionId'
+   },
+   {
+    title: '获得用户',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '佣金金额',
+    field: 'amount',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:""
+    },
+  },
+  {
+    label: '来源用户',
+    field: 'commissionId',
+    component: 'Input',
+  },
+  {
+    label: '获得用户',
+    field: 'userId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLogList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <StudytourCommissionLogModal @register="registerModal" @success="handleSuccess"></StudytourCommissionLogModal>
+  </div>
+</template>
+
+<script lang="ts" name="studytourCommissionLog-studytourCommissionLog" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import StudytourCommissionLogModal from './components/StudytourCommissionLogModal.vue'
+  import {columns, searchFormSchema} from './studytourCommissionLog.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './studytourCommissionLog.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '佣金记录表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"佣金记录表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/components/StudytourCommissionLogModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../studytourCommissionLog.data';
+    import {saveOrUpdate} from '../studytourCommissionLog.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/controller/StudytourExperienceController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 学员心得表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 @Api(tags="学员心得表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/entity/StudytourExperience.java

@@ -5,10 +5,12 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -20,7 +22,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 学员心得表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 @Data
@@ -55,14 +57,19 @@ public class StudytourExperience implements Serializable {
 	@Excel(name = "图片内容", width = 15)
     @ApiModelProperty(value = "图片内容")
     private java.lang.String image;
-	/**关联活动*/
-	@Excel(name = "关联活动", width = 15, dictTable = "studytour_activity", dicText = "title", dicCode = "id")
-	@Dict(dictTable = "studytour_activity", dicText = "title", dicCode = "id")
-    @ApiModelProperty(value = "关联活动")
-    private java.lang.String activityId;
+	/**关联成长档案*/
+	@Excel(name = "关联成长档案", width = 15, dictTable = "studytour_record", dicText = "activity_id", dicCode = "id")
+	@Dict(dictTable = "studytour_record", dicText = "activity_id", dicCode = "id")
+    @ApiModelProperty(value = "关联成长档案")
+    private java.lang.String experienceId;
 	/**关联用户*/
 	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户")
     private java.lang.String userId;
+
+    //用户信息
+    @TableField(exist = false)
+    @ApiModelProperty(value = "用户信息")
+    HanHaiMember user;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/StudytourExperienceMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 学员心得表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 public interface StudytourExperienceMapper extends BaseMapper<StudytourExperience> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/IStudytourExperienceService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 学员心得表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 public interface IStudytourExperienceService extends IService<StudytourExperience> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/impl/StudytourExperienceServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 学员心得表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/StudytourExperienceList.vue

@@ -134,9 +134,9 @@
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'关联活动',
+            title:'关联成长档案',
             align:"center",
-            dataIndex: 'activityId_dictText'
+            dataIndex: 'experienceId_dictText'
           },
           {
             title:'关联用户',
@@ -179,7 +179,7 @@
         let fieldList=[];
         fieldList.push({type:'Text',value:'content',text:'文字内容',dictCode:''})
         fieldList.push({type:'Text',value:'image',text:'图片内容',dictCode:''})
-        fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'experienceId',text:'关联成长档案',dictTable:"studytour_record", dictText:'activity_id', dictCode:'id'})
         fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceForm.vue

@@ -14,8 +14,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="关联活动" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="activityId">
-              <j-search-select-tag v-model="model.activityId" dict="studytour_activity,title,id"  />
+            <a-form-model-item label="关联成长档案" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="experienceId">
+              <j-search-select-tag v-model="model.experienceId" dict="studytour_record,activity_id,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperience.data.ts

@@ -16,9 +16,9 @@ export const columns: BasicColumn[] = [
     customRender:render.renderAvatar,
    },
    {
-    title: '关联活动',
+    title: '关联成长档案',
     align:"center",
-    dataIndex: 'activityId_dictText'
+    dataIndex: 'experienceId_dictText'
    },
    {
     title: '关联用户',
@@ -44,11 +44,11 @@ export const formSchema: FormSchema[] = [
       },
   },
   {
-    label: '关联活动',
-    field: 'activityId',
+    label: '关联成长档案',
+    field: 'experienceId',
     component: 'JSearchSelect',
     componentProps:{
-       dict:"studytour_activity,title,id"
+       dict:"studytour_record,activity_id,id"
     },
   },
   {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/controller/StudytourExperienceQuestionController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.studytourExperienceQuestion.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.studytourExperienceQuestion.entity.StudytourExperienceQuestion;
+import org.jeecg.modules.studytourExperienceQuestion.service.IStudytourExperienceQuestionService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 心得问题表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+@Api(tags="心得问题表")
+@RestController
+@RequestMapping("/studytourExperienceQuestion/studytourExperienceQuestion")
+@Slf4j
+public class StudytourExperienceQuestionController extends JeecgController<StudytourExperienceQuestion, IStudytourExperienceQuestionService> {
+	@Autowired
+	private IStudytourExperienceQuestionService studytourExperienceQuestionService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param studytourExperienceQuestion
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "心得问题表-分页列表查询")
+	@ApiOperation(value="心得问题表-分页列表查询", notes="心得问题表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<StudytourExperienceQuestion>> queryPageList(StudytourExperienceQuestion studytourExperienceQuestion,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<StudytourExperienceQuestion> queryWrapper = QueryGenerator.initQueryWrapper(studytourExperienceQuestion, req.getParameterMap());
+		Page<StudytourExperienceQuestion> page = new Page<StudytourExperienceQuestion>(pageNo, pageSize);
+		IPage<StudytourExperienceQuestion> pageList = studytourExperienceQuestionService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param studytourExperienceQuestion
+	 * @return
+	 */
+	@AutoLog(value = "心得问题表-添加")
+	@ApiOperation(value="心得问题表-添加", notes="心得问题表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody StudytourExperienceQuestion studytourExperienceQuestion) {
+		studytourExperienceQuestionService.save(studytourExperienceQuestion);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param studytourExperienceQuestion
+	 * @return
+	 */
+	@AutoLog(value = "心得问题表-编辑")
+	@ApiOperation(value="心得问题表-编辑", notes="心得问题表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody StudytourExperienceQuestion studytourExperienceQuestion) {
+		studytourExperienceQuestionService.updateById(studytourExperienceQuestion);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "心得问题表-通过id删除")
+	@ApiOperation(value="心得问题表-通过id删除", notes="心得问题表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		studytourExperienceQuestionService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "心得问题表-批量删除")
+	@ApiOperation(value="心得问题表-批量删除", notes="心得问题表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.studytourExperienceQuestionService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "心得问题表-通过id查询")
+	@ApiOperation(value="心得问题表-通过id查询", notes="心得问题表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<StudytourExperienceQuestion> queryById(@RequestParam(name="id",required=true) String id) {
+		StudytourExperienceQuestion studytourExperienceQuestion = studytourExperienceQuestionService.getById(id);
+		if(studytourExperienceQuestion==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(studytourExperienceQuestion);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param studytourExperienceQuestion
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, StudytourExperienceQuestion studytourExperienceQuestion) {
+        return super.exportXls(request, studytourExperienceQuestion, StudytourExperienceQuestion.class, "心得问题表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, StudytourExperienceQuestion.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/entity/StudytourExperienceQuestion.java

@@ -0,0 +1,58 @@
+package org.jeecg.modules.studytourExperienceQuestion.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 心得问题表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("studytour_experience_question")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="studytour_experience_question对象", description="心得问题表")
+public class StudytourExperienceQuestion implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**心得问题*/
+	@Excel(name = "心得问题", width = 15)
+    @ApiModelProperty(value = "心得问题")
+    private java.lang.String question;
+	/**排序编号*/
+	@Excel(name = "排序编号", width = 15)
+    @ApiModelProperty(value = "排序编号")
+    private java.lang.Integer orderNo;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/mapper/StudytourExperienceQuestionMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.studytourExperienceQuestion.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.studytourExperienceQuestion.entity.StudytourExperienceQuestion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 心得问题表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+public interface StudytourExperienceQuestionMapper extends BaseMapper<StudytourExperienceQuestion> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/mapper/xml/StudytourExperienceQuestionMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.studytourExperienceQuestion.mapper.StudytourExperienceQuestionMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/service/IStudytourExperienceQuestionService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.studytourExperienceQuestion.service;
+
+import org.jeecg.modules.studytourExperienceQuestion.entity.StudytourExperienceQuestion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 心得问题表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+public interface IStudytourExperienceQuestionService extends IService<StudytourExperienceQuestion> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/service/impl/StudytourExperienceQuestionServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.studytourExperienceQuestion.service.impl;
+
+import org.jeecg.modules.studytourExperienceQuestion.entity.StudytourExperienceQuestion;
+import org.jeecg.modules.studytourExperienceQuestion.mapper.StudytourExperienceQuestionMapper;
+import org.jeecg.modules.studytourExperienceQuestion.service.IStudytourExperienceQuestionService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 心得问题表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+@Service
+public class StudytourExperienceQuestionServiceImpl extends ServiceImpl<StudytourExperienceQuestionMapper, StudytourExperienceQuestion> implements IStudytourExperienceQuestionService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/StudytourExperienceQuestionList.vue

@@ -0,0 +1,177 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('心得问题表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <studytour-experience-question-modal ref="modalForm" @ok="modalFormOk"></studytour-experience-question-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import StudytourExperienceQuestionModal from './modules/StudytourExperienceQuestionModal'
+
+  export default {
+    name: 'StudytourExperienceQuestionList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      StudytourExperienceQuestionModal
+    },
+    data () {
+      return {
+        description: '心得问题表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'心得问题',
+            align:"center",
+            dataIndex: 'question'
+          },
+          {
+            title:'排序编号',
+            align:"center",
+            dataIndex: 'orderNo'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/studytourExperienceQuestion/studytourExperienceQuestion/list",
+          delete: "/studytourExperienceQuestion/studytourExperienceQuestion/delete",
+          deleteBatch: "/studytourExperienceQuestion/studytourExperienceQuestion/deleteBatch",
+          exportXlsUrl: "/studytourExperienceQuestion/studytourExperienceQuestion/exportXls",
+          importExcelUrl: "studytourExperienceQuestion/studytourExperienceQuestion/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'question',text:'心得问题',dictCode:''})
+        fieldList.push({type:'int',value:'orderNo',text:'排序编号',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionForm.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="心得问题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="question">
+              <a-input v-model="model.question" placeholder="请输入心得问题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNo">
+              <a-input-number v-model="model.orderNo" placeholder="请输入排序编号" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'StudytourExperienceQuestionForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/studytourExperienceQuestion/studytourExperienceQuestion/add",
+          edit: "/studytourExperienceQuestion/studytourExperienceQuestion/edit",
+          queryById: "/studytourExperienceQuestion/studytourExperienceQuestion/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <studytour-experience-question-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></studytour-experience-question-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import StudytourExperienceQuestionForm from './StudytourExperienceQuestionForm'
+
+  export default {
+    name: 'StudytourExperienceQuestionModal',
+    components: {
+      StudytourExperienceQuestionForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <studytour-experience-question-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></studytour-experience-question-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import StudytourExperienceQuestionForm from './StudytourExperienceQuestionForm'
+  export default {
+    name: 'StudytourExperienceQuestionModal',
+    components: {
+      StudytourExperienceQuestionForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/StudytourExperienceQuestion.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/studytourExperienceQuestion/studytourExperienceQuestion/list',
+  save='/studytourExperienceQuestion/studytourExperienceQuestion/add',
+  edit='/studytourExperienceQuestion/studytourExperienceQuestion/edit',
+  deleteOne = '/studytourExperienceQuestion/studytourExperienceQuestion/delete',
+  deleteBatch = '/studytourExperienceQuestion/studytourExperienceQuestion/deleteBatch',
+  importExcel = '/studytourExperienceQuestion/studytourExperienceQuestion/importExcel',
+  exportXls = '/studytourExperienceQuestion/studytourExperienceQuestion/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/StudytourExperienceQuestion.data.ts

@@ -0,0 +1,33 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '心得问题',
+    align:"center",
+    dataIndex: 'question'
+   },
+   {
+    title: '排序编号',
+    align:"center",
+    dataIndex: 'orderNo'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '心得问题',
+    field: 'question',
+    component: 'Input',
+  },
+  {
+    label: '排序编号',
+    field: 'orderNo',
+    component: 'InputNumber',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/StudytourExperienceQuestionList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <StudytourExperienceQuestionModal @register="registerModal" @success="handleSuccess"></StudytourExperienceQuestionModal>
+  </div>
+</template>
+
+<script lang="ts" name="studytourExperienceQuestion-studytourExperienceQuestion" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import StudytourExperienceQuestionModal from './components/StudytourExperienceQuestionModal.vue'
+  import {columns, searchFormSchema} from './studytourExperienceQuestion.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './studytourExperienceQuestion.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '心得问题表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"心得问题表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/components/StudytourExperienceQuestionModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../studytourExperienceQuestion.data';
+    import {saveOrUpdate} from '../studytourExperienceQuestion.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/controller/StudytourJournalController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.studytourJournal.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.studytourJournal.entity.StudytourJournal;
+import org.jeecg.modules.studytourJournal.service.IStudytourJournalService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 研学日记表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-19
+ * @Version: V1.0
+ */
+@Api(tags="研学日记表")
+@RestController
+@RequestMapping("/studytourJournal/studytourJournal")
+@Slf4j
+public class StudytourJournalController extends JeecgController<StudytourJournal, IStudytourJournalService> {
+	@Autowired
+	private IStudytourJournalService studytourJournalService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param studytourJournal
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "研学日记表-分页列表查询")
+	@ApiOperation(value="研学日记表-分页列表查询", notes="研学日记表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<StudytourJournal>> queryPageList(StudytourJournal studytourJournal,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<StudytourJournal> queryWrapper = QueryGenerator.initQueryWrapper(studytourJournal, req.getParameterMap());
+		Page<StudytourJournal> page = new Page<StudytourJournal>(pageNo, pageSize);
+		IPage<StudytourJournal> pageList = studytourJournalService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param studytourJournal
+	 * @return
+	 */
+	@AutoLog(value = "研学日记表-添加")
+	@ApiOperation(value="研学日记表-添加", notes="研学日记表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody StudytourJournal studytourJournal) {
+		studytourJournalService.save(studytourJournal);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param studytourJournal
+	 * @return
+	 */
+	@AutoLog(value = "研学日记表-编辑")
+	@ApiOperation(value="研学日记表-编辑", notes="研学日记表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody StudytourJournal studytourJournal) {
+		studytourJournalService.updateById(studytourJournal);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "研学日记表-通过id删除")
+	@ApiOperation(value="研学日记表-通过id删除", notes="研学日记表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		studytourJournalService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "研学日记表-批量删除")
+	@ApiOperation(value="研学日记表-批量删除", notes="研学日记表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.studytourJournalService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "研学日记表-通过id查询")
+	@ApiOperation(value="研学日记表-通过id查询", notes="研学日记表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<StudytourJournal> queryById(@RequestParam(name="id",required=true) String id) {
+		StudytourJournal studytourJournal = studytourJournalService.getById(id);
+		if(studytourJournal==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(studytourJournal);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param studytourJournal
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, StudytourJournal studytourJournal) {
+        return super.exportXls(request, studytourJournal, StudytourJournal.class, "研学日记表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, StudytourJournal.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/entity/StudytourJournal.java

@@ -0,0 +1,58 @@
+package org.jeecg.modules.studytourJournal.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 研学日记表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("studytour_journal")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="studytour_journal对象", description="研学日记表")
+public class StudytourJournal implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**标题*/
+	@Excel(name = "标题", width = 15)
+    @ApiModelProperty(value = "标题")
+    private java.lang.String title;
+	/**详情*/
+	@Excel(name = "详情", width = 15)
+    @ApiModelProperty(value = "详情")
+    private java.lang.String content;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/mapper/StudytourJournalMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.studytourJournal.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.studytourJournal.entity.StudytourJournal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 研学日记表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-19
+ * @Version: V1.0
+ */
+public interface StudytourJournalMapper extends BaseMapper<StudytourJournal> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/mapper/xml/StudytourJournalMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.studytourJournal.mapper.StudytourJournalMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/service/IStudytourJournalService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.studytourJournal.service;
+
+import org.jeecg.modules.studytourJournal.entity.StudytourJournal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 研学日记表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-19
+ * @Version: V1.0
+ */
+public interface IStudytourJournalService extends IService<StudytourJournal> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/service/impl/StudytourJournalServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.studytourJournal.service.impl;
+
+import org.jeecg.modules.studytourJournal.entity.StudytourJournal;
+import org.jeecg.modules.studytourJournal.mapper.StudytourJournalMapper;
+import org.jeecg.modules.studytourJournal.service.IStudytourJournalService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 研学日记表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-19
+ * @Version: V1.0
+ */
+@Service
+public class StudytourJournalServiceImpl extends ServiceImpl<StudytourJournalMapper, StudytourJournal> implements IStudytourJournalService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/StudytourJournalList.vue

@@ -0,0 +1,178 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('研学日记表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <studytour-journal-modal ref="modalForm" @ok="modalFormOk"></studytour-journal-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import StudytourJournalModal from './modules/StudytourJournalModal'
+
+  export default {
+    name: 'StudytourJournalList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      StudytourJournalModal
+    },
+    data () {
+      return {
+        description: '研学日记表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'详情',
+            align:"center",
+            dataIndex: 'content',
+            scopedSlots: {customRender: 'htmlSlot'}
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/studytourJournal/studytourJournal/list",
+          delete: "/studytourJournal/studytourJournal/delete",
+          deleteBatch: "/studytourJournal/studytourJournal/deleteBatch",
+          exportXlsUrl: "/studytourJournal/studytourJournal/exportXls",
+          importExcelUrl: "studytourJournal/studytourJournal/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'Text',value:'content',text:'详情',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalForm.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="content">
+              <j-editor v-model="model.content" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'StudytourJournalForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/studytourJournal/studytourJournal/add",
+          edit: "/studytourJournal/studytourJournal/edit",
+          queryById: "/studytourJournal/studytourJournal/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <studytour-journal-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></studytour-journal-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import StudytourJournalForm from './StudytourJournalForm'
+
+  export default {
+    name: 'StudytourJournalModal',
+    components: {
+      StudytourJournalForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <studytour-journal-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></studytour-journal-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import StudytourJournalForm from './StudytourJournalForm'
+  export default {
+    name: 'StudytourJournalModal',
+    components: {
+      StudytourJournalForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/StudytourJournal.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/studytourJournal/studytourJournal/list',
+  save='/studytourJournal/studytourJournal/add',
+  edit='/studytourJournal/studytourJournal/edit',
+  deleteOne = '/studytourJournal/studytourJournal/delete',
+  deleteBatch = '/studytourJournal/studytourJournal/deleteBatch',
+  importExcel = '/studytourJournal/studytourJournal/importExcel',
+  exportXls = '/studytourJournal/studytourJournal/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/StudytourJournal.data.ts

@@ -0,0 +1,34 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '标题',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '详情',
+    align:"center",
+    dataIndex: 'content',
+    slots: { customRender: 'htmlSlot' },
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '标题',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '详情',
+    field: 'content',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/StudytourJournalList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <StudytourJournalModal @register="registerModal" @success="handleSuccess"></StudytourJournalModal>
+  </div>
+</template>
+
+<script lang="ts" name="studytourJournal-studytourJournal" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import StudytourJournalModal from './components/StudytourJournalModal.vue'
+  import {columns, searchFormSchema} from './studytourJournal.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './studytourJournal.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '研学日记表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"研学日记表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/components/StudytourJournalModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../studytourJournal.data';
+    import {saveOrUpdate} from '../studytourJournal.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/controller/StudytourMedalUserController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 用户勋章表
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 @Api(tags="用户勋章表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/entity/StudytourMedalUser.java

@@ -5,10 +5,12 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.studytourMedal.entity.StudytourMedal;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -20,7 +22,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 用户勋章表
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 @Data
@@ -56,7 +58,7 @@ public class StudytourMedalUser implements Serializable {
 	@Excel(name = "关联勋章id", width = 15, dictTable = "studytour_medal", dicText = "title", dicCode = "id")
 	@Dict(dictTable = "studytour_medal", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "关联勋章id")
-    private java.lang.String metalId;
+    private java.lang.String medalId;
 	/**是否点亮*/
 	@Excel(name = "是否点亮", width = 15, dicCode = "is_true")
 	@Dict(dicCode = "is_true")
@@ -73,4 +75,9 @@ public class StudytourMedalUser implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
+
+    //勋章信息
+    @TableField(exist = false)
+    @ApiModelProperty(value = "勋章信息")
+    StudytourMedal medal;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/mapper/StudytourMedalUserMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 用户勋章表
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 public interface StudytourMedalUserMapper extends BaseMapper<StudytourMedalUser> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/IStudytourMedalUserService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 用户勋章表
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 public interface IStudytourMedalUserService extends IService<StudytourMedalUser> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/impl/StudytourMedalUserServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 用户勋章表
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-19
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/StudytourMedalUserList.vue

@@ -130,7 +130,7 @@
           {
             title:'关联勋章id',
             align:"center",
-            dataIndex: 'metalId_dictText'
+            dataIndex: 'medalId_dictText'
           },
           {
             title:'是否点亮',
@@ -185,7 +185,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'})
-        fieldList.push({type:'string',value:'metalId',text:'关联勋章id',dictCode:"studytour_medal,title,id"})
+        fieldList.push({type:'string',value:'medalId',text:'关联勋章id',dictCode:"studytour_medal,title,id"})
         fieldList.push({type:'string',value:'isLight',text:'是否点亮',dictCode:'is_true'})
         fieldList.push({type:'date',value:'lightDate',text:'点亮日期'})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/modules/StudytourMedalUserForm.vue

@@ -9,8 +9,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="关联勋章id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="metalId">
-              <j-dict-select-tag type="list" v-model="model.metalId" dictCode="studytour_medal,title,id" placeholder="请选择关联勋章id" />
+            <a-form-model-item label="关联勋章id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="medalId">
+              <j-dict-select-tag type="list" v-model="model.medalId" dictCode="studytour_medal,title,id" placeholder="请选择关联勋章id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue3/StudytourMedalUser.data.ts

@@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [
    {
     title: '关联勋章id',
     align:"center",
-    dataIndex: 'metalId_dictText'
+    dataIndex: 'medalId_dictText'
    },
    {
     title: '是否点亮',
@@ -48,7 +48,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '关联勋章id',
-    field: 'metalId',
+    field: 'medalId',
     component: 'JDictSelectTag',
     componentProps:{
         dictCode:"studytour_medal,title,id"

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/controller/StudytourNoticeController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 开营通知表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Api(tags="开营通知表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/entity/StudytourNotice.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 开营通知表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Data
@@ -47,15 +47,29 @@ public class StudytourNotice implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
+	/**通知标题*/
+	@Excel(name = "通知标题", width = 15)
+    @ApiModelProperty(value = "通知标题")
+    private java.lang.String title;
 	/**通知信息*/
 	@Excel(name = "通知信息", width = 15)
     @ApiModelProperty(value = "通知信息")
     private java.lang.String content;
+	/**通知日期*/
+	@Excel(name = "通知日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "通知日期")
+    private java.util.Date noticeDate;
 	/**是否已读*/
 	@Excel(name = "是否已读", width = 15, dicCode = "is_true")
 	@Dict(dicCode = "is_true")
     @ApiModelProperty(value = "是否已读")
     private java.lang.String isRead;
+	/**导师电话*/
+	@Excel(name = "导师电话", width = 15)
+    @ApiModelProperty(value = "导师电话")
+    private java.lang.String teacherPhone;
 	/**关联用户*/
 	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/mapper/StudytourNoticeMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 开营通知表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 public interface StudytourNoticeMapper extends BaseMapper<StudytourNotice> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/IStudytourNoticeService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 开营通知表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 public interface IStudytourNoticeService extends IService<StudytourNotice> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/impl/StudytourNoticeServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 开营通知表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/StudytourNoticeList.vue

@@ -122,17 +122,35 @@
               return parseInt(index)+1;
             }
           },
+          {
+            title:'通知标题',
+            align:"center",
+            dataIndex: 'title'
+          },
           {
             title:'通知信息',
             align:"center",
             dataIndex: 'content',
             scopedSlots: {customRender: 'htmlSlot'}
           },
+          {
+            title:'通知日期',
+            align:"center",
+            dataIndex: 'noticeDate',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
           {
             title:'是否已读',
             align:"center",
             dataIndex: 'isRead_dictText'
           },
+          {
+            title:'导师电话',
+            align:"center",
+            dataIndex: 'teacherPhone'
+          },
           {
             title:'关联用户',
             align:"center",
@@ -172,8 +190,11 @@
       },
       getSuperFieldList(){
         let fieldList=[];
+        fieldList.push({type:'string',value:'title',text:'通知标题',dictCode:''})
         fieldList.push({type:'Text',value:'content',text:'通知信息',dictCode:''})
+        fieldList.push({type:'date',value:'noticeDate',text:'通知日期'})
         fieldList.push({type:'string',value:'isRead',text:'是否已读',dictCode:'is_true'})
+        fieldList.push({type:'string',value:'teacherPhone',text:'导师电话',dictCode:''})
         fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeForm.vue

@@ -3,16 +3,31 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="通知标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入通知标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="通知信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="content">
               <j-editor v-model="model.content" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="通知日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noticeDate">
+              <j-date placeholder="请选择通知日期" v-model="model.noticeDate"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="是否已读" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isRead">
               <j-dict-select-tag type="list" v-model="model.isRead" dictCode="is_true" placeholder="请选择是否已读" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="导师电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="teacherPhone">
+              <a-input v-model="model.teacherPhone" placeholder="请输入导师电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
               <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
@@ -55,6 +70,10 @@
         },
         confirmLoading: false,
         validatorRules: {
+           teacherPhone: [
+              { required: false},
+              { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+           ],
         },
         url: {
           add: "/studytourNotice/studytourNotice/add",

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNotice.data.ts

@@ -5,16 +5,34 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
+    title: '通知标题',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
     title: '通知信息',
     align:"center",
     dataIndex: 'content',
     slots: { customRender: 'htmlSlot' },
    },
+   {
+    title: '通知日期',
+    align:"center",
+    dataIndex: 'noticeDate',
+    customRender:({text}) =>{
+      return !text?"":(text.length>10?text.substr(0,10):text)
+    },
+   },
    {
     title: '是否已读',
     align:"center",
     dataIndex: 'isRead_dictText'
    },
+   {
+    title: '导师电话',
+    align:"center",
+    dataIndex: 'teacherPhone'
+   },
    {
     title: '关联用户',
     align:"center",
@@ -26,11 +44,21 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
+  {
+    label: '通知标题',
+    field: 'title',
+    component: 'Input',
+  },
   {
     label: '通知信息',
     field: 'content',
     component: 'JCodeEditor', //TODO String后缀暂未添加
   },
+  {
+    label: '通知日期',
+    field: 'noticeDate',
+    component: 'DatePicker',
+  },
   {
     label: '是否已读',
     field: 'isRead',
@@ -39,6 +67,17 @@ export const formSchema: FormSchema[] = [
         dictCode:"is_true"
      },
   },
+  {
+    label: '导师电话',
+    field: 'teacherPhone',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: false},
+                 { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+          ];
+     },
+  },
   {
     label: '关联用户',
     field: 'userId',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/controller/StudytourOrderController.java

@@ -45,7 +45,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Api(tags="订单信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/entity/StudytourOrder.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.studytourOrder.entity;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -18,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @ApiModel(value="studytour_order对象", description="订单信息表")
@@ -113,6 +115,10 @@ public class StudytourOrder implements Serializable {
 	@Excel(name = "活动标签", width = 15)
     @ApiModelProperty(value = "活动标签")
     private java.lang.String activityTag;
+	/**导师电话*/
+	@Excel(name = "导师电话", width = 15)
+    @ApiModelProperty(value = "导师电话")
+    private java.lang.String teacherPhone;
 	/**关联活动*/
 	@Excel(name = "关联活动", width = 15, dictTable = "studytour_activity", dicText = "title", dicCode = "id")
     @Dict(dictTable = "studytour_activity", dicText = "title", dicCode = "id")
@@ -128,4 +134,9 @@ public class StudytourOrder implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "出行人id(以;分隔)")
     String tourisIds;
+
+    //订单出行人信息
+    @TableField(exist = false)
+    @ApiModelProperty(value = "出行人信息")
+    List<StudytourOrderPerson> orderPersonList;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/entity/StudytourOrderPerson.java

@@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 订单人员表
  * @Author: jeecg-boot
- * @Date:   2025-09-16
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @ApiModel(value="studytour_order_person对象", description="订单人员表")