1

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPaperController.java

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.IgnoreAuth;
 import org.jeecg.modules.applet.service.AppletApiPaperService;
 import org.jeecg.modules.demo.appletPaper.entity.AppletPaper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +28,7 @@ public class AppletApiPaperController {
 
     @GetMapping("/paper")
     @Operation(summary = "试卷查询")
+    @IgnoreAuth
     public Result<List<AppletPaper>> paper(@Parameter(description = "类型【选填】（0已完成，1未完成）") String type){
         return Result.ok(appletApiPaperService.list(type));
     }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiSubscribeController.java

@@ -58,4 +58,26 @@ public class AppletApiSubscribeController {
     public Result<List<AppletHospital>> hospital(@Parameter(description = "商品id") String productId) {
         return Result.OK(appletApiSubscribeService.hospital(productId));
     }
+
+    /**
+     * 预约检测详情
+     * @return 预约检测详情
+     */
+    @AutoLog(value = "预约检测详情")
+    @Operation(summary = "预约检测详情", description = "预约检测详情")
+    @GetMapping(value = "/detail")
+    public Result<AppletSubscribeDetection> detail(@Parameter(description = "预约检测id") String id) {
+        return Result.OK(appletApiSubscribeService.detail(id));
+    }
+
+    /**
+     * 预约检测提交或修改
+     */
+    @AutoLog(value = "预约检测提交或修改")
+    @Operation(summary = "预约检测提交或修改", description = "预约检测提交或修改 id必传")
+    @GetMapping(value = "/submitOrUpdate")
+    public Result<?> submitOrUpdate(AppletSubscribeDetection detection) {
+        appletApiSubscribeService.submitOrUpdate(detection);
+        return Result.OK();
+    }
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiSubscribeService.java

@@ -14,4 +14,7 @@ public interface AppletApiSubscribeService {
 
     List<AppletHospital> hospital(String productId);
 
+    void submitOrUpdate(AppletSubscribeDetection detection);
+
+    AppletSubscribeDetection detail(String id);
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiOrderServiceImpl.java

@@ -392,11 +392,12 @@ public class AppletApiOrderServiceImpl implements AppletApiOrderService {
                 //地址
                 detection.setSendAddress(order.getDeliveryAddress());
                 detection.setSendAddressDetail(order.getDeliveryAddressDetail());
+                detection.setPhone(order.getCustomerPhone());
+                detection.setName(order.getCustomerName());
 
                 appletSubscribeDetectionService.save(detection);
             }
         }
-
     }
 
     /**

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiSubscribeServiceImpl.java

@@ -71,5 +71,16 @@ public class AppletApiSubscribeServiceImpl implements AppletApiSubscribeService
                 .list();
     }
 
+    @Override
+    public void submitOrUpdate(AppletSubscribeDetection detection) {
+        detection.setStatus("1");
+        appletSubscribeDetectionService.updateById(detection);
+    }
+
+    @Override
+    public AppletSubscribeDetection detail(String id) {
+        return appletSubscribeDetectionService.getById(id);
+    }
+
 
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/controller/AppletPaperController.java

@@ -1,38 +1,44 @@
 package org.jeecg.modules.demo.appletPaper.controller;
 
+import java.io.UnsupportedEncodingException;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 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 java.util.HashMap;
+
 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.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.demo.appletPaper.entity.AppletPaper;
-import org.jeecg.modules.demo.appletPaper.service.IAppletPaperService;
-
-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.jeecg.common.system.vo.LoginUser;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsCategory;
+import org.jeecg.modules.demo.appletPaper.entity.AppletPaper;
+import org.jeecg.modules.demo.appletPaper.vo.AppletPaperPage;
+import org.jeecg.modules.demo.appletPaper.service.IAppletPaperService;
+import org.jeecg.modules.demo.appletPaper.service.IAppletQuestionsCategoryService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
+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 com.alibaba.fastjson.JSON;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -41,16 +47,18 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  /**
  * @Description: 试卷
  * @Author: jeecg-boot
- * @Date:   2025-08-19
+ * @Date:   2025-08-20
  * @Version: V1.0
  */
 @Tag(name="试卷")
 @RestController
 @RequestMapping("/appletPaper/appletPaper")
 @Slf4j
-public class AppletPaperController extends JeecgController<AppletPaper, IAppletPaperService> {
+public class AppletPaperController {
 	@Autowired
 	private IAppletPaperService appletPaperService;
+	@Autowired
+	private IAppletQuestionsCategoryService appletQuestionsCategoryService;
 	
 	/**
 	 * 分页列表查询
@@ -68,8 +76,6 @@ public class AppletPaperController extends JeecgController<AppletPaper, IAppletP
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-
-
         QueryWrapper<AppletPaper> queryWrapper = QueryGenerator.initQueryWrapper(appletPaper, req.getParameterMap());
 		Page<AppletPaper> page = new Page<AppletPaper>(pageNo, pageSize);
 		IPage<AppletPaper> pageList = appletPaperService.page(page, queryWrapper);
@@ -79,31 +85,38 @@ public class AppletPaperController extends JeecgController<AppletPaper, IAppletP
 	/**
 	 *   添加
 	 *
-	 * @param appletPaper
+	 * @param appletPaperPage
 	 * @return
 	 */
 	@AutoLog(value = "试卷-添加")
 	@Operation(summary="试卷-添加")
-	@RequiresPermissions("appletPaper:applet_paper:add")
+    @RequiresPermissions("appletPaper:applet_paper:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody AppletPaper appletPaper) {
-		appletPaperService.save(appletPaper);
-
+	public Result<String> add(@RequestBody AppletPaperPage appletPaperPage) {
+		AppletPaper appletPaper = new AppletPaper();
+		BeanUtils.copyProperties(appletPaperPage, appletPaper);
+		appletPaperService.saveMain(appletPaper, appletPaperPage.getAppletQuestionsCategoryList());
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param appletPaper
+	 * @param appletPaperPage
 	 * @return
 	 */
 	@AutoLog(value = "试卷-编辑")
 	@Operation(summary="试卷-编辑")
-	@RequiresPermissions("appletPaper:applet_paper:edit")
+    @RequiresPermissions("appletPaper:applet_paper:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody AppletPaper appletPaper) {
-		appletPaperService.updateById(appletPaper);
+	public Result<String> edit(@RequestBody AppletPaperPage appletPaperPage) {
+		AppletPaper appletPaper = new AppletPaper();
+		BeanUtils.copyProperties(appletPaperPage, appletPaper);
+		AppletPaper appletPaperEntity = appletPaperService.getById(appletPaper.getId());
+		if(appletPaperEntity==null) {
+			return Result.error("未找到对应数据");
+		}
+		appletPaperService.updateMain(appletPaper, appletPaperPage.getAppletQuestionsCategoryList());
 		return Result.OK("编辑成功!");
 	}
 	
@@ -115,10 +128,10 @@ public class AppletPaperController extends JeecgController<AppletPaper, IAppletP
 	 */
 	@AutoLog(value = "试卷-通过id删除")
 	@Operation(summary="试卷-通过id删除")
-	@RequiresPermissions("appletPaper:applet_paper:delete")
+    @RequiresPermissions("appletPaper:applet_paper:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		appletPaperService.removeById(id);
+		appletPaperService.delMain(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -130,11 +143,11 @@ public class AppletPaperController extends JeecgController<AppletPaper, IAppletP
 	 */
 	@AutoLog(value = "试卷-批量删除")
 	@Operation(summary="试卷-批量删除")
-	@RequiresPermissions("appletPaper:applet_paper:deleteBatch")
+    @RequiresPermissions("appletPaper:applet_paper:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.appletPaperService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
+		this.appletPaperService.delBatchMain(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功！");
 	}
 	
 	/**
@@ -152,6 +165,21 @@ public class AppletPaperController extends JeecgController<AppletPaper, IAppletP
 			return Result.error("未找到对应数据");
 		}
 		return Result.OK(appletPaper);
+
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "题目分类通过主表ID查询")
+	@Operation(summary="题目分类主表ID查询")
+	@GetMapping(value = "/queryAppletQuestionsCategoryByMainId")
+	public Result<List<AppletQuestionsCategory>> queryAppletQuestionsCategoryListByMainId(@RequestParam(name="id",required=true) String id) {
+		List<AppletQuestionsCategory> appletQuestionsCategoryList = appletQuestionsCategoryService.selectByMainId(id);
+		return Result.OK(appletQuestionsCategoryList);
 	}
 
     /**
@@ -163,11 +191,41 @@ public class AppletPaperController extends JeecgController<AppletPaper, IAppletP
     @RequiresPermissions("appletPaper:applet_paper:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AppletPaper appletPaper) {
-        return super.exportXls(request, appletPaper, AppletPaper.class, "试卷");
+
+      // Step.1 组装查询条件查询数据
+      QueryWrapper<AppletPaper> queryWrapper = QueryGenerator.initQueryWrapper(appletPaper, request.getParameterMap());
+      LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+      //配置选中数据查询条件
+       String selections = request.getParameter("selections");
+       if(oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            queryWrapper.in("id",selectionList);
+       }
+       //Step.2 获取导出数据
+       List<AppletPaper> appletPaperList = appletPaperService.list(queryWrapper);
+
+      // Step.3 组装pageList
+      List<AppletPaperPage> pageList = new ArrayList<AppletPaperPage>();
+      for (AppletPaper main : appletPaperList) {
+          AppletPaperPage vo = new AppletPaperPage();
+          BeanUtils.copyProperties(main, vo);
+          List<AppletQuestionsCategory> appletQuestionsCategoryList = appletQuestionsCategoryService.selectByMainId(main.getId());
+          vo.setAppletQuestionsCategoryList(appletQuestionsCategoryList);
+          pageList.add(vo);
+      }
+
+      // Step.4 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      mv.addObject(NormalExcelConstants.FILE_NAME, "试卷列表");
+      mv.addObject(NormalExcelConstants.CLASS, AppletPaperPage.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("试卷数据", "导出人:"+sysUser.getRealname(), "试卷"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
     }
 
     /**
-      * 通过excel导入数据
+    * 通过excel导入数据
     *
     * @param request
     * @param response
@@ -176,7 +234,35 @@ public class AppletPaperController extends JeecgController<AppletPaper, IAppletP
     @RequiresPermissions("appletPaper:applet_paper:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, AppletPaper.class);
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          // 获取上传文件对象
+          MultipartFile file = entity.getValue();
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<AppletPaperPage> list = ExcelImportUtil.importExcel(file.getInputStream(), AppletPaperPage.class, params);
+              for (AppletPaperPage page : list) {
+                  AppletPaper po = new AppletPaper();
+                  BeanUtils.copyProperties(page, po);
+                  appletPaperService.saveMain(po, page.getAppletQuestionsCategoryList());
+              }
+              return Result.OK("文件导入成功！数据行数:" + list.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.OK("文件导入失败！");
     }
 
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/controller/AppletQuestionsController.java

@@ -0,0 +1,274 @@
+package org.jeecg.modules.demo.appletPaper.controller;
+
+import java.io.UnsupportedEncodingException;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+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.vo.LoginUser;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsOptions;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestions;
+import org.jeecg.modules.demo.appletPaper.vo.AppletQuestionsPage;
+import org.jeecg.modules.demo.appletPaper.service.IAppletQuestionsService;
+import org.jeecg.modules.demo.appletPaper.service.IAppletQuestionsOptionsService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+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 com.alibaba.fastjson.JSON;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+ /**
+ * @Description: 题目
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+@Tag(name="题目")
+@RestController
+@RequestMapping("/appletPaper/appletQuestions")
+@Slf4j
+public class AppletQuestionsController {
+	@Autowired
+	private IAppletQuestionsService appletQuestionsService;
+	@Autowired
+	private IAppletQuestionsOptionsService appletQuestionsOptionsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param appletQuestions
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "题目-分页列表查询")
+	@Operation(summary="题目-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<AppletQuestions>> queryPageList(AppletQuestions appletQuestions,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+       // 自定义查询规则
+       Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
+       // 自定义多选的查询规则为：LIKE_WITH_OR
+       customeRuleMap.put("type", QueryRuleEnum.LIKE_WITH_OR);
+        QueryWrapper<AppletQuestions> queryWrapper = QueryGenerator.initQueryWrapper(appletQuestions, req.getParameterMap(),customeRuleMap);
+		Page<AppletQuestions> page = new Page<AppletQuestions>(pageNo, pageSize);
+		IPage<AppletQuestions> pageList = appletQuestionsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param appletQuestionsPage
+	 * @return
+	 */
+	@AutoLog(value = "题目-添加")
+	@Operation(summary="题目-添加")
+    @RequiresPermissions("appletPaper:applet_questions:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody AppletQuestionsPage appletQuestionsPage) {
+		AppletQuestions appletQuestions = new AppletQuestions();
+		BeanUtils.copyProperties(appletQuestionsPage, appletQuestions);
+		appletQuestionsService.saveMain(appletQuestions, appletQuestionsPage.getAppletQuestionsOptionsList());
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param appletQuestionsPage
+	 * @return
+	 */
+	@AutoLog(value = "题目-编辑")
+	@Operation(summary="题目-编辑")
+    @RequiresPermissions("appletPaper:applet_questions:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody AppletQuestionsPage appletQuestionsPage) {
+		AppletQuestions appletQuestions = new AppletQuestions();
+		BeanUtils.copyProperties(appletQuestionsPage, appletQuestions);
+		AppletQuestions appletQuestionsEntity = appletQuestionsService.getById(appletQuestions.getId());
+		if(appletQuestionsEntity==null) {
+			return Result.error("未找到对应数据");
+		}
+		appletQuestionsService.updateMain(appletQuestions, appletQuestionsPage.getAppletQuestionsOptionsList());
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "题目-通过id删除")
+	@Operation(summary="题目-通过id删除")
+    @RequiresPermissions("appletPaper:applet_questions:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		appletQuestionsService.delMain(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "题目-批量删除")
+	@Operation(summary="题目-批量删除")
+    @RequiresPermissions("appletPaper:applet_questions:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.appletQuestionsService.delBatchMain(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功！");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "题目-通过id查询")
+	@Operation(summary="题目-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<AppletQuestions> queryById(@RequestParam(name="id",required=true) String id) {
+		AppletQuestions appletQuestions = appletQuestionsService.getById(id);
+		if(appletQuestions==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(appletQuestions);
+
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "题目选项-通过主表ID查询")
+	@Operation(summary="题目选项-通过主表ID查询")
+	@GetMapping(value = "/queryAppletQuestionsOptionsByMainId")
+	public Result<IPage<AppletQuestionsOptions>> queryAppletQuestionsOptionsListByMainId(@RequestParam(name="id",required=true) String id) {
+		List<AppletQuestionsOptions> appletQuestionsOptionsList = appletQuestionsOptionsService.selectByMainId(id);
+		IPage <AppletQuestionsOptions> page = new Page<>();
+		page.setRecords(appletQuestionsOptionsList);
+		page.setTotal(appletQuestionsOptionsList.size());
+		return Result.OK(page);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param appletQuestions
+    */
+    @RequiresPermissions("appletPaper:applet_questions:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, AppletQuestions appletQuestions) {
+      // Step.1 组装查询条件查询数据
+      QueryWrapper<AppletQuestions> queryWrapper = QueryGenerator.initQueryWrapper(appletQuestions, request.getParameterMap());
+      LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+     //配置选中数据查询条件
+      String selections = request.getParameter("selections");
+      if(oConvertUtils.isNotEmpty(selections)) {
+           List<String> selectionList = Arrays.asList(selections.split(","));
+           queryWrapper.in("id",selectionList);
+      }
+      //Step.2 获取导出数据
+      List<AppletQuestions>  appletQuestionsList = appletQuestionsService.list(queryWrapper);
+
+      // Step.3 组装pageList
+      List<AppletQuestionsPage> pageList = new ArrayList<AppletQuestionsPage>();
+      for (AppletQuestions main : appletQuestionsList) {
+          AppletQuestionsPage vo = new AppletQuestionsPage();
+          BeanUtils.copyProperties(main, vo);
+          List<AppletQuestionsOptions> appletQuestionsOptionsList = appletQuestionsOptionsService.selectByMainId(main.getId());
+          vo.setAppletQuestionsOptionsList(appletQuestionsOptionsList);
+          pageList.add(vo);
+      }
+
+      // Step.4 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      mv.addObject(NormalExcelConstants.FILE_NAME, "题目列表");
+      mv.addObject(NormalExcelConstants.CLASS, AppletQuestionsPage.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("题目数据", "导出人:"+sysUser.getRealname(), "题目"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+    }
+
+    /**
+    * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("appletPaper:applet_questions:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          // 获取上传文件对象
+          MultipartFile file = entity.getValue();
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<AppletQuestionsPage> list = ExcelImportUtil.importExcel(file.getInputStream(), AppletQuestionsPage.class, params);
+              for (AppletQuestionsPage page : list) {
+                  AppletQuestions po = new AppletQuestions();
+                  BeanUtils.copyProperties(page, po);
+                  appletQuestionsService.saveMain(po, page.getAppletQuestionsOptionsList());
+              }
+              return Result.OK("文件导入成功！数据行数:" + list.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.OK("文件导入失败！");
+    }
+
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletPaper.java

@@ -3,7 +3,6 @@ package org.jeecg.modules.demo.appletPaper.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;
@@ -15,21 +14,18 @@ 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.v3.oas.annotations.media.Schema;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 /**
  * @Description: 试卷
  * @Author: jeecg-boot
- * @Date:   2025-08-19
+ * @Date:   2025-08-20
  * @Version: V1.0
  */
+@Schema(description="试卷")
 @Data
 @TableName("applet_paper")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@Schema(description="试卷")
 public class AppletPaper implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -60,4 +56,16 @@ public class AppletPaper implements Serializable {
 	@Excel(name = "试卷名称", width = 15)
     @Schema(description = "试卷名称")
     private java.lang.String title;
+	/**英文名称*/
+	@Excel(name = "英文名称", width = 15)
+    @Schema(description = "英文名称")
+    private java.lang.String enTitle;
+	/**小提示*/
+	@Excel(name = "小提示", width = 15)
+    @Schema(description = "小提示")
+    private java.lang.String tips;
+	/**总分*/
+	@Excel(name = "总分", width = 15)
+    @Schema(description = "总分")
+    private java.lang.String score;
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletQuestions.java

@@ -0,0 +1,76 @@
+package org.jeecg.modules.demo.appletPaper.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+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.v3.oas.annotations.media.Schema;
+
+/**
+ * @Description: 题目
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+@Schema(description="题目")
+@Data
+@TableName("applet_questions")
+public class AppletQuestions implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @Schema(description = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @Schema(description = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**类型*/
+	@Excel(name = "类型", width = 15, dicCode = "applett_topic_type")
+    @Dict(dicCode = "applett_topic_type")
+    @Schema(description = "类型")
+    private java.lang.String type;
+	/**标题*/
+	@Excel(name = "标题", width = 15)
+    @Schema(description = "标题")
+    private java.lang.String text;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+    @Schema(description = "描述")
+    private java.lang.String content;
+	/**必填*/
+    @Excel(name = "必填", width = 15,replace = {"是_Y","否_N"} )
+    @Schema(description = "必填")
+    private java.lang.String required;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @Schema(description = "备注")
+    private java.lang.String remark;
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletQuestionsCategory.java

@@ -0,0 +1,73 @@
+package org.jeecg.modules.demo.appletPaper.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import java.util.Date;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @Description: 题目分类
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+@Schema(description="题目分类")
+@Data
+@TableName("applet_questions_category")
+public class AppletQuestionsCategory implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @Schema(description = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @Schema(description = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**分类名称*/
+	@Excel(name = "分类名称", width = 15)
+    @Schema(description = "分类名称")
+    private java.lang.String title;
+	/**英文名称*/
+	@Excel(name = "英文名称", width = 15)
+    @Schema(description = "英文名称")
+    private java.lang.String enTitle;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+    @Schema(description = "排序")
+    private java.lang.Integer sort;
+	/**试卷*/
+    @Schema(description = "试卷")
+    private java.lang.String paperId;
+	/**题目*/
+	@Excel(name = "题目", width = 15, dictTable = "applet_questions", dicText = "text", dicCode = "id")
+    @Schema(description = "题目")
+    private java.lang.String questionsId;
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletQuestionsOptions.java

@@ -0,0 +1,78 @@
+package org.jeecg.modules.demo.appletPaper.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import java.util.Date;
+import org.jeecg.common.aspect.annotation.Dict;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @Description: 题目选项
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+@Schema(description="题目选项")
+@Data
+@TableName("applet_questions_options")
+public class AppletQuestionsOptions implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @Schema(description = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @Schema(description = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**选项内容*/
+	@Excel(name = "选项内容", width = 15)
+    @Schema(description = "选项内容")
+    private java.lang.String content;
+	/**绑定题目*/
+    @Schema(description = "绑定题目")
+    private java.lang.String questionId;
+	/**前缀文字*/
+	@Excel(name = "前缀文字", width = 15)
+    @Schema(description = "前缀文字")
+    private java.lang.String prefix;
+	/**后缀文字*/
+	@Excel(name = "后缀文字", width = 15)
+    @Schema(description = "后缀文字")
+    private java.lang.String suffix;
+	/**选中前图片*/
+	@Excel(name = "选中前图片", width = 15)
+    @Schema(description = "选中前图片")
+    private java.lang.String image;
+	/**选中后图片*/
+	@Excel(name = "选中后图片", width = 15)
+    @Schema(description = "选中后图片")
+    private java.lang.String imageAfter;
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletPaperMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 试卷
  * @Author: jeecg-boot
- * @Date:   2025-08-19
+ * @Date:   2025-08-20
  * @Version: V1.0
  */
 public interface AppletPaperMapper extends BaseMapper<AppletPaper> {

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletQuestionsCategoryMapper.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.demo.appletPaper.mapper;
+
+import java.util.List;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Description: 题目分类
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+public interface AppletQuestionsCategoryMapper extends BaseMapper<AppletQuestionsCategory> {
+
+	/**
+	 * 通过主表id删除子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return boolean
+	 */
+	public boolean deleteByMainId(@Param("mainId") String mainId);
+
+  /**
+   * 通过主表id查询子表数据
+   *
+   * @param mainId 主表id
+   * @return List<AppletQuestionsCategory>
+   */
+	public List<AppletQuestionsCategory> selectByMainId(@Param("mainId") String mainId);
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletQuestionsMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.demo.appletPaper.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestions;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 题目
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+public interface AppletQuestionsMapper extends BaseMapper<AppletQuestions> {
+
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletQuestionsOptionsMapper.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.demo.appletPaper.mapper;
+
+import java.util.List;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsOptions;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Description: 题目选项
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+public interface AppletQuestionsOptionsMapper extends BaseMapper<AppletQuestionsOptions> {
+
+	/**
+	 * 通过主表id删除子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return boolean
+	 */
+	public boolean deleteByMainId(@Param("mainId") String mainId);
+
+  /**
+   * 通过主表id查询子表数据
+   *
+   * @param mainId 主表id
+   * @return List<AppletQuestionsOptions>
+   */
+	public List<AppletQuestionsOptions> selectByMainId(@Param("mainId") String mainId);
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsCategoryMapper.xml

@@ -0,0 +1,16 @@
+<?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.demo.appletPaper.mapper.AppletQuestionsCategoryMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  applet_questions_category 
+		WHERE
+			 paper_id = #{mainId} 	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsCategory">
+		SELECT * 
+		FROM  applet_questions_category
+		WHERE
+			 paper_id = #{mainId} 	</select>
+</mapper>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsMapper.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.demo.appletPaper.mapper.AppletQuestionsMapper">
+
+</mapper>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsOptionsMapper.xml

@@ -0,0 +1,16 @@
+<?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.demo.appletPaper.mapper.AppletQuestionsOptionsMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  applet_questions_options 
+		WHERE
+			 question_id = #{mainId} 	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsOptions">
+		SELECT * 
+		FROM  applet_questions_options
+		WHERE
+			 question_id = #{mainId} 	</select>
+</mapper>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletPaperService.java

@@ -1,14 +1,48 @@
 package org.jeecg.modules.demo.appletPaper.service;
 
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsCategory;
 import org.jeecg.modules.demo.appletPaper.entity.AppletPaper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * @Description: 试卷
  * @Author: jeecg-boot
- * @Date:   2025-08-19
+ * @Date:   2025-08-20
  * @Version: V1.0
  */
 public interface IAppletPaperService extends IService<AppletPaper> {
 
+	/**
+	 * 添加一对多
+	 *
+	 * @param appletPaper
+	 * @param appletQuestionsCategoryList
+	 */
+	public void saveMain(AppletPaper appletPaper,List<AppletQuestionsCategory> appletQuestionsCategoryList) ;
+	
+	/**
+	 * 修改一对多
+	 *
+	 * @param appletPaper
+	 * @param appletQuestionsCategoryList
+	 */
+	public void updateMain(AppletPaper appletPaper,List<AppletQuestionsCategory> appletQuestionsCategoryList);
+	
+	/**
+	 * 删除一对多
+	 *
+	 * @param id
+	 */
+	public void delMain (String id);
+	
+	/**
+	 * 批量删除一对多
+	 *
+	 * @param idList
+	 */
+	public void delBatchMain (Collection<? extends Serializable> idList);
+	
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletQuestionsCategoryService.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.demo.appletPaper.service;
+
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsCategory;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 题目分类
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+public interface IAppletQuestionsCategoryService extends IService<AppletQuestionsCategory> {
+
+	/**
+	 * 通过主表id查询子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return List<AppletQuestionsCategory>
+	 */
+	public List<AppletQuestionsCategory> selectByMainId(String mainId);
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletQuestionsOptionsService.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.demo.appletPaper.service;
+
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsOptions;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 题目选项
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+public interface IAppletQuestionsOptionsService extends IService<AppletQuestionsOptions> {
+
+	/**
+	 * 通过主表id查询子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return List<AppletQuestionsOptions>
+	 */
+	public List<AppletQuestionsOptions> selectByMainId(String mainId);
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletQuestionsService.java

@@ -0,0 +1,48 @@
+package org.jeecg.modules.demo.appletPaper.service;
+
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsOptions;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestions;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @Description: 题目
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+public interface IAppletQuestionsService extends IService<AppletQuestions> {
+
+	/**
+	 * 添加一对多
+	 *
+	 * @param appletQuestions
+	 * @param appletQuestionsOptionsList
+	 */
+	public void saveMain(AppletQuestions appletQuestions,List<AppletQuestionsOptions> appletQuestionsOptionsList) ;
+	
+	/**
+	 * 修改一对多
+	 *
+	 * @param appletQuestions
+	 * @param appletQuestionsOptionsList
+	 */
+	public void updateMain(AppletQuestions appletQuestions,List<AppletQuestionsOptions> appletQuestionsOptionsList);
+	
+	/**
+	 * 删除一对多
+	 *
+	 * @param id
+	 */
+	public void delMain (String id);
+	
+	/**
+	 * 批量删除一对多
+	 *
+	 * @param idList
+	 */
+	public void delBatchMain (Collection<? extends Serializable> idList);
+	
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletPaperServiceImpl.java

@@ -1,19 +1,77 @@
 package org.jeecg.modules.demo.appletPaper.service.impl;
 
 import org.jeecg.modules.demo.appletPaper.entity.AppletPaper;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsCategory;
+import org.jeecg.modules.demo.appletPaper.mapper.AppletQuestionsCategoryMapper;
 import org.jeecg.modules.demo.appletPaper.mapper.AppletPaperMapper;
 import org.jeecg.modules.demo.appletPaper.service.IAppletPaperService;
 import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Collection;
 
 /**
  * @Description: 试卷
  * @Author: jeecg-boot
- * @Date:   2025-08-19
+ * @Date:   2025-08-20
  * @Version: V1.0
  */
 @Service
 public class AppletPaperServiceImpl extends ServiceImpl<AppletPaperMapper, AppletPaper> implements IAppletPaperService {
 
+	@Autowired
+	private AppletPaperMapper appletPaperMapper;
+	@Autowired
+	private AppletQuestionsCategoryMapper appletQuestionsCategoryMapper;
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void saveMain(AppletPaper appletPaper, List<AppletQuestionsCategory> appletQuestionsCategoryList) {
+		appletPaperMapper.insert(appletPaper);
+		if(appletQuestionsCategoryList!=null && appletQuestionsCategoryList.size()>0) {
+			for(AppletQuestionsCategory entity:appletQuestionsCategoryList) {
+				//外键设置
+				entity.setPaperId(appletPaper.getId());
+				appletQuestionsCategoryMapper.insert(entity);
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateMain(AppletPaper appletPaper,List<AppletQuestionsCategory> appletQuestionsCategoryList) {
+		appletPaperMapper.updateById(appletPaper);
+		
+		//1.先删除子表数据
+		appletQuestionsCategoryMapper.deleteByMainId(appletPaper.getId());
+		
+		//2.子表数据重新插入
+		if(appletQuestionsCategoryList!=null && appletQuestionsCategoryList.size()>0) {
+			for(AppletQuestionsCategory entity:appletQuestionsCategoryList) {
+				//外键设置
+				entity.setPaperId(appletPaper.getId());
+				appletQuestionsCategoryMapper.insert(entity);
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delMain(String id) {
+		appletQuestionsCategoryMapper.deleteByMainId(id);
+		appletPaperMapper.deleteById(id);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delBatchMain(Collection<? extends Serializable> idList) {
+		for(Serializable id:idList) {
+			appletQuestionsCategoryMapper.deleteByMainId(id.toString());
+			appletPaperMapper.deleteById(id);
+		}
+	}
+	
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletQuestionsCategoryServiceImpl.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.demo.appletPaper.service.impl;
+
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsCategory;
+import org.jeecg.modules.demo.appletPaper.mapper.AppletQuestionsCategoryMapper;
+import org.jeecg.modules.demo.appletPaper.service.IAppletQuestionsCategoryService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 题目分类
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+@Service
+public class AppletQuestionsCategoryServiceImpl extends ServiceImpl<AppletQuestionsCategoryMapper, AppletQuestionsCategory> implements IAppletQuestionsCategoryService {
+	
+	@Autowired
+	private AppletQuestionsCategoryMapper appletQuestionsCategoryMapper;
+	
+	@Override
+	public List<AppletQuestionsCategory> selectByMainId(String mainId) {
+		return appletQuestionsCategoryMapper.selectByMainId(mainId);
+	}
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletQuestionsOptionsServiceImpl.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.demo.appletPaper.service.impl;
+
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsOptions;
+import org.jeecg.modules.demo.appletPaper.mapper.AppletQuestionsOptionsMapper;
+import org.jeecg.modules.demo.appletPaper.service.IAppletQuestionsOptionsService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 题目选项
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+@Service
+public class AppletQuestionsOptionsServiceImpl extends ServiceImpl<AppletQuestionsOptionsMapper, AppletQuestionsOptions> implements IAppletQuestionsOptionsService {
+	
+	@Autowired
+	private AppletQuestionsOptionsMapper appletQuestionsOptionsMapper;
+	
+	@Override
+	public List<AppletQuestionsOptions> selectByMainId(String mainId) {
+		return appletQuestionsOptionsMapper.selectByMainId(mainId);
+	}
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletQuestionsServiceImpl.java

@@ -0,0 +1,77 @@
+package org.jeecg.modules.demo.appletPaper.service.impl;
+
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestions;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsOptions;
+import org.jeecg.modules.demo.appletPaper.mapper.AppletQuestionsOptionsMapper;
+import org.jeecg.modules.demo.appletPaper.mapper.AppletQuestionsMapper;
+import org.jeecg.modules.demo.appletPaper.service.IAppletQuestionsService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Collection;
+
+/**
+ * @Description: 题目
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+@Service
+public class AppletQuestionsServiceImpl extends ServiceImpl<AppletQuestionsMapper, AppletQuestions> implements IAppletQuestionsService {
+
+	@Autowired
+	private AppletQuestionsMapper appletQuestionsMapper;
+	@Autowired
+	private AppletQuestionsOptionsMapper appletQuestionsOptionsMapper;
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void saveMain(AppletQuestions appletQuestions, List<AppletQuestionsOptions> appletQuestionsOptionsList) {
+		appletQuestionsMapper.insert(appletQuestions);
+		if(appletQuestionsOptionsList!=null && appletQuestionsOptionsList.size()>0) {
+			for(AppletQuestionsOptions entity:appletQuestionsOptionsList) {
+				//外键设置
+				entity.setQuestionId(appletQuestions.getId());
+				appletQuestionsOptionsMapper.insert(entity);
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateMain(AppletQuestions appletQuestions,List<AppletQuestionsOptions> appletQuestionsOptionsList) {
+		appletQuestionsMapper.updateById(appletQuestions);
+		
+		//1.先删除子表数据
+		appletQuestionsOptionsMapper.deleteByMainId(appletQuestions.getId());
+		
+		//2.子表数据重新插入
+		if(appletQuestionsOptionsList!=null && appletQuestionsOptionsList.size()>0) {
+			for(AppletQuestionsOptions entity:appletQuestionsOptionsList) {
+				//外键设置
+				entity.setQuestionId(appletQuestions.getId());
+				appletQuestionsOptionsMapper.insert(entity);
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delMain(String id) {
+		appletQuestionsOptionsMapper.deleteByMainId(id);
+		appletQuestionsMapper.deleteById(id);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delBatchMain(Collection<? extends Serializable> idList) {
+		for(Serializable id:idList) {
+			appletQuestionsOptionsMapper.deleteByMainId(id.toString());
+			appletQuestionsMapper.deleteById(id);
+		}
+	}
+	
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vo/AppletPaperPage.java

@@ -0,0 +1,72 @@
+package org.jeecg.modules.demo.appletPaper.vo;
+
+import java.util.List;
+import org.jeecg.modules.demo.appletPaper.entity.AppletPaper;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsCategory;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelEntity;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * @Description: 试卷
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+@Data
+@Schema(description="试卷")
+public class AppletPaperPage {
+
+	/**主键*/
+	@Schema(description = "主键")
+    private java.lang.String id;
+	/**创建人*/
+	@Schema(description = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+	@Schema(description = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+	@Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**试卷名称*/
+	@Excel(name = "试卷名称", width = 15)
+	@Schema(description = "试卷名称")
+    private java.lang.String title;
+	/**英文名称*/
+	@Excel(name = "英文名称", width = 15)
+	@Schema(description = "英文名称")
+    private java.lang.String enTitle;
+	/**小提示*/
+	@Excel(name = "小提示", width = 15)
+	@Schema(description = "小提示")
+    private java.lang.String tips;
+	/**总分*/
+	@Excel(name = "总分", width = 15)
+	@Schema(description = "总分")
+    private java.lang.String score;
+
+	@ExcelCollection(name="题目分类")
+	@Schema(description = "题目分类")
+	private List<AppletQuestionsCategory> appletQuestionsCategoryList;
+
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vo/AppletQuestionsPage.java

@@ -0,0 +1,77 @@
+package org.jeecg.modules.demo.appletPaper.vo;
+
+import java.util.List;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestions;
+import org.jeecg.modules.demo.appletPaper.entity.AppletQuestionsOptions;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelEntity;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * @Description: 题目
+ * @Author: jeecg-boot
+ * @Date:   2025-08-20
+ * @Version: V1.0
+ */
+@Data
+@Schema(description="题目")
+public class AppletQuestionsPage {
+
+	/**主键*/
+	@Schema(description = "主键")
+    private java.lang.String id;
+	/**创建人*/
+	@Schema(description = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+	@Schema(description = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+	@Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**类型*/
+	@Excel(name = "类型", width = 15, dicCode = "applett_topic_type")
+    @Dict(dicCode = "applett_topic_type")
+	@Schema(description = "类型")
+    private java.lang.String type;
+	/**标题*/
+	@Excel(name = "标题", width = 15)
+	@Schema(description = "标题")
+    private java.lang.String text;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+	@Schema(description = "描述")
+    private java.lang.String content;
+	/**必填*/
+	@Schema(description = "必填")
+    @Excel(name = "必填", width = 15,replace = {"是_Y","否_N"} )
+    private java.lang.String required;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+	@Schema(description = "备注")
+    private java.lang.String remark;
+	
+	@ExcelCollection(name="题目选项")
+	@Schema(description = "题目选项")
+	private List<AppletQuestionsOptions> appletQuestionsOptionsList;
+	
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.api.ts

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

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.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'
 import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
@@ -10,6 +11,21 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'title'
    },
+   {
+    title: '英文名称',
+    align:"center",
+    dataIndex: 'enTitle'
+   },
+   {
+    title: '小提示',
+    align:"center",
+    dataIndex: 'tips'
+   },
+   {
+    title: '总分',
+    align:"center",
+    dataIndex: 'score'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -20,6 +36,21 @@ export const formSchema: FormSchema[] = [
     label: '试卷名称',
     field: 'title',
     component: 'Input',
+  },
+  {
+    label: '英文名称',
+    field: 'enTitle',
+    component: 'Input',
+  },
+  {
+    label: '小提示',
+    field: 'tips',
+    component: 'Input',
+  },
+  {
+    label: '总分',
+    field: 'score',
+    component: 'Input',
   },
 	// TODO 主键隐藏字段，目前写死为ID
 	{
@@ -29,17 +60,60 @@ export const formSchema: FormSchema[] = [
 	  show: false
 	},
 ];
+//子表单数据
+//子表表格配置
+export const appletQuestionsCategoryColumns: JVxeColumn[] = [
+    {
+      title: '分类名称',
+      key: 'title',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '英文名称',
+      key: 'enTitle',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '排序',
+      key: 'sort',
+      type: JVxeTypes.inputNumber,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '题目',
+      key: 'questionsId',
+      type: JVxeTypes.selectMultiple,
+      options:[],
+      dictCode:"applet_questions,text,id",
+      width:"250px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
 
 // 高级查询数据
 export const superQuerySchema = {
   title: {title: '试卷名称',order: 0,view: 'text', type: 'string',},
+  enTitle: {title: '英文名称',order: 1,view: 'text', type: 'string',},
+  tips: {title: '小提示',order: 2,view: 'text', type: 'string',},
+  score: {title: '总分',order: 3,view: 'text', type: 'string',},
+  //子表高级查询
+  appletQuestionsCategory: {
+    title: '题目分类',
+    view: 'table',
+    fields: {
+        title: {title: '分类名称',order: 0,view: 'text', type: 'string',},
+        enTitle: {title: '英文名称',order: 1,view: 'text', type: 'string',},
+        sort: {title: '排序',order: 2,view: 'number', type: 'number',},
+        questionsId: {title: '题目',order: 3,view: 'list_multi', type: 'string',dictTable: "applet_questions", dictCode: 'id', dictText: 'text',},
+    }
+  },
 };
-
-/**
-* 流程表单调用这个方法获取formSchema
-* @param param
-*/
-export function getBpmFormSchema(_formData): FormSchema[]{
-  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
-  return formSchema;
-}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaperList.vue

@@ -4,10 +4,9 @@
    <BasicTable @register="registerTable" :rowSelection="rowSelection">
      <!--插槽:table标题-->
       <template #tableTitle>
-          <a-button type="primary" v-auth="'appletPaper:applet_paper:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" v-auth="'appletPaper:applet_paper:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button type="primary" v-auth="'appletPaper:applet_paper:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-
+          <a-button type="primary" v-auth="'appletPaper:applet_paper:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'appletPaper:applet_paper:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'appletPaper:applet_paper:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
                 <a-menu>
@@ -40,12 +39,12 @@
 <script lang="ts" name="appletPaper-appletPaper" setup>
   import {ref, reactive, 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 AppletPaperModal from './components/AppletPaperModal.vue'
   import {columns, searchFormSchema, superQuerySchema} from './AppletPaper.data';
   import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './AppletPaper.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
+  import {downloadFile} from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getDateByPicker } from '/@/utils';
@@ -53,12 +52,12 @@
   const fieldPickers = reactive({
   });
   const queryParam = reactive<any>({});
-  const checkedKeys = ref<Array<string | number>>([]);
   const userStore = useUserStore();
   const { createMessage } = useMessage();
+  const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
-  //注册table数据
+   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
            title: '试卷',
@@ -66,40 +65,40 @@
            columns,
            canResize:true,
            formConfig: {
-              //labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToNumber: [
-              ],
-              fieldMapToTime: [
-              ],
+                //labelWidth: 120,
+                schemas: searchFormSchema,
+                autoSubmitOnEnter:true,
+                showAdvancedButton:true,
+                fieldMapToNumber: [
+                ],
+                fieldMapToTime: [
+                ],
             },
            actionColumn: {
                width: 120,
                fixed:'right'
-            },
-            beforeFetch: (params) => {
+           },
+           beforeFetch: (params) => {
               if (params && fieldPickers) {
-                for (let key in fieldPickers) {
-                  if (params[key]) {
-                    params[key] = getDateByPicker(params[key], fieldPickers[key]);
+                  for (let key in fieldPickers) {
+                      if (params[key]) {
+                          params[key] = getDateByPicker(params[key], fieldPickers[key]);
+                      }
                   }
-                }
               }
-              return Object.assign(params, queryParam);
-            },
-      },
-       exportConfig: {
+             return Object.assign(params, queryParam);
+           },
+        },
+        exportConfig: {
             name:"试卷",
             url: getExportUrl,
             params: queryParam,
-          },
-          importConfig: {
+        },
+        importConfig: {
             url: getImportUrl,
             success: handleSuccess
-          },
-  })
+        },
+    })
 
   const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
 
@@ -174,27 +173,28 @@
          }
        ]
    }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-       return [
-         {
-           label: '详情',
-           onClick: handleDetail.bind(null, record),
-         }, {
-           label: '删除',
-           popConfirm: {
-             title: '是否确认删除',
-             confirm: handleDelete.bind(null, record),
-             placement: 'topLeft',
-           },
-           auth: 'appletPaper:applet_paper:delete'
-         }
-       ]
-   }
 
 
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record){
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft'
+        },
+        auth: 'appletPaper:applet_paper:delete'
+      }
+    ]
+  }
+
 
 
 </script>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletQuestions.api.ts

@@ -0,0 +1,77 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/appletPaper/appletQuestions/list',
+  save='/appletPaper/appletQuestions/add',
+  edit='/appletPaper/appletQuestions/edit',
+  deleteOne = '/appletPaper/appletQuestions/delete',
+  deleteBatch = '/appletPaper/appletQuestions/deleteBatch',
+  importExcel = '/appletPaper/appletQuestions/importExcel',
+  exportXls = '/appletPaper/appletQuestions/exportXls',
+  appletQuestionsOptionsList = '/appletPaper/appletQuestions/queryAppletQuestionsOptionsByMainId',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 子表单查询接口
+ * @param params
+ */
+export const queryAppletQuestionsOptions = Api.appletQuestionsOptionsList
+/**
+ * 列表接口
+ * @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) => {
+  createConfirm({
+    iconType: 'warning',
+    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});
+}
+/**
+ * 子表列表接口
+ * @param params
+ */
+export const appletQuestionsOptionsList = (params) =>
+  defHttp.get({url: Api.appletQuestionsOptionsList, params},{isTransformResponse:false});

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletQuestions.data.ts

@@ -0,0 +1,194 @@
+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'
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '类型',
+    align:"center",
+    dataIndex: 'type_dictText'
+   },
+   {
+    title: '标题',
+    align:"center",
+    dataIndex: 'text'
+   },
+   {
+    title: '描述',
+    align:"center",
+    dataIndex: 'content',
+   },
+   {
+    title: '必填',
+    align:"center",
+    dataIndex: 'required',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
+   {
+    title: '备注',
+    align:"center",
+    dataIndex: 'remark'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "类型",
+      field: 'type',
+      component: 'JSelectMultiple',
+      componentProps:{
+          dictCode:"applett_topic_type"
+      },
+      //colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '类型',
+    field: 'type',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"applett_topic_type"
+     },
+  },
+  {
+    label: '标题',
+    field: 'text',
+    component: 'Input',
+  },
+  {
+    label: '描述',
+    field: 'content',
+    component: 'JEditor',
+  },
+  {
+    label: '必填',
+    field: 'required',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'Input',
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+	{
+	  label: '',
+	  field: 'id',
+	  component: 'Input',
+	  show: false
+	},
+];
+//子表单数据
+//子表列表数据
+export const appletQuestionsOptionsColumns: BasicColumn[] = [
+   {
+    title: '选项内容',
+    align:"center",
+    dataIndex: 'content'
+   },
+   {
+    title: '前缀文字',
+    align:"center",
+    dataIndex: 'prefix'
+   },
+   {
+    title: '后缀文字',
+    align:"center",
+    dataIndex: 'suffix'
+   },
+   {
+    title: '选中前图片',
+    align:"center",
+    dataIndex: 'image',
+    customRender:render.renderImage,
+   },
+   {
+    title: '选中后图片',
+    align:"center",
+    dataIndex: 'imageAfter'
+   },
+];
+//子表表格配置
+export const appletQuestionsOptionsJVxeColumns: JVxeColumn[] = [
+    {
+      title: '选项内容',
+      key: 'content',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '前缀文字',
+      key: 'prefix',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '后缀文字',
+      key: 'suffix',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '选中前图片',
+      key: 'image',
+      type: JVxeTypes.image,
+      token:true,
+      responseName:"message",
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '选中后图片',
+      key: 'imageAfter',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+
+// 高级查询数据
+export const superQuerySchema = {
+  type: {title: '类型',order: 0,view: 'list', type: 'string',dictCode: 'applett_topic_type',},
+  text: {title: '标题',order: 1,view: 'text', type: 'string',},
+  content: {title: '描述',order: 2,view: 'umeditor', type: 'string',},
+  required: {title: '必填',order: 3,view: 'switch', type: 'string',},
+  remark: {title: '备注',order: 4,view: 'text', type: 'string',},
+  //子表高级查询
+  appletQuestionsOptions: {
+    title: '题目选项',
+    view: 'table',
+    fields: {
+        content: {title: '选项内容',order: 0,view: 'text', type: 'string',},
+        prefix: {title: '前缀文字',order: 1,view: 'text', type: 'string',},
+        suffix: {title: '后缀文字',order: 2,view: 'text', type: 'string',},
+        image: {title: '选中前图片',order: 3,view: 'image', type: 'string',},
+        imageAfter: {title: '选中后图片',order: 4,view: 'text', type: 'string',},
+    }
+  },
+};
+
+/**
+* 流程表单调用这个方法获取formSchema
+* @param param
+*/
+export function getBpmFormSchema(_formData): FormSchema[]{
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletQuestionsList.vue

@@ -0,0 +1,231 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys"  @expand="handleExpand">
+      <!-- 内嵌table区域 begin -->
+           <template #expandedRowRender="{record}">
+             <a-tabs tabPosition="top">
+               <a-tab-pane tab="题目选项" key="appletQuestionsOptions" forceRender>
+                  <appletQuestionsOptionsSubTable v-if="expandedRowKeys.includes(record.id)" :id="record.id" />
+               </a-tab-pane>
+             </a-tabs>
+           </template>
+     <!-- 内嵌table区域 end -->
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" v-auth="'appletPaper:applet_questions:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'appletPaper:applet_questions:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" v-auth="'appletPaper:applet_questions:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="selectedRowKeys.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  v-auth="'appletPaper:applet_questions:deleteBatch'">批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+        <template v-if="column.dataIndex==='content'">
+          <!--富文本件字段回显插槽-->
+          <div v-html="text"></div>
+        </template>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <AppletQuestionsModal @register="registerModal" @success="handleSuccess"></AppletQuestionsModal>
+  </div>
+</template>
+
+<script lang="ts" name="appletPaper-appletQuestions" setup>
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import {useModal} from '/@/components/Modal';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import AppletQuestionsModal from './components/AppletQuestionsModal.vue'
+  import AppletQuestionsOptionsSubTable from './subTables/AppletQuestionsOptionsSubTable.vue'
+  import {columns, searchFormSchema, superQuerySchema} from './AppletQuestions.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './AppletQuestions.api';
+  import {downloadFile} from '/@/utils/common/renderUtils';
+  import { getDateByPicker } from '/@/utils';
+  //日期个性化选择
+  const fieldPickers = reactive({
+  });
+  import { useUserStore } from '/@/store/modules/user';
+  const queryParam = reactive<any>({});
+   // 展开key
+  const expandedRowKeys = ref<any[]>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  const { createMessage } = useMessage();
+  const userStore = useUserStore();
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '题目',
+           api: list,
+           columns,
+           canResize:true,
+           formConfig: {
+                //labelWidth: 120,
+                schemas: searchFormSchema,
+                autoSubmitOnEnter:true,
+                showAdvancedButton:true,
+                fieldMapToNumber: [
+                ],
+                fieldMapToTime: [
+                ],
+            },
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+           },
+           beforeFetch: (params) => {
+              if (params && fieldPickers) {
+                for (let key in fieldPickers) {
+                  if (params[key]) {
+                    params[key] = getDateByPicker(params[key], fieldPickers[key]);
+                  }
+                }
+              }
+             return Object.assign(params, queryParam);
+           },
+        },
+        exportConfig: {
+            name:"题目",
+            url: getExportUrl,
+            params: queryParam,
+        },
+        importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+        },
+    })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   // 高级查询配置
+   const superQueryConfig = reactive(superQuerySchema);
+
+   /**
+   * 高级查询事件
+   */
+   function handleSuperQuery(params) {
+     Object.keys(params).map((k) => {
+       queryParam[k] = params[k];
+     });
+     reload();
+   }
+
+   /**
+     * 展开事件
+     * */
+   function handleExpand(expanded, record){
+        expandedRowKeys.value=[];
+        if (expanded === true) {
+           expandedRowKeys.value.push(record.id)
+        }
+    }
+   /**
+    * 新增事件
+    */
+  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}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value},handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+           auth: 'appletPaper:applet_questions:edit'
+         }
+       ]
+   }
+
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record){
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft'
+        },
+        auth: 'appletPaper:applet_questions:delete'
+      }
+    ]
+  }
+
+
+
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-picker),:deep(.ant-input-number){
+    width: 100%;
+  }
+</style>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/V20250820_1__menu_insert_AppletPaper.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/appletPaper文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2025082004218580380', NULL, '试卷', '/appletPaper/appletPaperList', 'appletPaper/AppletPaperList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-08-20 16:21:38', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004218580381', '2025082004218580380', '添加试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:21:38', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004218580382', '2025082004218580380', '编辑试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:21:38', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004218580383', '2025082004218580380', '删除试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:21:38', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004218580384', '2025082004218580380', '批量删除试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:21:38', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004218580385', '2025082004218580380', '导出excel_试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:21:38', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004218580386', '2025082004218580380', '导入excel_试卷', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_paper:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:21:38', NULL, NULL, 0, 0, '1', 0);

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/V20250820_1__menu_insert_AppletQuestions.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/appletPaper文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2025082004325090560', NULL, '题目', '/appletPaper/appletQuestionsList', 'appletPaper/AppletQuestionsList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-08-20 16:32:56', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004325090561', '2025082004325090560', '添加题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:32:56', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004325090562', '2025082004325090560', '编辑题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:32:56', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004325090563', '2025082004325090560', '删除题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:32:56', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004325090564', '2025082004325090560', '批量删除题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:32:56', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004325100565', '2025082004325090560', '导出excel_题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:32:56', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025082004325100566', '2025082004325090560', '导入excel_题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-08-20 16:32:56', NULL, NULL, 0, 0, '1', 0);

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/components/AppletPaperForm.vue

@@ -1,70 +1,171 @@
 <template>
-    <div style="min-height: 400px">
-        <BasicForm @register="registerForm"></BasicForm>
-        <div style="width: 100%;text-align: center" v-if="!formDisabled">
-            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
-        </div>
+  <div>
+  <!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
+     <!--主表区域 -->
+     <a-tab-pane tab="试卷" :key="refKeys[0]" :forceRender="true" :style="tabsStyle">
+       <BasicForm @register="registerForm" ref="formRef"/>
+     </a-tab-pane>
+  <!--子表单区域 -->
+      <a-tab-pane tab="题目分类" key="appletQuestionsCategory" :forceRender="true" :style="tabsStyle">
+        <JVxeTable
+          keep-source
+          resizable
+          ref="appletQuestionsCategory"
+          v-if="appletQuestionsCategoryTable.show"
+          :loading="appletQuestionsCategoryTable.loading"
+          :columns="appletQuestionsCategoryTable.columns"
+          :dataSource="appletQuestionsCategoryTable.dataSource"
+          :height="340"
+          :disabled="formDisabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"
+          />
+      </a-tab-pane>
+    </a-tabs>
+
+    <div style="width: 100%;text-align: center;margin-top: 10px;" v-if="showFlowSubmitButton">
+      <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="handleSubmit">提 交</a-button>
     </div>
+  </div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
+    import { defHttp } from '/@/utils/http/axios';
+    import {ref, computed, unref,reactive, onMounted, defineProps } from 'vue';
     import {BasicForm, useForm} from '/@/components/Form/index';
-    import {computed, defineComponent} from 'vue';
-    import {defHttp} from '/@/utils/http/axios';
-    import { propTypes } from '/@/utils/propTypes';
-    import {getBpmFormSchema} from '../AppletPaper.data';
-    import {saveOrUpdate} from '../AppletPaper.api';
+    import { JVxeTable } from '/@/components/jeecg/JVxeTable'
+    import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts'
+    import {formSchema,appletQuestionsCategoryColumns} from '../AppletPaper.data';
+    import {saveOrUpdate,appletQuestionsCategoryList} from '../AppletPaper.api';
+    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
+    const refKeys = ref(['appletPaper','appletQuestionsCategory', ]);
+    const activeKey = ref('appletPaper');
+    const appletQuestionsCategory = ref();
+    const tableRefs = {appletQuestionsCategory, };
+    const appletQuestionsCategoryTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:appletQuestionsCategoryColumns,
+          show: false
+    })
+
+    const props = defineProps({
+      formData: { type: Object, default: ()=>{} },
+      formBpm: { type: Boolean, default: true }
+    });
+    const formDisabled = computed(()=>{
+      if(props.formBpm === true){
+        if(props.formData.disabled === false){
+          return false;
+        }
+      }
+      return true;
+    });
+    // 是否显示提交按钮
+    const showFlowSubmitButton = computed(()=>{
+      if(props.formBpm === true){
+        if(props.formData.disabled === false){
+          return true
+        }
+      }
+      return false
+    });
     
-    export default defineComponent({
-        name: "AppletPaperForm",
-        components:{
-            BasicForm
-        },
-        props:{
-            formData: propTypes.object.def({}),
-            formBpm: propTypes.bool.def(true),
-        },
-        setup(props){
-            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
-                labelWidth: 150,
-                schemas: getBpmFormSchema(props.formData),
-                showActionButtonGroup: false,
-                baseColProps: {span: 24}
-            });
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
 
-            const formDisabled = computed(()=>{
-                if(props.formData.disabled === false){
-                    return false;
-                }
-                return true;
-            });
+    onMounted(()=>{
+      initFormData();
+    });
+    //渲染流程表单数据
+    const queryByIdUrl = '/appletPaper/appletPaper/queryById';
+    async function initFormData(){
+      if(props.formBpm === true){
+        await reset();
+        let params = {id: props.formData.dataId};
+        const data = await defHttp.get({url: queryByIdUrl, params});
+        //表单赋值
+        await setFieldsValue({
+          ...data
+        });
+        requestSubTableData(appletQuestionsCategoryList, {id: data.id}, appletQuestionsCategoryTable, ()=>{
+          appletQuestionsCategoryTable.show = true;
+        })
+        // 隐藏底部时禁用整个表单
+        setProps({ disabled: formDisabled.value })
+      }
+    }
 
-            let formData = {};
-            const queryByIdUrl = '/appletPaper/appletPaper/queryById';
-            async function initFormData(){
-                let params = {id: props.formData.dataId};
-                const data = await defHttp.get({url: queryByIdUrl, params});
-                formData = {...data}
-                //设置表单的值
-                await setFieldsValue(formData);
-                //默认是禁用
-                await setProps({disabled: formDisabled.value})
-            }
+    //方法配置
+    const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys);
+    // 弹窗tabs滚动区域的高度
+    const tabsStyle = computed(() => {
+      let height: Nullable<string> = null
+      let minHeight = '100px'
+      // 弹窗wrapper
+      let overflow = 'auto';
+      return {height, minHeight, overflow};
+    })
 
-            async function submitForm() {
-                let data = getFieldsValue();
-                let params = Object.assign({}, formData, data);
-                console.log('表单数据', params)
-                await saveOrUpdate(params, true)
-            }
+    async function reset(){
+      await resetFields();
+      activeKey.value = 'appletPaper';
+      appletQuestionsCategoryTable.dataSource = [];
+    }
+    function classifyIntoFormData(allValues) {
+         let main = Object.assign({}, allValues.formValue)
+         return {
+           ...main, // 展开
+           appletQuestionsCategoryList: allValues.tablesValue[0].tableData,
+         }
+       }
+    //表单提交事件
+    async function requestAddOrEdit(values) {
+      //提交表单
+      await saveOrUpdate(values, true);
+    }
+</script>
 
-            initFormData();
-            
-            return {
-                registerForm,
-                formDisabled,
-                submitForm,
-            }
-        }
-    });
-</script>
+<style lang="less" scoped>
+  /** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>
+
+<style lang="less">
+// Online表单Tab风格专属样式
+.j-cgform-tab-modal {
+  .ant-modal-header {
+    padding-top: 8px;
+    padding-bottom: 8px;
+    border-bottom: none !important;
+  }
+
+  .ant-modal .ant-modal-body > .scrollbar,
+  .ant-tabs-nav .ant-tabs-tab {
+    padding-top: 0;
+  }
+
+  .ant-tabs-top-bar {
+    width: calc(100% - 55px);
+    position: relative;
+    left: -14px;
+  }
+
+  .ant-tabs .ant-tabs-top-content > .ant-tabs-tabpane {
+    overflow: hidden auto;
+  }
+}
+</style>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/components/AppletPaperModal.vue

@@ -1,54 +1,136 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
-      <BasicForm @register="registerForm" name="AppletPaperForm" />
+  <BasicModal ref="modalRef" destroyOnClose wrapClassName="j-cgform-tab-modal" v-bind="$attrs" @register="registerModal" :width="800" @ok="handleSubmit">
+    <!-- 标题区域 -->
+     <template #title>
+        <div class="titleArea">
+          <div class="title">{{ title }}</div>
+          <div class="right">
+            <a-radio-group v-model:value="activeKey">
+              <template v-for="(item, index) in tabNav" :key="index">
+                <a-radio-button :value="item.tableName">{{ item.tableTxt }}</a-radio-button>
+              </template>
+            </a-radio-group>
+          </div>
+        </div>
+     </template>
+     <!--表单区域 -->
+     <div class="contentArea">
+       <!--主表区域 -->
+        <BasicForm @register="registerForm" ref="formRef" v-show="activeKey == refKeys[0]" name="AppletPaperForm"/>
+       <!--子表区域 -->
+         <JVxeTable
+           v-show="activeKey == 'appletQuestionsCategory'"
+           keep-source
+           resizable
+           ref="appletQuestionsCategory"
+           :loading="appletQuestionsCategoryTable.loading"
+           :columns="appletQuestionsCategoryTable.columns"
+           :dataSource="appletQuestionsCategoryTable.dataSource"
+           :height="340"
+           :disabled="formDisabled"
+           :rowNumber="true"
+           :rowSelection="true"
+           :toolbar="true"
+           />
+     </div>
   </BasicModal>
 </template>
 
 <script lang="ts" setup>
-    import {ref, computed, unref, reactive} 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 '../AppletPaper.data';
-    import {saveOrUpdate} from '../AppletPaper.api';
+    import { JVxeTable } from '/@/components/jeecg/JVxeTable'
+    import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts'
+    import {formSchema,appletQuestionsCategoryColumns} from '../AppletPaper.data';
+    import {saveOrUpdate,appletQuestionsCategoryList} from '../AppletPaper.api';
+    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
     import { useMessage } from '/@/hooks/web/useMessage';
     import { getDateByPicker } from '/@/utils';
+    //日期个性化选择
+    const fieldPickers = reactive({
+    });
+      const appletQuestionsCategoryFieldPickers = reactive({
+      });
     const { createMessage } = useMessage();
     // Emits声明
     const emit = defineEmits(['register','success']);
     const isUpdate = ref(true);
-    const isDetail = ref(false);
+    const formDisabled = ref(false);
+    const modalRef = ref();
+    const refKeys = ref(['appletPaper','appletQuestionsCategory', ]);
+    const tabNav = ref<any>([
+      { tableName: 'appletPaper', tableTxt: '试卷' },
+       { tableName: 'appletQuestionsCategory', tableTxt: '题目分类' },
+    ]);
+    const activeKey = ref('appletPaper');
+    const appletQuestionsCategory = ref();
+    const tableRefs = {appletQuestionsCategory, };
+    const appletQuestionsCategoryTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:appletQuestionsCategoryColumns
+    })
     //表单配置
-    const [registerForm, { setProps,resetFields, setFieldsValue, validate, scrollToField }] = useForm({
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
         labelWidth: 150,
         schemas: formSchema,
         showActionButtonGroup: false,
         baseColProps: {span: 24}
     });
-    //表单赋值
+     //表单赋值
     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;
-        isDetail.value = !!data?.showFooter;
+        formDisabled.value = !data?.showFooter;
         if (unref(isUpdate)) {
             //表单赋值
             await setFieldsValue({
                 ...data.record,
             });
+             requestSubTableData(appletQuestionsCategoryList, {id:data?.record?.id}, appletQuestionsCategoryTable)
         }
         // 隐藏底部时禁用整个表单
        setProps({ disabled: !data?.showFooter })
     });
-    //日期个性化选择
-    const fieldPickers = reactive({
-    });
+    //方法配置
+    const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys);
+    // 弹窗tabs滚动区域的高度
+    const tabsStyle = computed(() => {
+      let height: Nullable<string> = null
+      let minHeight = '100px'
+      let maxHeight: Nullable<string> = '500px'
+      // 弹窗wrapper
+      let modalWrapperRef = modalRef.value?.modalWrapperRef
+      if (modalWrapperRef) {
+        if (modalWrapperRef.fullScreen) {
+          height = 'calc(' + modalWrapperRef.spinStyle.height + ' - 50px)';
+          maxHeight = null
+        }
+      }
+      let overflow = 'auto';
+      return {height, minHeight, maxHeight, overflow};
+    })
     //设置标题
-    const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(isDetail) ? '详情' : '编辑'));
+    const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(formDisabled) ? '编辑' : '详情'));
+    //重置
+    async function reset(){
+      await resetFields();
+      activeKey.value = 'appletPaper';
+      appletQuestionsCategoryTable.dataSource = [];
+    }
+    function classifyIntoFormData(allValues) {
+         let main = Object.assign({}, allValues.formValue)
+         return {
+           ...main, // 展开
+           appletQuestionsCategoryList: allValues.tablesValue[0].tableData,
+         }
+       }
     //表单提交事件
-    async function handleSubmit(v) {
+    async function requestAddOrEdit(values) {
         try {
-            let values = await validate();
             // 预处理日期数据
             changeDateValue(values);
             setModalProps({confirmLoading: true});
@@ -58,14 +140,6 @@
             closeModal();
             //刷新列表
             emit('success');
-        } catch ({ errorFields }) {
-           if (errorFields) {
-             const firstField = errorFields[0];
-             if (firstField) {
-               scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
-             }
-           }
-           return Promise.reject(errorFields);
         } finally {
             setModalProps({confirmLoading: false});
         }
@@ -76,19 +150,27 @@
      * @param formData 表单数据
      */
     const changeDateValue = (formData) => {
-        if (formData && fieldPickers) {
-            for (let key in fieldPickers) {
-                if (formData[key]) {
-                    formData[key] = getDateByPicker(formData[key], fieldPickers[key]);
-                }
-            }
-        }
+      if (formData && fieldPickers) {
+          for (let key in fieldPickers) {
+              if (formData[key]) {
+                  formData[key] = getDateByPicker(formData[key], fieldPickers[key]);
+              }
+          }
+      }
+      if(formData && formData.appletQuestionsCategoryList && formData.appletQuestionsCategoryList.length > 0){
+          formData.appletQuestionsCategoryList.forEach(subFormData=>{
+              for (let key in appletQuestionsCategoryFieldPickers) {
+                  if (subFormData[key]) {
+                      subFormData[key] = getDateByPicker(subFormData[key], appletQuestionsCategoryFieldPickers[key]);
+                  }
+              }
+          })
+      }
     };
-
 </script>
 
 <style lang="less" scoped>
-	/** 时间和数字输入框样式 */
+  /** 时间和数字输入框样式 */
   :deep(.ant-input-number) {
     width: 100%;
   }
@@ -96,4 +178,63 @@
   :deep(.ant-calendar-picker) {
     width: 100%;
   }
+
+  .titleArea {
+    display: flex;
+    align-content: center;
+    padding-right: 70px;
+    .title {
+      margin-right: 16px;
+      line-height: 32px;
+    }
+    .right {
+      overflow-x: auto;
+      overflow-y: hidden;
+      flex: 1;
+      white-space: nowrap;
+      .ant-radio-group {
+       font-weight: normal;
+      }
+    }
+  }
+
+  html[data-theme='light'] {
+      .right {
+        .ant-radio-group {
+          :deep(.ant-radio-button-wrapper:not(.ant-radio-button-wrapper-checked)) {
+            color: #555;
+          }
+        }
+      }
+    }
+</style>
+
+<style lang="less">
+// Online表单Tab风格专属样式
+.j-cgform-tab-modal {
+   .contentArea {
+      padding: 20px 1.5% 0;
+    }
+
+     //.ant-modal-header {
+     //  padding-top: 8px;
+     //  padding-bottom: 8px;
+     //  border-bottom: none !important;
+     //}
+
+  .ant-modal .ant-modal-body > .scrollbar,
+  .ant-tabs-nav .ant-tabs-tab {
+    padding-top: 0;
+  }
+
+  .ant-tabs-top-bar {
+    width: calc(100% - 55px);
+    position: relative;
+    left: -14px;
+  }
+
+  .ant-tabs .ant-tabs-top-content > .ant-tabs-tabpane {
+    overflow: hidden auto;
+  }
+}
 </style>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/components/AppletQuestionsForm.vue

@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <BasicForm @register="registerForm" ref="formRef"/>
+  <!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
+      <a-tab-pane tab="题目选项" key="appletQuestionsOptions" :forceRender="true">
+        <JVxeTable
+          v-if="appletQuestionsOptionsTable.show"      
+          keep-source
+          resizable
+          ref="appletQuestionsOptions"
+          :loading="appletQuestionsOptionsTable.loading"
+          :columns="appletQuestionsOptionsTable.columns"
+          :dataSource="appletQuestionsOptionsTable.dataSource"
+          :height="340"
+          :disabled="formDisabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"
+          />
+      </a-tab-pane>
+    </a-tabs>
+    <div style="width: 100%;text-align: center;margin-top: 10px;" v-if="showFlowSubmitButton">
+      <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="handleSubmit">提 交</a-button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+    import { defHttp } from '/@/utils/http/axios';
+    import {ref, computed, unref,reactive, onMounted, defineProps } from 'vue';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import { JVxeTable } from '/@/components/jeecg/JVxeTable'
+    import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts'
+    import {formSchema,appletQuestionsOptionsJVxeColumns} from '../AppletQuestions.data';
+    import {saveOrUpdate,queryAppletQuestionsOptions} from '../AppletQuestions.api';
+    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
+    const isUpdate = ref(true);
+    
+    const refKeys = ref(['appletQuestionsOptions', ]);
+    const activeKey = ref('appletQuestionsOptions');
+    const appletQuestionsOptions = ref();
+    const tableRefs = {appletQuestionsOptions, };
+    const appletQuestionsOptionsTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:appletQuestionsOptionsJVxeColumns,
+          show: false
+    })
+
+    const props = defineProps({
+      formData: { type: Object, default: ()=>{} },
+      formBpm: { type: Boolean, default: true }
+    });
+    const formDisabled = computed(()=>{
+      if(props.formBpm === true){
+        if(props.formData.disabled === false){
+          return false;
+        }
+      }
+      return true;
+    });
+    // 是否显示提交按钮
+    const showFlowSubmitButton = computed(()=>{
+      if(props.formBpm === true){
+        if(props.formData.disabled === false){
+          return true
+        }
+      }
+      return false
+    });
+    
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+
+    onMounted(()=>{
+      initFormData();
+    });
+    //渲染流程表单数据
+    const queryByIdUrl = '/appletPaper/appletQuestions/queryById';
+    async function initFormData(){
+      if(props.formBpm === true){
+        await reset();
+        let params = {id: props.formData.dataId};
+        const data = await defHttp.get({url: queryByIdUrl, params});
+        //表单赋值
+        await setFieldsValue({
+          ...data
+        });
+        requestSubTableData(queryAppletQuestionsOptions, {id: data.id}, appletQuestionsOptionsTable, ()=>{
+          appletQuestionsOptionsTable.show = true;
+        });
+        // 隐藏底部时禁用整个表单
+        setProps({ disabled: formDisabled.value })
+      }
+    }
+    
+    //方法配置
+    const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys);
+
+    async function reset(){
+      await resetFields();
+      activeKey.value = 'appletQuestionsOptions';
+      appletQuestionsOptionsTable.dataSource = [];
+    }
+    function classifyIntoFormData(allValues) {
+         let main = Object.assign({}, allValues.formValue)
+         return {
+           ...main, // 展开
+           appletQuestionsOptionsList: allValues.tablesValue[0].tableData,
+         }
+       }
+    //表单提交事件
+    async function requestAddOrEdit(values) {
+      //提交表单
+      await saveOrUpdate(values, true);
+    }
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/components/AppletQuestionsModal.vue

@@ -0,0 +1,148 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+      <BasicForm @register="registerForm" ref="formRef" name="AppletQuestionsForm" />
+      <!-- 子表单区域 -->
+      <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
+        <a-tab-pane tab="题目选项" key="appletQuestionsOptions" :forceRender="true">
+          <JVxeTable
+            keep-source
+            resizable
+            ref="appletQuestionsOptions"
+            :loading="appletQuestionsOptionsTable.loading"
+            :columns="appletQuestionsOptionsTable.columns"
+            :dataSource="appletQuestionsOptionsTable.dataSource"
+            :height="340"
+            :disabled="formDisabled"
+            :rowNumber="true"
+            :rowSelection="true"
+            :toolbar="true"
+            />
+        </a-tab-pane>
+      </a-tabs>
+
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref,reactive} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import { JVxeTable } from '/@/components/jeecg/JVxeTable'
+    import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts'
+    import {formSchema,appletQuestionsOptionsJVxeColumns} from '../AppletQuestions.data';
+    import {saveOrUpdate,queryAppletQuestionsOptions} from '../AppletQuestions.api';
+    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
+    import { useMessage } from '/@/hooks/web/useMessage';
+    import { getDateByPicker } from '/@/utils';
+    //日期个性化选择
+    const fieldPickers = reactive({
+    });
+      const appletQuestionsOptionsFieldPickers = reactive({
+      });
+    const { createMessage } = useMessage();
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    const formDisabled = ref(false);
+    const refKeys = ref(['appletQuestionsOptions', ]);
+    const activeKey = ref('appletQuestionsOptions');
+    const appletQuestionsOptions = ref();
+    const tableRefs = {appletQuestionsOptions, };
+    const appletQuestionsOptionsTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:appletQuestionsOptionsJVxeColumns
+    })
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+     //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await reset();
+        setModalProps({confirmLoading: false,showCancelBtn:data?.showFooter,showOkBtn:data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        formDisabled.value = !data?.showFooter;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+             requestSubTableData(queryAppletQuestionsOptions, {id:data?.record?.id}, appletQuestionsOptionsTable)
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //方法配置
+    const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys);
+
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(formDisabled) ? '编辑' : '详情'));
+
+    async function reset(){
+      await resetFields();
+      activeKey.value = 'appletQuestionsOptions';
+      appletQuestionsOptionsTable.dataSource = [];
+    }
+    function classifyIntoFormData(allValues) {
+         let main = Object.assign({}, allValues.formValue)
+         return {
+           ...main, // 展开
+           appletQuestionsOptionsList: allValues.tablesValue[0].tableData,
+         }
+       }
+    //表单提交事件
+    async function requestAddOrEdit(values) {
+        try {
+            // 预处理日期数据
+            changeDateValue(values);
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+
+    /**
+     * 处理日期值
+     * @param formData 表单数据
+     */
+    const changeDateValue = (formData) => {
+      if (formData && fieldPickers) {
+          for (let key in fieldPickers) {
+              if (formData[key]) {
+                  formData[key] = getDateByPicker(formData[key], fieldPickers[key]);
+              }
+          }
+      }
+      if(formData && formData.appletQuestionsOptionsList && formData.appletQuestionsOptionsList.length > 0){
+          formData.appletQuestionsOptionsList.forEach(subFormData=>{
+              for (let key in appletQuestionsOptionsFieldPickers) {
+                  if (subFormData[key]) {
+                      subFormData[key] = getDateByPicker(subFormData[key], appletQuestionsOptionsFieldPickers[key]);
+                  }
+              }
+          })
+      }
+    };
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/subTables/AppletQuestionsOptionsSubTable.vue

@@ -0,0 +1,44 @@
+<template>
+  <div>
+      <!--引用表格-->
+     <BasicTable bordered size="middle" :loading="loading" rowKey="id" :canResize="true" :columns="appletQuestionsOptionsColumns" :dataSource="dataSource" :pagination="false">
+        <!--字段回显插槽-->
+        <template v-slot:bodyCell="{ column, record, index, text }">
+        </template>
+      </BasicTable>
+    </div>
+</template>
+
+<script lang="ts" setup>
+  import {ref,watchEffect} from 'vue';
+  import {BasicTable} from '/@/components/Table';
+  import {appletQuestionsOptionsColumns} from '../AppletQuestions.data';
+  import {appletQuestionsOptionsList} from '../AppletQuestions.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+
+  const props = defineProps({
+    id: {
+       type: String,
+       default: '',
+     },
+  })
+
+  const loading = ref(false);
+  const dataSource = ref([]);
+
+  watchEffect(() => {
+      props.id && loadData(props.id);
+   });
+
+   function loadData(id) {
+         dataSource.value = []
+         loading.value = true
+          appletQuestionsOptionsList({id}).then((res) => {
+           if (res.success) {
+              dataSource.value = res.result.records
+           }
+         }).finally(() => {
+           loading.value = false
+         })
+    }
+</script>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletSubscribeDetection/entity/AppletSubscribeDetection.java

@@ -109,10 +109,11 @@ public class AppletSubscribeDetection implements Serializable {
 	@Dict(dicCode = "applett_subscribe_type")
     @Schema(description = "可选预约类型")
     private java.lang.String subscribeType;
+
 	/**状态*/
 	@Excel(name = "状态", width = 15, dicCode = "applet_subscribe_status")
 	@Dict(dicCode = "applet_subscribe_status")
-    @Schema(description = "状态")
+    @Schema(description = "状态 0待预约 1待检测 2已完成 3已取消")
     private java.lang.String status;
 	/**产品*/
 	@Excel(name = "产品", width = 15)