diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPaperController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPaperController.java index eabe2e2..9150ed0 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPaperController.java +++ b/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> paper(@Parameter(description = "类型【选填】（0已完成，1未完成）") String type){ return Result.ok(appletApiPaperService.list(type)); } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiSubscribeController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiSubscribeController.java index 15224ec..7769d4d 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiSubscribeController.java +++ b/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> hospital(@Parameter(description = "商品id") String productId) { return Result.OK(appletApiSubscribeService.hospital(productId)); } + + /** + * 预约检测详情 + * @return 预约检测详情 + */ + @AutoLog(value = "预约检测详情") + @Operation(summary = "预约检测详情", description = "预约检测详情") + @GetMapping(value = "/detail") + public Result 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(); + } } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiSubscribeService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiSubscribeService.java index 8099cc8..7844d64 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiSubscribeService.java +++ b/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 hospital(String productId); + void submitOrUpdate(AppletSubscribeDetection detection); + + AppletSubscribeDetection detail(String id); } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiOrderServiceImpl.java index ee169d9..812beb9 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiOrderServiceImpl.java +++ b/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); } } - } /** diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiSubscribeServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiSubscribeServiceImpl.java index 515e788..d08f7df 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiSubscribeServiceImpl.java +++ b/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); + } + } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/controller/AppletPaperController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/controller/AppletPaperController.java index b2a1f4c..4a1232f 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/controller/AppletPaperController.java +++ b/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 { +public class AppletPaperController { @Autowired private IAppletPaperService appletPaperService; + @Autowired + private IAppletQuestionsCategoryService appletQuestionsCategoryService; /** * 分页列表查询 @@ -68,8 +76,6 @@ public class AppletPaperController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(appletPaper, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = appletPaperService.page(page, queryWrapper); @@ -79,31 +85,38 @@ public class AppletPaperController extends JeecgController add(@RequestBody AppletPaper appletPaper) { - appletPaperService.save(appletPaper); - + public Result 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 edit(@RequestBody AppletPaper appletPaper) { - appletPaperService.updateById(appletPaper); + public Result 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 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 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> queryAppletQuestionsCategoryListByMainId(@RequestParam(name="id",required=true) String id) { + List appletQuestionsCategoryList = appletQuestionsCategoryService.selectByMainId(id); + return Result.OK(appletQuestionsCategoryList); } /** @@ -163,11 +191,41 @@ public class AppletPaperController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(appletPaper, request.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + //配置选中数据查询条件 + String selections = request.getParameter("selections"); + if(oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + queryWrapper.in("id",selectionList); + } + //Step.2 获取导出数据 + List appletPaperList = appletPaperService.list(queryWrapper); + + // Step.3 组装pageList + List pageList = new ArrayList(); + for (AppletPaper main : appletPaperList) { + AppletPaperPage vo = new AppletPaperPage(); + BeanUtils.copyProperties(main, vo); + List 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 importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, AppletPaper.class); + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + // 获取上传文件对象 + MultipartFile file = entity.getValue(); + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List 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("文件导入失败！"); } } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/controller/AppletQuestionsController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/controller/AppletQuestionsController.java new file mode 100644 index 0000000..09af53a --- /dev/null +++ b/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> queryPageList(AppletQuestions appletQuestions, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + // 自定义查询规则 + Map customeRuleMap = new HashMap<>(); + // 自定义多选的查询规则为：LIKE_WITH_OR + customeRuleMap.put("type", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(appletQuestions, req.getParameterMap(),customeRuleMap); + Page page = new Page(pageNo, pageSize); + IPage 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 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 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 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 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 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> queryAppletQuestionsOptionsListByMainId(@RequestParam(name="id",required=true) String id) { + List appletQuestionsOptionsList = appletQuestionsOptionsService.selectByMainId(id); + IPage 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 queryWrapper = QueryGenerator.initQueryWrapper(appletQuestions, request.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + //配置选中数据查询条件 + String selections = request.getParameter("selections"); + if(oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + queryWrapper.in("id",selectionList); + } + //Step.2 获取导出数据 + List appletQuestionsList = appletQuestionsService.list(queryWrapper); + + // Step.3 组装pageList + List pageList = new ArrayList(); + for (AppletQuestions main : appletQuestionsList) { + AppletQuestionsPage vo = new AppletQuestionsPage(); + BeanUtils.copyProperties(main, vo); + List 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 fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + // 获取上传文件对象 + MultipartFile file = entity.getValue(); + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List 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("文件导入失败！"); + } + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletPaper.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletPaper.java index 6c9c34b..d1d7f58 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletPaper.java +++ b/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; } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletQuestions.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletQuestions.java new file mode 100644 index 0000000..1375f3d --- /dev/null +++ b/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; +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletQuestionsCategory.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletQuestionsCategory.java new file mode 100644 index 0000000..a30f16d --- /dev/null +++ b/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; +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletQuestionsOptions.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/entity/AppletQuestionsOptions.java new file mode 100644 index 0000000..1ae1c5f --- /dev/null +++ b/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; +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletPaperMapper.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletPaperMapper.java index 0a953ef..7eeae45 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletPaperMapper.java +++ b/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 { diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletQuestionsCategoryMapper.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletQuestionsCategoryMapper.java new file mode 100644 index 0000000..2c5f6a9 --- /dev/null +++ b/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 { + + /** + * 通过主表id删除子表数据 + * + * @param mainId 主表id + * @return boolean + */ + public boolean deleteByMainId(@Param("mainId") String mainId); + + /** + * 通过主表id查询子表数据 + * + * @param mainId 主表id + * @return List + */ + public List selectByMainId(@Param("mainId") String mainId); +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletQuestionsMapper.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletQuestionsMapper.java new file mode 100644 index 0000000..422b7e7 --- /dev/null +++ b/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 { + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletQuestionsOptionsMapper.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/AppletQuestionsOptionsMapper.java new file mode 100644 index 0000000..53e6d3d --- /dev/null +++ b/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 { + + /** + * 通过主表id删除子表数据 + * + * @param mainId 主表id + * @return boolean + */ + public boolean deleteByMainId(@Param("mainId") String mainId); + + /** + * 通过主表id查询子表数据 + * + * @param mainId 主表id + * @return List + */ + public List selectByMainId(@Param("mainId") String mainId); +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsCategoryMapper.xml b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsCategoryMapper.xml new file mode 100644 index 0000000..2fec422 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsCategoryMapper.xml @@ -0,0 +1,16 @@ + + + + + + DELETE + FROM applet_questions_category + WHERE + paper_id = #{mainId} + + + diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsMapper.xml b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsMapper.xml new file mode 100644 index 0000000..fba5e81 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsOptionsMapper.xml b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsOptionsMapper.xml new file mode 100644 index 0000000..9bf3480 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/mapper/xml/AppletQuestionsOptionsMapper.xml @@ -0,0 +1,16 @@ + + + + + + DELETE + FROM applet_questions_options + WHERE + question_id = #{mainId} + + + diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletPaperService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletPaperService.java index 015d48a..26e9393 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletPaperService.java +++ b/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 { + /** + * 添加一对多 + * + * @param appletPaper + * @param appletQuestionsCategoryList + */ + public void saveMain(AppletPaper appletPaper,List appletQuestionsCategoryList) ; + + /** + * 修改一对多 + * + * @param appletPaper + * @param appletQuestionsCategoryList + */ + public void updateMain(AppletPaper appletPaper,List appletQuestionsCategoryList); + + /** + * 删除一对多 + * + * @param id + */ + public void delMain (String id); + + /** + * 批量删除一对多 + * + * @param idList + */ + public void delBatchMain (Collection idList); + } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletQuestionsCategoryService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletQuestionsCategoryService.java new file mode 100644 index 0000000..10ebd47 --- /dev/null +++ b/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 { + + /** + * 通过主表id查询子表数据 + * + * @param mainId 主表id + * @return List + */ + public List selectByMainId(String mainId); +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletQuestionsOptionsService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletQuestionsOptionsService.java new file mode 100644 index 0000000..3ec5cad --- /dev/null +++ b/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 { + + /** + * 通过主表id查询子表数据 + * + * @param mainId 主表id + * @return List + */ + public List selectByMainId(String mainId); +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletQuestionsService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/IAppletQuestionsService.java new file mode 100644 index 0000000..637d7a0 --- /dev/null +++ b/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 { + + /** + * 添加一对多 + * + * @param appletQuestions + * @param appletQuestionsOptionsList + */ + public void saveMain(AppletQuestions appletQuestions,List appletQuestionsOptionsList) ; + + /** + * 修改一对多 + * + * @param appletQuestions + * @param appletQuestionsOptionsList + */ + public void updateMain(AppletQuestions appletQuestions,List appletQuestionsOptionsList); + + /** + * 删除一对多 + * + * @param id + */ + public void delMain (String id); + + /** + * 批量删除一对多 + * + * @param idList + */ + public void delBatchMain (Collection idList); + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletPaperServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletPaperServiceImpl.java index b18086a..3cb8101 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletPaperServiceImpl.java +++ b/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 implements IAppletPaperService { + @Autowired + private AppletPaperMapper appletPaperMapper; + @Autowired + private AppletQuestionsCategoryMapper appletQuestionsCategoryMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveMain(AppletPaper appletPaper, List 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 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 idList) { + for(Serializable id:idList) { + appletQuestionsCategoryMapper.deleteByMainId(id.toString()); + appletPaperMapper.deleteById(id); + } + } + } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletQuestionsCategoryServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletQuestionsCategoryServiceImpl.java new file mode 100644 index 0000000..f9051bc --- /dev/null +++ b/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 implements IAppletQuestionsCategoryService { + + @Autowired + private AppletQuestionsCategoryMapper appletQuestionsCategoryMapper; + + @Override + public List selectByMainId(String mainId) { + return appletQuestionsCategoryMapper.selectByMainId(mainId); + } +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletQuestionsOptionsServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletQuestionsOptionsServiceImpl.java new file mode 100644 index 0000000..2ea63c8 --- /dev/null +++ b/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 implements IAppletQuestionsOptionsService { + + @Autowired + private AppletQuestionsOptionsMapper appletQuestionsOptionsMapper; + + @Override + public List selectByMainId(String mainId) { + return appletQuestionsOptionsMapper.selectByMainId(mainId); + } +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletQuestionsServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/service/impl/AppletQuestionsServiceImpl.java new file mode 100644 index 0000000..7cf2d71 --- /dev/null +++ b/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 implements IAppletQuestionsService { + + @Autowired + private AppletQuestionsMapper appletQuestionsMapper; + @Autowired + private AppletQuestionsOptionsMapper appletQuestionsOptionsMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveMain(AppletQuestions appletQuestions, List 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 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 idList) { + for(Serializable id:idList) { + appletQuestionsOptionsMapper.deleteByMainId(id.toString()); + appletQuestionsMapper.deleteById(id); + } + } + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vo/AppletPaperPage.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vo/AppletPaperPage.java new file mode 100644 index 0000000..4a5589d --- /dev/null +++ b/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 appletQuestionsCategoryList; + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vo/AppletQuestionsPage.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vo/AppletQuestionsPage.java new file mode 100644 index 0000000..f3eb495 --- /dev/null +++ b/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 appletQuestionsOptionsList; + +} diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.api.ts b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.api.ts index b09dc2b..1c71bd0 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.api.ts +++ b/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 diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.data.ts b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.data.ts index 0516b21..82f8f19 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaper.data.ts +++ b/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; -} \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaperList.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaperList.vue index c65cbcb..352da8c 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaperList.vue +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletPaperList.vue @@ -4,10 +4,9 @@