1、图片直播模块

2、成长档案模块
3、评论模块
4、开营通知模块

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

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.modules.studytourActivityDate.entity.StudytourActivityDate;
+import org.jeecg.modules.studytourComment.entity.StudytourComment;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -145,4 +146,9 @@ public class StudytourActivity implements Serializable {
 	@ApiModelProperty(value = "活动团期")
 	List<StudytourActivityDate> dateList;
 
+	//活动活动评论
+	@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

@@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 订单评价心得表
+ * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
-@Api(tags="订单评价心得表")
+@Api(tags="订单评价表")
 @RestController
 @RequestMapping("/studytourComment/studytourComment")
 @Slf4j
@@ -59,8 +59,8 @@ public class StudytourCommentController extends JeecgController<StudytourComment
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "订单评价心得表-分页列表查询")
-	@ApiOperation(value="订单评价心得表-分页列表查询", notes="订单评价心得表-分页列表查询")
+	//@AutoLog(value = "订单评价表-分页列表查询")
+	@ApiOperation(value="订单评价表-分页列表查询", notes="订单评价表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<StudytourComment>> queryPageList(StudytourComment studytourComment,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -78,8 +78,8 @@ public class StudytourCommentController extends JeecgController<StudytourComment
 	 * @param studytourComment
 	 * @return
 	 */
-	@AutoLog(value = "订单评价心得表-添加")
-	@ApiOperation(value="订单评价心得表-添加", notes="订单评价心得表-添加")
+	@AutoLog(value = "订单评价表-添加")
+	@ApiOperation(value="订单评价表-添加", notes="订单评价表-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody StudytourComment studytourComment) {
 		studytourCommentService.save(studytourComment);
@@ -92,8 +92,8 @@ public class StudytourCommentController extends JeecgController<StudytourComment
 	 * @param studytourComment
 	 * @return
 	 */
-	@AutoLog(value = "订单评价心得表-编辑")
-	@ApiOperation(value="订单评价心得表-编辑", notes="订单评价心得表-编辑")
+	@AutoLog(value = "订单评价表-编辑")
+	@ApiOperation(value="订单评价表-编辑", notes="订单评价表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody StudytourComment studytourComment) {
 		studytourCommentService.updateById(studytourComment);
@@ -106,8 +106,8 @@ public class StudytourCommentController extends JeecgController<StudytourComment
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "订单评价心得表-通过id删除")
-	@ApiOperation(value="订单评价心得表-通过id删除", notes="订单评价心得表-通过id删除")
+	@AutoLog(value = "订单评价表-通过id删除")
+	@ApiOperation(value="订单评价表-通过id删除", notes="订单评价表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		studytourCommentService.removeById(id);
@@ -120,8 +120,8 @@ public class StudytourCommentController extends JeecgController<StudytourComment
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "订单评价心得表-批量删除")
-	@ApiOperation(value="订单评价心得表-批量删除", notes="订单评价心得表-批量删除")
+	@AutoLog(value = "订单评价表-批量删除")
+	@ApiOperation(value="订单评价表-批量删除", notes="订单评价表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.studytourCommentService.removeByIds(Arrays.asList(ids.split(",")));
@@ -134,8 +134,8 @@ public class StudytourCommentController extends JeecgController<StudytourComment
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "订单评价心得表-通过id查询")
-	@ApiOperation(value="订单评价心得表-通过id查询", notes="订单评价心得表-通过id查询")
+	//@AutoLog(value = "订单评价表-通过id查询")
+	@ApiOperation(value="订单评价表-通过id查询", notes="订单评价表-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<StudytourComment> queryById(@RequestParam(name="id",required=true) String id) {
 		StudytourComment studytourComment = studytourCommentService.getById(id);
@@ -153,7 +153,7 @@ public class StudytourCommentController extends JeecgController<StudytourComment
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, StudytourComment studytourComment) {
-        return super.exportXls(request, studytourComment, StudytourComment.class, "订单评价心得表");
+        return super.exportXls(request, studytourComment, StudytourComment.class, "订单评价表");
     }
 
     /**

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

@@ -4,11 +4,15 @@ 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;
 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;
@@ -18,16 +22,16 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 订单评价心得表
+ * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @Data
 @TableName("studytour_comment")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="studytour_comment对象", description="订单评价心得表")
+@ApiModel(value="studytour_comment对象", description="订单评价表")
 public class StudytourComment implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -77,9 +81,9 @@ public class StudytourComment implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
-	/**类型*/
-	@Excel(name = "类型", width = 15, dicCode = "comment_type")
-	@Dict(dicCode = "comment_type")
-    @ApiModelProperty(value = "类型")
-    private java.lang.String type;
+
+    //活动活动评论
+    @TableField(exist = false)
+    @ApiModelProperty(value = "用户信息")
+    HanHaiMember user;
 }

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

@@ -7,9 +7,9 @@ import org.jeecg.modules.studytourComment.entity.StudytourComment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 订单评价心得表
+ * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-16
  * @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

@@ -4,9 +4,9 @@ import org.jeecg.modules.studytourComment.entity.StudytourComment;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * @Description: 订单评价心得表
+ * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-16
  * @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

@@ -8,9 +8,9 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 订单评价心得表
+ * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @Service

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

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <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-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>
@@ -109,7 +109,7 @@
     },
     data () {
       return {
-        description: '订单评价心得表管理页面',
+        description: '订单评价表管理页面',
         // 表头
         columns: [
           {
@@ -158,11 +158,6 @@
             align:"center",
             dataIndex: 'userId_dictText'
           },
-          {
-            title:'类型',
-            align:"center",
-            dataIndex: 'type_dictText'
-          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -204,7 +199,6 @@
         fieldList.push({type:'int',value:'teacherScore',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"})
-        fieldList.push({type:'string',value:'type',text:'类型',dictCode:'comment_type'})
         this.superFieldList = fieldList
       }
     }

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

@@ -38,11 +38,6 @@
               <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <j-dict-select-tag type="list" v-model="model.type" dictCode="comment_type" placeholder="请选择类型" />
-            </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/studytourComment/vue3/StudytourComment.data.ts

@@ -40,11 +40,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'userId_dictText'
    },
-   {
-    title: '类型',
-    align:"center",
-    dataIndex: 'type_dictText'
-   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -94,12 +89,4 @@ export const formSchema: FormSchema[] = [
         dictCode:"han_hai_member,nick_name,id"
      },
   },
-  {
-    label: '类型',
-    field: 'type',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"comment_type"
-     },
-  },
 ];

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

@@ -53,7 +53,7 @@
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '订单评价心得表',
+           title: '订单评价表',
            api: list,
            columns,
            canResize:false,
@@ -70,7 +70,7 @@
             },
       },
        exportConfig: {
-            name:"订单评价心得表",
+            name:"订单评价表",
             url: getExportUrl,
           },
           importConfig: {

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

@@ -0,0 +1,171 @@
+package org.jeecg.modules.studytourExperience.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.studytourExperience.entity.StudytourExperience;
+import org.jeecg.modules.studytourExperience.service.IStudytourExperienceService;
+
+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-16
+ * @Version: V1.0
+ */
+@Api(tags="学员心得表")
+@RestController
+@RequestMapping("/studytourExperience/studytourExperience")
+@Slf4j
+public class StudytourExperienceController extends JeecgController<StudytourExperience, IStudytourExperienceService> {
+	@Autowired
+	private IStudytourExperienceService studytourExperienceService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param studytourExperience
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "学员心得表-分页列表查询")
+	@ApiOperation(value="学员心得表-分页列表查询", notes="学员心得表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<StudytourExperience>> queryPageList(StudytourExperience studytourExperience,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<StudytourExperience> queryWrapper = QueryGenerator.initQueryWrapper(studytourExperience, req.getParameterMap());
+		Page<StudytourExperience> page = new Page<StudytourExperience>(pageNo, pageSize);
+		IPage<StudytourExperience> pageList = studytourExperienceService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param studytourExperience
+	 * @return
+	 */
+	@AutoLog(value = "学员心得表-添加")
+	@ApiOperation(value="学员心得表-添加", notes="学员心得表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody StudytourExperience studytourExperience) {
+		studytourExperienceService.save(studytourExperience);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param studytourExperience
+	 * @return
+	 */
+	@AutoLog(value = "学员心得表-编辑")
+	@ApiOperation(value="学员心得表-编辑", notes="学员心得表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody StudytourExperience studytourExperience) {
+		studytourExperienceService.updateById(studytourExperience);
+		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) {
+		studytourExperienceService.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.studytourExperienceService.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<StudytourExperience> queryById(@RequestParam(name="id",required=true) String id) {
+		StudytourExperience studytourExperience = studytourExperienceService.getById(id);
+		if(studytourExperience==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(studytourExperience);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param studytourExperience
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, StudytourExperience studytourExperience) {
+        return super.exportXls(request, studytourExperience, StudytourExperience.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, StudytourExperience.class);
+    }
+
+}

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

@@ -0,0 +1,68 @@
+package org.jeecg.modules.studytourExperience.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-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("studytour_experience")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="studytour_experience对象", description="学员心得表")
+public class StudytourExperience 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 content;
+	/**图片内容*/
+	@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 = "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;
+}

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

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/xml/StudytourExperienceMapper.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.studytourExperience.mapper.StudytourExperienceMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.studytourExperience.service;
+
+import org.jeecg.modules.studytourExperience.entity.StudytourExperience;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 学员心得表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-16
+ * @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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.studytourExperience.service.impl;
+
+import org.jeecg.modules.studytourExperience.entity.StudytourExperience;
+import org.jeecg.modules.studytourExperience.mapper.StudytourExperienceMapper;
+import org.jeecg.modules.studytourExperience.service.IStudytourExperienceService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 学员心得表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-16
+ * @Version: V1.0
+ */
+@Service
+public class StudytourExperienceServiceImpl extends ServiceImpl<StudytourExperienceMapper, StudytourExperience> implements IStudytourExperienceService {
+
+}

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

@@ -0,0 +1,191 @@
+<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-modal ref="modalForm" @ok="modalFormOk"></studytour-experience-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import StudytourExperienceModal from './modules/StudytourExperienceModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'StudytourExperienceList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      StudytourExperienceModal
+    },
+    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: 'content'
+          },
+          {
+            title:'图片内容',
+            align:"center",
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'关联活动',
+            align:"center",
+            dataIndex: 'activityId_dictText'
+          },
+          {
+            title:'关联用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/studytourExperience/studytourExperience/list",
+          delete: "/studytourExperience/studytourExperience/delete",
+          deleteBatch: "/studytourExperience/studytourExperience/deleteBatch",
+          exportXlsUrl: "/studytourExperience/studytourExperience/exportXls",
+          importExcelUrl: "studytourExperience/studytourExperience/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:'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:'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/studytourExperience/vue/modules/StudytourExperienceForm.vue

@@ -0,0 +1,119 @@
+<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="content">
+              <a-textarea v-model="model.content" rows="4" placeholder="请输入文字内容" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            </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>
+          </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: 'StudytourExperienceForm',
+    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: "/studytourExperience/studytourExperience/add",
+          edit: "/studytourExperience/studytourExperience/edit",
+          queryById: "/studytourExperience/studytourExperience/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/studytourOrder/vue/modules/StudytourOrderModal.Style#Drawer.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <studytour-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></studytour-order-form>
+    <studytour-experience-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></studytour-experience-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import StudytourOrderForm from './StudytourOrderForm'
+  import StudytourExperienceForm from './StudytourExperienceForm'
 
   export default {
-    name: 'StudytourOrderModal',
+    name: 'StudytourExperienceModal',
     components: {
-      StudytourOrderForm
+      StudytourExperienceForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceModal.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-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></studytour-experience-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import StudytourExperienceForm from './StudytourExperienceForm'
+  export default {
+    name: 'StudytourExperienceModal',
+    components: {
+      StudytourExperienceForm
+    },
+    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/studytourExperience/vue3/StudytourExperience.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/studytourExperience/studytourExperience/list',
+  save='/studytourExperience/studytourExperience/add',
+  edit='/studytourExperience/studytourExperience/edit',
+  deleteOne = '/studytourExperience/studytourExperience/delete',
+  deleteBatch = '/studytourExperience/studytourExperience/deleteBatch',
+  importExcel = '/studytourExperience/studytourExperience/importExcel',
+  exportXls = '/studytourExperience/studytourExperience/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/studytourExperience/vue3/StudytourExperience.data.ts

@@ -0,0 +1,62 @@
+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: 'content'
+   },
+   {
+    title: '图片内容',
+    align:"center",
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '关联活动',
+    align:"center",
+    dataIndex: 'activityId_dictText'
+   },
+   {
+    title: '关联用户',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '文字内容',
+    field: 'content',
+    component: 'InputTextArea',//TODO 注意string转换问题
+  },
+  {
+    label: '图片内容',
+    field: 'image',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '关联活动',
+    field: 'activityId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"studytour_activity,title,id"
+    },
+  },
+  {
+    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/studytourExperience/vue3/StudytourExperienceList.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>
+    <!-- 表单区域 -->
+    <StudytourExperienceModal @register="registerModal" @success="handleSuccess"></StudytourExperienceModal>
+  </div>
+</template>
+
+<script lang="ts" name="studytourExperience-studytourExperience" 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 StudytourExperienceModal from './components/StudytourExperienceModal.vue'
+  import {columns, searchFormSchema} from './studytourExperience.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './studytourExperience.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/studytourExperience/vue3/components/StudytourExperienceModal.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 '../studytourExperience.data';
+    import {saveOrUpdate} from '../studytourExperience.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/studytourImage/controller/StudytourImageController.java

@@ -45,7 +45,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 图片直播表
  * @Author: jeecg-boot
- * @Date:   2025-09-12
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @Api(tags="图片直播表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/entity/StudytourImage.java

@@ -17,7 +17,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * @Description: 图片直播表
  * @Author: jeecg-boot
- * @Date:   2025-09-12
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @ApiModel(value="studytour_image对象", description="图片直播表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/entity/StudytourImageContent.java

@@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * @Description: 用户图片直播表
  * @Author: jeecg-boot
- * @Date:   2025-09-12
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @ApiModel(value="studytour_image_content对象", description="用户图片直播表")
@@ -52,6 +52,10 @@ public class StudytourImageContent implements Serializable {
 	/**关联图片直播*/
     @ApiModelProperty(value = "关联图片直播")
     private java.lang.String imageId;
+	/**关联活动*/
+	@Excel(name = "关联活动", width = 15, dictTable = "studytour_activity", dicText = "title", dicCode = "id")
+    @ApiModelProperty(value = "关联活动")
+    private java.lang.String activityId;
 	/**关联用户*/
 	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/mapper/StudytourImageContentMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * @Description: 用户图片直播表
  * @Author: jeecg-boot
- * @Date:   2025-09-12
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 public interface StudytourImageContentMapper extends BaseMapper<StudytourImageContent> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/mapper/StudytourImageMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 图片直播表
  * @Author: jeecg-boot
- * @Date:   2025-09-12
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 public interface StudytourImageMapper extends BaseMapper<StudytourImage> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/IStudytourImageContentService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @Description: 用户图片直播表
  * @Author: jeecg-boot
- * @Date:   2025-09-12
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 public interface IStudytourImageContentService extends IService<StudytourImageContent> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/IStudytourImageService.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * @Description: 图片直播表
  * @Author: jeecg-boot
- * @Date:   2025-09-12
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 public interface IStudytourImageService extends IService<StudytourImage> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/impl/StudytourImageContentServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * @Description: 用户图片直播表
  * @Author: jeecg-boot
- * @Date:   2025-09-12
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/impl/StudytourImageServiceImpl.java

@@ -16,7 +16,7 @@ import java.util.Collection;
 /**
  * @Description: 图片直播表
  * @Author: jeecg-boot
- * @Date:   2025-09-12
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vo/StudytourImagePage.java

@@ -17,7 +17,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * @Description: 图片直播表
  * @Author: jeecg-boot
- * @Date:   2025-09-12
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @Data

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/StudytourImageList.vue

@@ -176,10 +176,10 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-         fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
-         fieldList.push({type:'Text',value:'address',text:'地址',dictCode:''})
-         fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'})
-         fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
+        fieldList.push({type:'Text',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', 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/studytourImage/vue/modules/StudytourImageForm.vue

@@ -16,12 +16,12 @@
           </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"  />
+              <j-search-select-tag v-model="model.activityId" dict="studytour_activity,title,id" />
             </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"  />
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -30,7 +30,8 @@
       <!-- 子表单区域 -->
     <a-tabs v-model="activeKey" @change="handleChangeTabs">
       <a-tab-pane tab="用户图片直播表" :key="refKeys[0]" :forceRender="true">
-        <j-editable-table
+        <j-vxe-table
+          keep-source
           :ref="refKeys[0]"
           :loading="studytourImageContentTable.loading"
           :columns="studytourImageContentTable.columns"
@@ -39,7 +40,8 @@
           :disabled="formDisabled"
           :rowNumber="true"
           :rowSelection="true"
-          :actionButton="true"/>
+          :toolbar="true"
+          />
       </a-tab-pane>
     </a-tabs>
   </a-spin>
@@ -48,14 +50,17 @@
 <script>
 
   import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise,VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
-  import { JEditableTableModelMixin } from '@/mixins/JEditableTableModelMixin'
+  import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
+  import { JVXETypes } from '@/components/jeecg/JVxeTable'
+  import { getRefPromise,VALIDATE_FAILED} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
   import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
 
   export default {
     name: 'StudytourImageForm',
-    mixins: [JEditableTableModelMixin],
+    mixins: [JVxeTableModelMixin],
     components: {
+      JFormContainer,
     },
     data() {
       return {
@@ -68,7 +73,7 @@
           sm: { span: 16 },
         },
         model:{
-        },
+         },
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
         validatorRules: {
@@ -88,7 +93,7 @@
             {
               title: '图片',
               key: 'image',
-              type: FormTypes.image,
+              type: JVXETypes.image,
               token:true,
               responseName:"message",
               width:"200px",
@@ -98,7 +103,16 @@
             {
               title: '地址',
               key: 'address',
-              type: FormTypes.input,
+               type: JVXETypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '关联活动',
+              key: 'activityId',
+              type: JVXETypes.selectSearch,
+              dictCode:"studytour_activity,title,id",
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
@@ -106,7 +120,7 @@
             {
               title: '关联用户',
               key: 'userId',
-              type: FormTypes.sel_search,
+              type: JVXETypes.selectSearch,
               dictCode:"han_hai_member,nick_name,id",
               width:"200px",
               placeholder: '请输入${title}',
@@ -158,27 +172,27 @@
         }
       },
       //校验所有一对一子表表单
-      validateSubForm(allValues){
-          return new Promise((resolve,reject)=>{
-            Promise.all([
-            ]).then(() => {
-              resolve(allValues)
-            }).catch(e => {
-              if (e.error === VALIDATE_NO_PASSED) {
-                // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
-                this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
-              } else {
-                console.error(e)
-              }
+        validateSubForm(allValues){
+            return new Promise((resolve,reject)=>{
+              Promise.all([
+              ]).then(() => {
+                resolve(allValues)
+              }).catch(e => {
+                if (e.error === VALIDATE_FAILED) {
+                  // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+                  this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
+                } else {
+                  console.error(e)
+                }
+              })
             })
-          })
-      },
+        },
       /** 整理成formData */
       classifyIntoFormData(allValues) {
         let main = Object.assign(this.model, allValues.formValue)
         return {
           ...main, // 展开
-          studytourImageContentList: allValues.tablesValue[0].values,
+          studytourImageContentList: allValues.tablesValue[0].tableData,
         }
       },
       validateError(msg){

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue3/StudytourImage.data.ts

@@ -88,6 +88,15 @@ export const studytourImageContentColumns: JVxeColumn[] = [
       placeholder: '请输入${title}',
       defaultValue:'',
     },
+    {
+      title: '关联活动',
+      key: 'activityId',
+      type: JVxeTypes.selectSearch,
+      dictCode:"studytour_activity,title,id",
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
     {
       title: '关联用户',
       key: 'userId',

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

@@ -0,0 +1,171 @@
+package org.jeecg.modules.studytourNotice.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.studytourNotice.entity.StudytourNotice;
+import org.jeecg.modules.studytourNotice.service.IStudytourNoticeService;
+
+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-16
+ * @Version: V1.0
+ */
+@Api(tags="开营通知表")
+@RestController
+@RequestMapping("/studytourNotice/studytourNotice")
+@Slf4j
+public class StudytourNoticeController extends JeecgController<StudytourNotice, IStudytourNoticeService> {
+	@Autowired
+	private IStudytourNoticeService studytourNoticeService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param studytourNotice
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "开营通知表-分页列表查询")
+	@ApiOperation(value="开营通知表-分页列表查询", notes="开营通知表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<StudytourNotice>> queryPageList(StudytourNotice studytourNotice,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<StudytourNotice> queryWrapper = QueryGenerator.initQueryWrapper(studytourNotice, req.getParameterMap());
+		Page<StudytourNotice> page = new Page<StudytourNotice>(pageNo, pageSize);
+		IPage<StudytourNotice> pageList = studytourNoticeService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param studytourNotice
+	 * @return
+	 */
+	@AutoLog(value = "开营通知表-添加")
+	@ApiOperation(value="开营通知表-添加", notes="开营通知表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody StudytourNotice studytourNotice) {
+		studytourNoticeService.save(studytourNotice);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param studytourNotice
+	 * @return
+	 */
+	@AutoLog(value = "开营通知表-编辑")
+	@ApiOperation(value="开营通知表-编辑", notes="开营通知表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody StudytourNotice studytourNotice) {
+		studytourNoticeService.updateById(studytourNotice);
+		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) {
+		studytourNoticeService.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.studytourNoticeService.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<StudytourNotice> queryById(@RequestParam(name="id",required=true) String id) {
+		StudytourNotice studytourNotice = studytourNoticeService.getById(id);
+		if(studytourNotice==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(studytourNotice);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param studytourNotice
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, StudytourNotice studytourNotice) {
+        return super.exportXls(request, studytourNotice, StudytourNotice.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, StudytourNotice.class);
+    }
+
+}

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

@@ -0,0 +1,64 @@
+package org.jeecg.modules.studytourNotice.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-16
+ * @Version: V1.0
+ */
+@Data
+@TableName("studytour_notice")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="studytour_notice对象", description="开营通知表")
+public class StudytourNotice 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 content;
+	/**是否已读*/
+	@Excel(name = "是否已读", width = 15, dicCode = "is_true")
+	@Dict(dicCode = "is_true")
+    @ApiModelProperty(value = "是否已读")
+    private java.lang.String isRead;
+	/**关联用户*/
+	@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;
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.studytourNotice.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.studytourNotice.entity.StudytourNotice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 开营通知表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-16
+ * @Version: V1.0
+ */
+public interface StudytourNoticeMapper extends BaseMapper<StudytourNotice> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/mapper/xml/StudytourNoticeMapper.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.studytourNotice.mapper.StudytourNoticeMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.studytourNotice.service;
+
+import org.jeecg.modules.studytourNotice.entity.StudytourNotice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 开营通知表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-16
+ * @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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.studytourNotice.service.impl;
+
+import org.jeecg.modules.studytourNotice.entity.StudytourNotice;
+import org.jeecg.modules.studytourNotice.mapper.StudytourNoticeMapper;
+import org.jeecg.modules.studytourNotice.service.IStudytourNoticeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 开营通知表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-16
+ * @Version: V1.0
+ */
+@Service
+public class StudytourNoticeServiceImpl extends ServiceImpl<StudytourNoticeMapper, StudytourNotice> implements IStudytourNoticeService {
+
+}

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

@@ -0,0 +1,185 @@
+<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-notice-modal ref="modalForm" @ok="modalFormOk"></studytour-notice-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import StudytourNoticeModal from './modules/StudytourNoticeModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'StudytourNoticeList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      StudytourNoticeModal
+    },
+    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: 'content',
+            scopedSlots: {customRender: 'htmlSlot'}
+          },
+          {
+            title:'是否已读',
+            align:"center",
+            dataIndex: 'isRead_dictText'
+          },
+          {
+            title:'关联用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/studytourNotice/studytourNotice/list",
+          delete: "/studytourNotice/studytourNotice/delete",
+          deleteBatch: "/studytourNotice/studytourNotice/deleteBatch",
+          exportXlsUrl: "/studytourNotice/studytourNotice/exportXls",
+          importExcelUrl: "studytourNotice/studytourNotice/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:'content',text:'通知信息',dictCode:''})
+        fieldList.push({type:'string',value:'isRead',text:'是否已读',dictCode:'is_true'})
+        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/studytourNotice/vue/modules/StudytourNoticeForm.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="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="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="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: 'StudytourNoticeForm',
+    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: "/studytourNotice/studytourNotice/add",
+          edit: "/studytourNotice/studytourNotice/edit",
+          queryById: "/studytourNotice/studytourNotice/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/studytourImage/vue/modules/StudytourImageModal.Style#Drawer.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <studytour-image-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></studytour-image-form>
+    <studytour-notice-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></studytour-notice-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import StudytourImageForm from './StudytourImageForm'
+  import StudytourNoticeForm from './StudytourNoticeForm'
 
   export default {
-    name: 'StudytourImageModal',
+    name: 'StudytourNoticeModal',
     components: {
-      StudytourImageForm
+      StudytourNoticeForm
     },
     data () {
       return {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeModal.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-notice-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></studytour-notice-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import StudytourNoticeForm from './StudytourNoticeForm'
+  export default {
+    name: 'StudytourNoticeModal',
+    components: {
+      StudytourNoticeForm
+    },
+    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/studytourNotice/vue3/StudytourNotice.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/studytourNotice/studytourNotice/list',
+  save='/studytourNotice/studytourNotice/add',
+  edit='/studytourNotice/studytourNotice/edit',
+  deleteOne = '/studytourNotice/studytourNotice/delete',
+  deleteBatch = '/studytourNotice/studytourNotice/deleteBatch',
+  importExcel = '/studytourNotice/studytourNotice/importExcel',
+  exportXls = '/studytourNotice/studytourNotice/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/studytourNotice/vue3/StudytourNotice.data.ts

@@ -0,0 +1,50 @@
+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: 'content',
+    slots: { customRender: 'htmlSlot' },
+   },
+   {
+    title: '是否已读',
+    align:"center",
+    dataIndex: 'isRead_dictText'
+   },
+   {
+    title: '关联用户',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '通知信息',
+    field: 'content',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+  {
+    label: '是否已读',
+    field: 'isRead',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"is_true"
+     },
+  },
+  {
+    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/studytourNotice/vue3/StudytourNoticeList.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>
+    <!-- 表单区域 -->
+    <StudytourNoticeModal @register="registerModal" @success="handleSuccess"></StudytourNoticeModal>
+  </div>
+</template>
+
+<script lang="ts" name="studytourNotice-studytourNotice" 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 StudytourNoticeModal from './components/StudytourNoticeModal.vue'
+  import {columns, searchFormSchema} from './studytourNotice.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './studytourNotice.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/studytourNotice/vue3/components/StudytourNoticeModal.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 '../studytourNotice.data';
+    import {saveOrUpdate} from '../studytourNotice.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/studytourOrder/controller/StudytourOrderController.java

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

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

@@ -18,7 +18,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-09-10
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @ApiModel(value="studytour_order对象", description="订单信息表")

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-10
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @ApiModel(value="studytour_order_person对象", description="订单人员表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/mapper/StudytourOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-09-10
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 public interface StudytourOrderMapper extends BaseMapper<StudytourOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/mapper/StudytourOrderPersonMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 /**
  * @Description: 订单人员表
  * @Author: jeecg-boot
- * @Date:   2025-09-10
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 public interface StudytourOrderPersonMapper extends BaseMapper<StudytourOrderPerson> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/IStudytourOrderPersonService.java

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * @Description: 订单人员表
  * @Author: jeecg-boot
- * @Date:   2025-09-10
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 public interface IStudytourOrderPersonService extends IService<StudytourOrderPerson> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/IStudytourOrderService.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-09-10
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 public interface IStudytourOrderService extends IService<StudytourOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/impl/StudytourOrderPersonServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 /**
  * @Description: 订单人员表
  * @Author: jeecg-boot
- * @Date:   2025-09-10
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/impl/StudytourOrderServiceImpl.java

@@ -16,7 +16,7 @@ import java.util.Collection;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-09-10
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vo/StudytourOrderPage.java

@@ -17,7 +17,7 @@ import io.swagger.annotations.ApiModelProperty;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-09-10
+ * @Date:   2025-09-16
  * @Version: V1.0
  */
 @Data

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/StudytourOrderList.vue

@@ -251,24 +251,24 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-         fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''})
-         fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
-         fieldList.push({type:'date',value:'startDate',text:'开始日期'})
-         fieldList.push({type:'date',value:'endDate',text:'结束日期'})
-         fieldList.push({type:'int',value:'dayNum',text:'活动天数',dictCode:''})
-         fieldList.push({type:'BigDecimal',value:'priceOrigin',text:'原价',dictCode:''})
-         fieldList.push({type:'BigDecimal',value:'priceDiscount',text:'优惠价',dictCode:''})
-         fieldList.push({type:'BigDecimal',value:'discount',text:'优惠券优惠金额',dictCode:''})
-         fieldList.push({type:'BigDecimal',value:'payAmount',text:'支付金额',dictCode:''})
-         fieldList.push({type:'datetime',value:'payTime',text:'支付时间'})
-         fieldList.push({type:'string',value:'couponId',text:'关联优惠券id',dictCode:''})
-         fieldList.push({type:'string',value:'receiptId',text:'发票类型',dictCode:'receipt_type'})
-         fieldList.push({type:'string',value:'status',text:'订单状态',dictCode:'order_status'})
-         fieldList.push({type:'Text',value:'activityTitle',text:'活动标题',dictCode:''})
-         fieldList.push({type:'Text',value:'activityBrief',text:'活动简介',dictCode:''})
-         fieldList.push({type:'Text',value:'activityTag',text:'活动标签',dictCode:''})
-         fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'})
-         fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
+        fieldList.push({type:'date',value:'startDate',text:'开始日期'})
+        fieldList.push({type:'date',value:'endDate',text:'结束日期'})
+        fieldList.push({type:'int',value:'dayNum',text:'活动天数',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'priceOrigin',text:'原价',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'priceDiscount',text:'优惠价',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'discount',text:'优惠券优惠金额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'payAmount',text:'支付金额',dictCode:''})
+        fieldList.push({type:'datetime',value:'payTime',text:'支付时间'})
+        fieldList.push({type:'string',value:'couponId',text:'关联优惠券id',dictCode:''})
+        fieldList.push({type:'string',value:'receiptId',text:'发票类型',dictCode:'receipt_type'})
+        fieldList.push({type:'string',value:'status',text:'订单状态',dictCode:'order_status'})
+        fieldList.push({type:'Text',value:'activityTitle',text:'活动标题',dictCode:''})
+        fieldList.push({type:'Text',value:'activityBrief',text:'活动简介',dictCode:''})
+        fieldList.push({type:'Text',value:'activityTag',text:'活动标签',dictCode:''})
+        fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', 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/studytourOrder/vue/modules/StudytourOrderForm.vue

@@ -86,12 +86,12 @@
           </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"  />
+              <j-search-select-tag v-model="model.activityId" dict="studytour_activity,title,id" />
             </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"  />
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -100,7 +100,8 @@
       <!-- 子表单区域 -->
     <a-tabs v-model="activeKey" @change="handleChangeTabs">
       <a-tab-pane tab="订单人员表" :key="refKeys[0]" :forceRender="true">
-        <j-editable-table
+        <j-vxe-table
+          keep-source
           :ref="refKeys[0]"
           :loading="studytourOrderPersonTable.loading"
           :columns="studytourOrderPersonTable.columns"
@@ -109,7 +110,8 @@
           :disabled="formDisabled"
           :rowNumber="true"
           :rowSelection="true"
-          :actionButton="true"/>
+          :toolbar="true"
+          />
       </a-tab-pane>
     </a-tabs>
   </a-spin>
@@ -118,14 +120,17 @@
 <script>
 
   import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise,VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
-  import { JEditableTableModelMixin } from '@/mixins/JEditableTableModelMixin'
+  import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
+  import { JVXETypes } from '@/components/jeecg/JVxeTable'
+  import { getRefPromise,VALIDATE_FAILED} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
   import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
 
   export default {
     name: 'StudytourOrderForm',
-    mixins: [JEditableTableModelMixin],
+    mixins: [JVxeTableModelMixin],
     components: {
+      JFormContainer,
     },
     data() {
       return {
@@ -138,7 +143,7 @@
           sm: { span: 16 },
         },
         model:{
-        },
+         },
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
         validatorRules: {
@@ -154,7 +159,7 @@
             {
               title: '姓名',
               key: 'name',
-              type: FormTypes.input,
+               type: JVXETypes.input,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
@@ -162,7 +167,7 @@
             {
               title: '年龄段',
               key: 'period',
-              type: FormTypes.input,
+               type: JVXETypes.input,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
@@ -170,7 +175,7 @@
             {
               title: '年龄段描述',
               key: 'periodDesc',
-              type: FormTypes.input,
+               type: JVXETypes.input,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
@@ -178,7 +183,7 @@
             {
               title: '身份证号',
               key: 'cerNo',
-              type: FormTypes.input,
+               type: JVXETypes.input,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
@@ -186,7 +191,7 @@
             {
               title: '价格',
               key: 'price',
-              type: FormTypes.inputNumber,
+               type: JVXETypes.input,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
@@ -194,7 +199,8 @@
             {
               title: '关联人员id',
               key: 'personId',
-              type: FormTypes.select,
+              type: JVXETypes.select,
+              options:[],
               dictCode:"studytour_person,name,id",
               width:"200px",
               placeholder: '请输入${title}',
@@ -246,27 +252,27 @@
         }
       },
       //校验所有一对一子表表单
-      validateSubForm(allValues){
-          return new Promise((resolve,reject)=>{
-            Promise.all([
-            ]).then(() => {
-              resolve(allValues)
-            }).catch(e => {
-              if (e.error === VALIDATE_NO_PASSED) {
-                // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
-                this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
-              } else {
-                console.error(e)
-              }
+        validateSubForm(allValues){
+            return new Promise((resolve,reject)=>{
+              Promise.all([
+              ]).then(() => {
+                resolve(allValues)
+              }).catch(e => {
+                if (e.error === VALIDATE_FAILED) {
+                  // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+                  this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
+                } else {
+                  console.error(e)
+                }
+              })
             })
-          })
-      },
+        },
       /** 整理成formData */
       classifyIntoFormData(allValues) {
         let main = Object.assign(this.model, allValues.formValue)
         return {
           ...main, // 展开
-          studytourOrderPersonList: allValues.tablesValue[0].values,
+          studytourOrderPersonList: allValues.tablesValue[0].tableData,
         }
       },
       validateError(msg){

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue3/StudytourOrder.api.ts

@@ -9,16 +9,23 @@ enum Api {
   deleteBatch = '/studytourOrder/studytourOrder/deleteBatch',
   importExcel = '/studytourOrder/studytourOrder/importExcel',
   exportXls = '/studytourOrder/studytourOrder/exportXls',
+  studytourOrderPersonList = '/studytourOrder/studytourOrder/queryStudytourOrderPersonByMainId',
 }
 /**
  * 导出api
  * @param params
  */
 export const getExportUrl = Api.exportXls;
+
 /**
  * 导入api
  */
 export const getImportUrl = Api.importExcel;
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const studytourOrderPersonList = Api.studytourOrderPersonList;
 /**
  * 列表接口
  * @param params

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue3/StudytourOrder.data.ts

@@ -2,6 +2,7 @@ import {BasicColumn} from '/@/components/Table';
 import {FormSchema} from '/@/components/Table';
 import { rules} from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
+import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 //列表数据
 export const columns: BasicColumn[] = [
     {
@@ -209,3 +210,57 @@ export const formSchema: FormSchema[] = [
     },
   },
 ];
+//子表单数据
+//子表表格配置
+export const studytourOrderPersonColumns: JVxeColumn[] = [
+    {
+      title: '姓名',
+      key: 'name',
+       type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '年龄段',
+      key: 'period',
+       type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '年龄段描述',
+      key: 'periodDesc',
+       type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '身份证号',
+      key: 'cerNo',
+       type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '价格',
+      key: 'price',
+       type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '关联人员id',
+      key: 'personId',
+      type: JVxeTypes.select,
+      options:[],
+      dictCode:"studytour_person,name,id",
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue3/StudytourOrderList.vue

@@ -42,15 +42,15 @@
 <script lang="ts" name="studytourOrder-studytourOrder" 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 {useModal} from '/@/components/Modal';
   import StudytourOrderModal from './components/StudytourOrderModal.vue'
   import {columns, searchFormSchema} from './studytourOrder.data';
   import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './studytourOrder.api';
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
-  //注册table数据
+   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
            title: '订单信息表',
@@ -58,25 +58,25 @@
            columns,
            canResize:false,
            formConfig: {
-              labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToTime: [
-              ],
+                labelWidth: 120,
+                schemas: searchFormSchema,
+                autoSubmitOnEnter:true,
+                showAdvancedButton:true,
+                fieldMapToTime: [
+                ],
             },
-           actionColumn: {
+            actionColumn: {
                width: 120,
             },
-      },
-       exportConfig: {
+        },
+        exportConfig: {
             name:"订单信息表",
             url: getExportUrl,
-          },
-          importConfig: {
+        },
+        importConfig: {
             url: getImportUrl
-          },
-  })
+        },
+    })
 
   const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
 

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue3/components/StudytourOrderModal.vue

@@ -1,45 +1,90 @@
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
-      <BasicForm @register="registerForm"/>
+      <BasicForm @register="registerForm" ref="formRef"/>
+  <!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" @change="handleChangeTabs">
+      <a-tab-pane tab="订单人员表" :key="refKeys[0]" :forceRender="true">
+        <JVxeTable
+          keep-source
+          resizable
+          :ref="refKeys[0]"
+          :loading="studytourOrderPersonTable.loading"
+          :columns="studytourOrderPersonTable.columns"
+          :dataSource="studytourOrderPersonTable.dataSource"
+          :maxHeight="300"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"
+          />
+      </a-tab-pane>
+    </a-tabs>
   </BasicModal>
 </template>
 
 <script lang="ts" setup>
-    import {ref, computed, unref} from 'vue';
+    import {ref, computed, unref,reactive} from 'vue';
     import {BasicModal, useModalInner} from '/@/components/Modal';
     import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../studytourOrder.data';
-    import {saveOrUpdate} from '../studytourOrder.api';
+    import { JVxeTable } from '/@/components/jeecg/JVxeTable'
+    import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts'
+    import {formSchema,studytourOrderPersonColumns} from '../studytourOrder.data';
+    import {saveOrUpdate,studytourOrderPersonList} from '../studytourOrder.api';
+    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
     // Emits声明
     const emit = defineEmits(['register','success']);
     const isUpdate = ref(true);
+    const refKeys = ref(['studytourOrderPerson', ]);
+    const activeKey = ref('studytourOrderPerson');
+    const studytourOrderPerson = ref();
+    const tableRefs = {studytourOrderPerson, };
+    const studytourOrderPersonTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:studytourOrderPersonColumns
+    })
     //表单配置
     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});
+        await reset();
+        setModalProps({confirmLoading: false,showCancelBtn:data?.showFooter,showOkBtn:data?.showFooter});
         isUpdate.value = !!data?.isUpdate;
         if (unref(isUpdate)) {
             //表单赋值
             await setFieldsValue({
                 ...data.record,
             });
+             requestSubTableData(studytourOrderPersonList, {id:data?.record?.id}, studytourOrderPersonTable)
         }
         // 隐藏底部时禁用整个表单
        setProps({ disabled: !data?.showFooter })
     });
+    //方法配置
+    const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys);
+
     //设置标题
     const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+
+    async function reset(){
+      await resetFields();
+      activeKey.value = 'studytourOrderPerson';
+      studytourOrderPersonTable.dataSource = [];
+    }
+    function classifyIntoFormData(allValues) {
+         let main = Object.assign({}, allValues.formValue)
+         return {
+           ...main, // 展开
+           studytourOrderPersonList: allValues.tablesValue[0].tableData,
+         }
+       }
     //表单提交事件
-    async function handleSubmit(v) {
+    async function requestAddOrEdit(values) {
         try {
-            let values = await validate();
             setModalProps({confirmLoading: true});
             //提交表单
             await saveOrUpdate(values, isUpdate.value);

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/entity/StudytourRecord.java

@@ -4,11 +4,18 @@ 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;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.studytourComment.entity.StudytourComment;
+import org.jeecg.modules.studytourExperience.entity.StudytourExperience;
+import org.jeecg.modules.studytourImage.entity.StudytourImage;
+import org.jeecg.modules.studytourImage.entity.StudytourImageContent;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -77,4 +84,19 @@ public class StudytourRecord implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户")
     private java.lang.String userId;
+
+    //活动掠影
+    @TableField(exist = false)
+    @ApiModelProperty(value = "成长档案外层图片")
+    String imageList;
+
+    //活动掠影
+    @TableField(exist = false)
+    @ApiModelProperty(value = "活动掠影")
+    List<StudytourImageContent> imageContentList;
+
+    //学员心得
+    @TableField(exist = false)
+    @ApiModelProperty(value = "学员心得")
+    List<StudytourExperience> experienceList;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/CommentService.java

@@ -1,4 +1,15 @@
 package org.jeecg.modules.api.service;
 
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.api.bean.PageBean;
+import org.jeecg.modules.studytourComment.entity.StudytourComment;
+
 public interface CommentService {
+
+    //我的评论-查询我的评价列表
+    public Result<?> queryMyCommentList(String token, StudytourComment studytourComment, PageBean pageBean);
+
+    //的订单-添加订单评价
+    public Result<?> addComment(String token, StudytourComment studytourComment);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ExperienceService.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.studytourBindperson.entity.StudytourBindperson;
+import org.jeecg.modules.studytourExperience.entity.StudytourExperience;
 import org.jeecg.modules.studytourRecord.entity.StudytourRecord;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,6 +19,6 @@ public interface ExperienceService {
     public Result<?> queryExperienceById(@RequestHeader("X-Access-Token") String token, String recordId);
 
     //成长档案-新增成长档案
-    public Result<?> addExperience(@RequestHeader("X-Access-Token") String token, StudytourRecord studytourRecord);
+    public Result<?> addExperience(@RequestHeader("X-Access-Token") String token, StudytourExperience studytourExperience);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ImageService.java

@@ -12,16 +12,16 @@ public interface ImageService {
     public Result<?> queryImageList(PageBean pageBean);
 
     //图片直播-新增图片直播信息
-    public Result<?> addImage(@RequestHeader("X-Access-Token") String token, StudytourImage studytourImage);
+    public Result<?> addImage(String token, StudytourImage studytourImage);
 
 
     //图片直播-查询图片直播内容列表
-    public Result<?> queryImageContentList(String imageId, PageBean pageBean);
+    public Result<?> queryImageContentList(StudytourImageContent content, PageBean pageBean);
 
     //图片直播-新增图片直播内容信息
-    public Result<?> addImageContent(@RequestHeader("X-Access-Token") String token, StudytourImageContent studytourImageContent);
+    public Result<?> addImageContent(String token, StudytourImageContent studytourImageContent);
 
     //图片直播-标记有我
-    public Result<?> queryMarkmeList(@RequestHeader("X-Access-Token") String token, String imagePath);
+    public Result<?> queryMarkmeList(String token, String imageId, String imagePath);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/ActivityServiceImpl.java

@@ -20,11 +20,16 @@ import org.jeecg.modules.studytourBanner.entity.StudytourBanner;
 import org.jeecg.modules.studytourBanner.service.IStudytourBannerService;
 import org.jeecg.modules.studytourCollection.entity.StudytourCollection;
 import org.jeecg.modules.studytourCollection.service.IStudytourCollectionService;
+import org.jeecg.modules.studytourComment.entity.StudytourComment;
+import org.jeecg.modules.studytourComment.service.IStudytourCommentService;
+import org.jeecg.modules.studytourOrder.entity.StudytourOrder;
+import org.jeecg.modules.studytourOrder.service.IStudytourOrderService;
 import org.jeecg.modules.studytourPeriod.entity.StudytourPeriod;
 import org.jeecg.modules.studytourPeriod.service.IStudytourPeriodService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -53,6 +58,12 @@ public class ActivityServiceImpl implements ActivityService {
     //研学活动收藏信息
     @Resource
     private IStudytourCollectionService studytourCollectionService;
+    //研学订单信息
+    @Resource
+    private IStudytourOrderService studytourOrderService;
+    //订单评论信息
+    @Resource
+    private IStudytourCommentService studytourCommentService;
     /******************************************************************************************************************/
 
     //首页&分类-查询研学活动列表
@@ -143,6 +154,7 @@ public class ActivityServiceImpl implements ActivityService {
                 return Result.error("研学活动不存在，请检查活动id："+activityId, one);
             }
 
+            //1、活动团期
             List<StudytourActivityDate> dateList = studytourActivityDateService
                     .lambdaQuery()
                     .eq(StudytourActivityDate::getActivityId, activityId)
@@ -176,6 +188,29 @@ public class ActivityServiceImpl implements ActivityService {
                 }
             }
 
+            //2、活动评论
+            //活动订单
+            List<StudytourOrder> orderList = studytourOrderService
+                    .lambdaQuery()
+                    .eq(StudytourOrder::getActivityId, activityId)
+                    .list();
+
+            List<String> ids = new ArrayList<>();
+            for (StudytourOrder studytourOrder : orderList) {
+                ids.add(studytourOrder.getId());
+            }
+
+            List<StudytourComment> commentList = studytourCommentService
+                    .lambdaQuery()
+                    .in(StudytourComment::getOrderId, ids)
+                    .list();
+            for (StudytourComment studytourComment : commentList) {
+                HanHaiMember member = hanHaiMemberService.getById(studytourComment.getUserId());
+                studytourComment.setUser(member);
+            }
+
+            one.setCommentList(commentList);
+
             log.info("研学活动详情查询结束");
             return Result.OK("研学活动详情", one);
         }catch (Exception e){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/CommentServiceImpl.java

@@ -1,6 +1,117 @@
 package org.jeecg.modules.api.service.Impl;
 
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.xwpf.usermodel.TOC;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.api.service.CommentService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.studytourComment.entity.StudytourComment;
+import org.jeecg.modules.studytourComment.service.IStudytourCommentService;
+import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
+@Service
+@Slf4j
 public class CommentServiceImpl implements CommentService {
+
+    /******************************************************************************************************************/
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //用户信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    //订单评价信息
+    @Resource
+    private IStudytourCommentService studytourCommentService;
+    /******************************************************************************************************************/
+
+    //我的评论-查询我的评价列表
+    @Override
+    public Result<?> queryMyCommentList(String token, StudytourComment studytourComment, PageBean pageBean) {
+        log.info("开始查询订单评价列表");
+        //权限验证
+        HanHaiMember hanHaiMember = null;
+        if(StringUtils.isNotEmpty(token)){
+            hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+            //hanHaiMember = hanHaiMemberService.getById(token);
+        }
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<StudytourComment> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<StudytourComment> query = null;
+        //返回信息
+        Page<StudytourComment> pageList = null;
+
+        try{
+            //分页
+            page = new Page<StudytourComment>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = studytourCommentService
+                    .lambdaQuery();
+
+            //组装查询条件
+           
+            //关联用户
+            if(null != hanHaiMember){
+                query.eq(StudytourComment::getUserId, hanHaiMember.getId());
+            }
+
+            //关联订单
+            if(StringUtils.isNotEmpty(studytourComment.getOrderId())){
+                query.eq(StudytourComment::getOrderId, studytourComment.getOrderId());
+            }
+
+            //按照创建时间降序排列
+            query.orderByDesc(StudytourComment::getCreateTime);
+
+            //获取订单评价信息列表
+            pageList = query.page(page);
+
+            log.info("订单评价列表查询结束");
+            return Result.OK("订单评价列表", pageList);
+        }catch (Exception e){
+            log.info("订单评价列表查询失败");
+            e.printStackTrace();
+            return Result.error("订单评价列表查询失败");
+        }
+    }
+
+    //我的订单-添加订单评价
+    @Override
+    public Result<?> addComment(String token, StudytourComment studytourComment) {
+        log.info("开始新增订单评价");
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        //返回信息
+        String massege = "";
+
+        try{
+            //1、新增订单评价
+            studytourComment.setUserId(hanHaiMember.getId());
+            boolean result =  studytourCommentService.save(studytourComment);
+
+            if(result){
+                log.info("订单评价新增成功");
+                return Result.OK("订单评价新增成功");
+            }else {
+                log.info("订单评价新增失败");
+                return Result.error("订单评价新增失败");
+            }
+
+        }catch (Exception e){
+            log.info("订单评价新增失败");
+            e.printStackTrace();
+            return Result.error("订单评价新增失败");
+        }
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/ExperienceServiceImpl.java

@@ -11,7 +11,12 @@ import org.jeecg.modules.api.service.ExperienceService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.studytourBindperson.entity.StudytourBindperson;
+import org.jeecg.modules.studytourExperience.entity.StudytourExperience;
+import org.jeecg.modules.studytourExperience.service.IStudytourExperienceService;
+import org.jeecg.modules.studytourImage.entity.StudytourImage;
 import org.jeecg.modules.studytourImage.entity.StudytourImageContent;
+import org.jeecg.modules.studytourImage.service.IStudytourImageContentService;
+import org.jeecg.modules.studytourImage.service.IStudytourImageService;
 import org.jeecg.modules.studytourRecord.entity.StudytourRecord;
 import org.jeecg.modules.studytourRecord.service.IStudytourRecordService;
 import org.springframework.stereotype.Service;
@@ -30,9 +35,18 @@ public class ExperienceServiceImpl implements ExperienceService {
     //权限验证
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
-    //权限验证
+    //成长档案
     @Resource
     private IStudytourRecordService studytourRecordService;
+    //学员心得
+    @Resource
+    private IStudytourExperienceService studytourExperienceService;
+    //图片直播
+    @Resource
+    private IStudytourImageService studytourImageService;
+    //图片直播内容
+    @Resource
+    private IStudytourImageContentService studytourImageContentService;
     /******************************************************************************************************************/
 
     //成长档案-查询成长档案列表
@@ -40,8 +54,8 @@ public class ExperienceServiceImpl implements ExperienceService {
     public Result<?> queryExperienceList(String token, StudytourRecord studytourRecord, PageBean pageBean) {
         log.info("开始查询成长档案信息列表");
         //权限验证
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
         //返回信息
         String massege = "";
         //分页信息
@@ -68,9 +82,18 @@ public class ExperienceServiceImpl implements ExperienceService {
             //按照创建时间降序排列
             query.orderByDesc(StudytourRecord::getCreateTime);
 
-            //获取图片直播信息列表
+            //获取成长档案信息列表
             pageList = query.page(page);
 
+            //成长档案外层图片同图片直播
+            for (StudytourRecord record : pageList.getRecords()) {
+                StudytourImage image = studytourImageService
+                        .lambdaQuery()
+                        .eq(StudytourImage::getActivityId, record.getActivityId())
+                        .one();
+                record.setImageList(image.getImage());
+            }
+
             log.info("成长档案信息列表查询结束");
             return Result.OK("成长档案信息列表", pageList);
         }catch (Exception e){
@@ -98,6 +121,21 @@ public class ExperienceServiceImpl implements ExperienceService {
                     .eq(StudytourRecord::getUserId, hanHaiMember.getId())
                     .one();
 
+            //活动掠影
+            List<StudytourImageContent> imageContentList = studytourImageContentService
+                    .lambdaQuery()
+                    .eq(StudytourImageContent::getActivityId, one.getActivityId())
+                    .list();
+            one.setImageContentList(imageContentList);
+
+            //学员心得
+            List<StudytourExperience> experienceList = studytourExperienceService
+                    .lambdaQuery()
+                    .eq(StudytourExperience::getActivityId, one.getActivityId())
+                    .eq(StudytourExperience::getUserId, hanHaiMember.getId())
+                    .list();
+            one.setExperienceList(experienceList);
+
             log.info("成长档案详情查询结束");
             return Result.OK("成长档案详情", one);
         }catch (Exception e){
@@ -109,8 +147,8 @@ public class ExperienceServiceImpl implements ExperienceService {
 
     //成长档案-新增成长档案
     @Override
-    public Result<?> addExperience(String token, StudytourRecord studytourRecord) {
-        log.info("开始新增成长档案信息");
+    public Result<?> addExperience(String token, StudytourExperience studytourExperience) {
+        log.info("开始新增学员心得信息");
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
@@ -119,21 +157,21 @@ public class ExperienceServiceImpl implements ExperienceService {
 
         try{
             //1、新增成长档案信息
-            studytourRecord.setUserId(hanHaiMember.getId());
-            boolean result =  studytourRecordService.save(studytourRecord);
+            studytourExperience.setUserId(hanHaiMember.getId());
+            boolean result =  studytourExperienceService.save(studytourExperience);
 
             if(result){
-                log.info("成长档案信息新增成功");
-                return Result.OK("成长档案信息新增成功");
+                log.info("学员心得信息新增成功");
+                return Result.OK("学员心得信息新增成功");
             }else {
-                log.info("成长档案信息新增失败");
-                return Result.error("成长档案信息新增失败");
+                log.info("学员心得信息新增失败");
+                return Result.error("学员心得信息新增失败");
             }
 
         }catch (Exception e){
-            log.info("成长档案信息新增失败");
+            log.info("学员心得信息新增失败");
             e.printStackTrace();
-            return Result.error("成长档案信息新增失败");
+            return Result.error("学员心得信息新增失败");
         }
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/ImageServiceImpl.java

@@ -16,6 +16,8 @@ import org.jeecg.modules.studytourImage.service.IStudytourImageService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 @Slf4j
@@ -103,7 +105,7 @@ public class ImageServiceImpl implements ImageService {
 
     //图片直播-查询图片直播内容列表
     @Override
-    public Result<?> queryImageContentList(String imageId, PageBean pageBean) {
+    public Result<?> queryImageContentList(StudytourImageContent content, PageBean pageBean) {
         log.info("开始查询图片直播内容信息列表");
         //返回信息
         String massege = "";
@@ -121,8 +123,12 @@ public class ImageServiceImpl implements ImageService {
                     .lambdaQuery();
 
             //组装查询条件
-            if(StringUtils.isNotEmpty(imageId)){
-                query.eq(StudytourImageContent::getImageId, imageId);
+            if(StringUtils.isNotEmpty(content.getImageId())){
+                query.eq(StudytourImageContent::getImageId, content.getImageId());
+            }
+
+            if(StringUtils.isNotEmpty(content.getActivityId())){
+                query.eq(StudytourImageContent::getActivityId, content.getActivityId());
             }
 
             //按照创建时间降序排列
@@ -173,7 +179,29 @@ public class ImageServiceImpl implements ImageService {
 
     //图片直播-标记有我
     @Override
-    public Result<?> queryMarkmeList(String token, String imagePath) {
-        return null;
+    public Result<?> queryMarkmeList(String token, String imageId, String imagePath) {
+
+        //返回信息
+        List<String> imageList = new ArrayList<>();
+
+        try{
+            List<StudytourImageContent> contentList = studytourImageContentService
+                    .lambdaQuery()
+                    .eq(StudytourImageContent::getImageId, imageId)
+                    .list();
+
+            //对比图片相似度
+            for (StudytourImageContent studytourImageContent : contentList) {
+                String[] split = studytourImageContent.getImage().split(",");
+                for (String s : split) {
+                    imageList.add(s);
+                }
+
+            }
+            return Result.OK("标记有我图片信息", imageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("标记有我图片信息获取失败");
+        }
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/NoticeServiceImpl.java

@@ -0,0 +1,106 @@
+package org.jeecg.modules.api.service.Impl;
+
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.api.bean.PageBean;
+import org.jeecg.modules.api.service.NoticeService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.studytourComment.entity.StudytourComment;
+import org.jeecg.modules.studytourComment.service.IStudytourCommentService;
+import org.jeecg.modules.studytourCouponUser.entity.StudytourCouponUser;
+import org.jeecg.modules.studytourNotice.entity.StudytourNotice;
+import org.jeecg.modules.studytourNotice.service.IStudytourNoticeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+@Slf4j
+public class NoticeServiceImpl implements NoticeService {
+
+    /******************************************************************************************************************/
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //用户信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    //开营通知信息
+    @Resource
+    private IStudytourNoticeService studytourNoticeService;
+    /******************************************************************************************************************/
+    
+    //开营通知-查询开营通知列表
+    @Override
+    public Result<?> queryNoticeList(String token, StudytourNotice studytourNotice, PageBean pageBean) {
+        log.info("开始查询开营通知列表");
+        //权限验证
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<StudytourNotice> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<StudytourNotice> query = null;
+        //返回信息
+        Page<StudytourNotice> pageList = null;
+
+        try{
+            //分页
+            page = new Page<StudytourNotice>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = studytourNoticeService
+                    .lambdaQuery();
+
+            //组装查询条件
+
+            //关联用户
+            if(null != hanHaiMember){
+                query.eq(StudytourNotice::getUserId, hanHaiMember.getId());
+            }
+
+            //按照创建时间降序排列
+            query.orderByDesc(StudytourNotice::getCreateTime);
+
+            //获取开营通知信息列表
+            pageList = query.page(page);
+
+            log.info("开营通知列表查询结束");
+            return Result.OK("开营通知列表", pageList);
+        }catch (Exception e){
+            log.info("开营通知列表查询失败");
+            e.printStackTrace();
+            return Result.error("开营通知列表查询失败");
+        }
+    }
+
+    //开营通知-查询开营通知详情
+    @Override
+    public Result<?> queryNoticeById(String token, String noticeId) {
+        log.info("开始查询开营通知详情");
+        //权限验证
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        try{
+            StudytourNotice studytourNotice = studytourNoticeService.getById(noticeId);
+            if(null == studytourNotice){
+                return Result.error("开营通知不存在，请检查用户开营通知id：", noticeId);
+            }
+
+            //将开营通知状态改为已读
+            studytourNotice.setIsRead("1");
+            studytourNoticeService.updateById(studytourNotice);
+
+            return Result.OK("开营通知详情", studytourNotice);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("开营通知详情获取失败");
+        }
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/NoticeService.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.api.service;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.api.bean.PageBean;
+import org.jeecg.modules.studytourNotice.entity.StudytourNotice;
+
+public interface NoticeService {
+
+    //开营通知-查询开营通知列表
+    public Result<?> queryNoticeList(String token, StudytourNotice studytourNotice, PageBean pageBean);
+
+    //开营通知-查询开营通知详情
+    public Result<?> queryNoticeById(String token, String noticeId);
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/CommentController.java

@@ -5,29 +5,37 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.bean.PageBean;
-import org.jeecg.modules.studytourActivity.entity.StudytourActivity;
+import org.jeecg.modules.api.service.CommentService;
 import org.jeecg.modules.studytourComment.entity.StudytourComment;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api(tags="评价&&心得-相关接口")
+import javax.annotation.Resource;
+
+@Api(tags="评论-相关接口")
 @RestController
 @RequestMapping("/studytour/comment")
 @Slf4j
 public class CommentController {
 
+    /******************************************************************************************************************/
+    //配置信息
+    @Resource
+    private CommentService commentService;
+    /******************************************************************************************************************/
+
     @ApiOperation(value="我的评论-查询我的评价列表", notes="我的评论-查询我的评价列表")
     @RequestMapping(value = "/queryMyCommentList", method = {RequestMethod.GET})
-    public Result<?> queryMyCommentList(@RequestHeader("X-Access-Token") String token, StudytourComment studytourComment, PageBean pageBean){
-        return Result.OK("接口暂未处理");
+    public Result<?> queryMyCommentList(String token, StudytourComment studytourComment, PageBean pageBean){
+        return commentService.queryMyCommentList(token, studytourComment, pageBean);
     }
 
-    @ApiOperation(value="我的订单&&成长档案-添加订单评价&&添加心得", notes="我的订单&&成长档案-添加订单评价&&添加心得")
+    @ApiOperation(value="我的订单-添加订单评价", notes="我的订单-添加订单评价")
     @RequestMapping(value = "/addComment", method = {RequestMethod.POST})
-    public Result<?> addComment(@RequestHeader("X-Access-Token") String token, StudytourComment studytourComment, PageBean pageBean){
-        return Result.OK("接口暂未处理");
+    public Result<?> addComment(@RequestHeader("X-Access-Token") String token, StudytourComment studytourComment){
+        return commentService.addComment(token, studytourComment);
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ConfigController.java

@@ -7,8 +7,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.api.service.ConfigService;
 import org.jeecg.modules.studytourCategory.entity.StudytourCategory;
-import org.jeecg.modules.studytourComment.entity.StudytourComment;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ExperienceController.java

@@ -6,9 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.bean.PageBean;
 import org.jeecg.modules.api.service.ExperienceService;
-import org.jeecg.modules.api.service.ImageService;
-import org.jeecg.modules.studytourBindperson.entity.StudytourBindperson;
-import org.jeecg.modules.studytourComment.entity.StudytourComment;
+import org.jeecg.modules.studytourExperience.entity.StudytourExperience;
 import org.jeecg.modules.studytourRecord.entity.StudytourRecord;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -41,10 +39,10 @@ public class ExperienceController {
         return experienceService.queryExperienceById(token, recordId);
     }
 
-    @ApiOperation(value="成长档案-新增成长档案", notes="成长档案-新增成长档案")
+    @ApiOperation(value="成长档案-新增学员心得", notes="成长档案-新增学员心得")
     @RequestMapping(value = "/addExperience", method = {RequestMethod.POST})
-    public Result<?> addExperience(@RequestHeader("X-Access-Token") String token, StudytourRecord studytourRecord){
-        return experienceService.addExperience(token, studytourRecord);
+    public Result<?> addExperience(@RequestHeader("X-Access-Token") String token, StudytourExperience studytourExperience){
+        return experienceService.addExperience(token, studytourExperience);
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ImageController.java

@@ -34,29 +34,29 @@ public class ImageController {
     }
 
 
-    @ApiOperation(value="图片直播-新增图片直播信息", notes="图片直播-新增图片直播信息")
-    @RequestMapping(value = "/addImage", method = {RequestMethod.GET})
-    public Result<?> addImage(@RequestHeader("X-Access-Token") String token, StudytourImage studytourImage){
-        return Result.OK("接口暂未处理");
-    }
+//    @ApiOperation(value="图片直播-新增图片直播信息", notes="图片直播-新增图片直播信息")
+//    @RequestMapping(value = "/addImage", method = {RequestMethod.GET})
+//    public Result<?> addImage(@RequestHeader("X-Access-Token") String token, StudytourImage studytourImage){
+//        return Result.OK("接口暂未处理");
+//    }
 
 
     @ApiOperation(value="图片直播-查询图片直播内容列表", notes="图片直播-查询图片直播内容列表")
     @RequestMapping(value = "/queryImageContentList", method = {RequestMethod.GET})
-    public Result<?> queryImageContentList(String imageId, PageBean pageBean){
-        return imageService.queryImageContentList(imageId, pageBean);
+    public Result<?> queryImageContentList(StudytourImageContent content, PageBean pageBean){
+        return imageService.queryImageContentList(content, pageBean);
     }
 
     @ApiOperation(value="图片直播-新增图片直播内容信息", notes="图片直播-新增图片直播内容信息")
     @RequestMapping(value = "/addImageContent", method = {RequestMethod.GET})
     public Result<?> addImageContent(@RequestHeader("X-Access-Token") String token, StudytourImageContent studytourImageContent){
-        return Result.OK("接口暂未处理");
+        return imageService.addImageContent(token, studytourImageContent);
     }
 
     @ApiOperation(value="图片直播-标记有我", notes="图片直播-标记有我")
     @RequestMapping(value = "/queryMarkmeList", method = {RequestMethod.GET})
-    public Result<?> queryMarkmeList(@RequestHeader("X-Access-Token") String token, String imagePath){
-        return Result.OK("接口暂未处理");
+    public Result<?> queryMarkmeList(@RequestHeader("X-Access-Token") String token, String imageId, String imagePath){
+        return imageService.queryMarkmeList(token, imageId, imagePath);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/NoticeController.java

@@ -0,0 +1,41 @@
+package org.jeecg.modules.api.studytourController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.api.bean.PageBean;
+import org.jeecg.modules.api.service.NoticeService;
+import org.jeecg.modules.studytourNotice.entity.StudytourNotice;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags="开营通知-相关接口")
+@RestController
+@RequestMapping("/studytour/notice")
+@Slf4j
+public class NoticeController {
+
+    /******************************************************************************************************************/
+    //配置信息
+    @Resource
+    private NoticeService noticeService;
+    /******************************************************************************************************************/
+
+    @ApiOperation(value="开营通知-查询开营通知列表", notes="开营通知-查询开营通知列表")
+    @RequestMapping(value = "/queryNoticeList", method = {RequestMethod.GET})
+    public Result<?> queryNoticeList(@RequestHeader("X-Access-Token") String token, StudytourNotice studytourNotice, PageBean pageBean){
+        return noticeService.queryNoticeList(token, studytourNotice, pageBean);
+    }
+
+    @ApiOperation(value="开营通知-查询开营通知详情", notes="开营通知-查询开营通知详情")
+    @RequestMapping(value = "/queryNoticeById", method = {RequestMethod.GET})
+    public Result<?> queryNoticeById(@RequestHeader("X-Access-Token") String token, String noticeId){
+        return noticeService.queryNoticeById(token, noticeId);
+    }
+
+}