From 1da111db95c1d43d60bd595913efd5158d2ce00e Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Fri, 5 Sep 2025 17:08:34 +0800 Subject: [PATCH] 1 --- .../controller/AppletApiOrderController.java | 1 - .../service/impl/AppletApiOrderServiceImpl.java | 2 + .../service/impl/AppletApiPaperServiceImpl.java | 3 + .../entity/AppletOrderAfterSale.java | 3 + .../controller/AppletQuestionsController.java | 2 +- .../demo/appletPaper/entity/AppletQuestions.java | 20 +++--- .../appletPaper/entity/AppletQuestionsOptions.java | 29 ++++---- .../appletPaper/mapper/AppletQuestionsMapper.java | 2 +- .../mapper/AppletQuestionsOptionsMapper.java | 2 +- .../service/IAppletQuestionsOptionsService.java | 2 +- .../service/IAppletQuestionsService.java | 2 +- .../impl/AppletQuestionsOptionsServiceImpl.java | 2 +- .../service/impl/AppletQuestionsServiceImpl.java | 2 +- .../demo/appletPaper/vo/AppletQuestionsPage.java | 11 ++- .../demo/appletPaper/vue3/AppletQuestions.data.ts | 78 +++++++++++++++++++++- .../V20250905_1__menu_insert_AppletQuestions.sql | 26 ++++++++ .../entity/PersonalizedRecommen.java | 4 ++ 17 files changed, 159 insertions(+), 32 deletions(-) create mode 100644 jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/V20250905_1__menu_insert_AppletQuestions.sql diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiOrderController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiOrderController.java index 5ff0833..617316c 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiOrderController.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiOrderController.java @@ -141,7 +141,6 @@ public class AppletApiOrderController { public Result> myEvaluate(@Parameter(description = "不传为全部，0是有图，1是最新") String type, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - Page page = new Page<>(pageNo, pageSize); return Result.OK(appletApiOrderService.myEvaluate(type, page)); } 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 10b7e0b..f023933 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 @@ -455,6 +455,7 @@ public class AppletApiOrderServiceImpl implements AppletApiOrderService { log.info("开始申请售后，用户ID: {}, 订单ID: {}, 售后原因: {}", userId, afterSale.getOrderId(), afterSale.getReason()); afterSale.setUserId(userId); + afterSale.setStatus("0"); appletOrderAfterSaleService.save(afterSale); log.info("售后申请保存成功，售后ID: {}", afterSale.getId()); @@ -600,6 +601,7 @@ public class AppletApiOrderServiceImpl implements AppletApiOrderService { Page list = appletOrderEvaluateService.lambdaQuery() .eq(AppletOrderEvaluate::getUserId, userId) .isNotNull("0".equals(type), AppletOrderEvaluate::getImage) + .ne("0".equals(type), AppletOrderEvaluate::getImage, "") .orderByDesc("1".equals(type), AppletOrderEvaluate::getCreateTime) .page(page); diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiPaperServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiPaperServiceImpl.java index e344c9d..89203be 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiPaperServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiPaperServiceImpl.java @@ -122,6 +122,7 @@ public class AppletApiPaperServiceImpl implements AppletApiPaperService { .orderByDesc(AppletPaperReport::getCreateTime) .eq(AppletPaperReport::getPaperId, record.getId()) .eq(AppletPaperReport::getUserId, userId) + .eq(AppletPaperReport::getStatus, "1") .select( AppletPaperReport::getId, AppletPaperReport::getScore, @@ -411,6 +412,7 @@ public class AppletApiPaperServiceImpl implements AppletApiPaperService { .lambdaQuery() .orderByDesc(AppletPaperReport::getCreateTime) .eq(AppletPaperReport::getUserId, userId) + .eq(AppletPaperReport::getStatus, "1") .last("limit 1") .select( AppletPaperReport::getId, @@ -430,6 +432,7 @@ public class AppletApiPaperServiceImpl implements AppletApiPaperService { .eq(AppletPaperReport::getUserId, userId) .eq(AppletPaperReport::getPaperId, list.get(0).getPaperId()) .ne(AppletPaperReport::getId, list.get(0).getId()) + .eq(AppletPaperReport::getStatus, "1") .last("limit 1") .select( AppletPaperReport::getId, diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletOrderEvaluate/entity/AppletOrderAfterSale.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletOrderEvaluate/entity/AppletOrderAfterSale.java index e1a5111..6664791 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletOrderEvaluate/entity/AppletOrderAfterSale.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletOrderEvaluate/entity/AppletOrderAfterSale.java @@ -94,4 +94,7 @@ public class AppletOrderAfterSale implements Serializable { /**状态*/ @Schema(description = "状态 0进行中 1已完成") private java.lang.String status; + /**状态*/ + @Schema(description = "手机号") + private java.lang.String phone; } 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 index 09af53a..5be07d5 100644 --- 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 @@ -47,7 +47,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: 题目 * @Author: jeecg-boot - * @Date: 2025-08-20 + * @Date: 2025-09-05 * @Version: V1.0 */ @Tag(name="题目") 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 index 60fa2f6..ea616ac 100644 --- 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 @@ -4,11 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.util.List; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -22,7 +19,7 @@ import io.swagger.v3.oas.annotations.media.Schema; /** * @Description: 题目 * @Author: jeecg-boot - * @Date: 2025-08-20 + * @Date: 2025-09-05 * @Version: V1.0 */ @Schema(description="题目") @@ -75,9 +72,16 @@ public class AppletQuestions implements Serializable { @Excel(name = "备注", width = 15) @Schema(description = "备注") private java.lang.String remark; + /**排序*/ + @Excel(name = "排序", width = 15) + @Schema(description = "排序") + private java.lang.Integer sort; + /**关联标签*/ + @Excel(name = "关联标签", width = 15, dicCode = "topic_associate_tag") + @Dict(dicCode = "topic_associate_tag") + @Schema(description = "关联标签") + private java.lang.String needTag; - @TableField(exist = false) - @Schema(description = "题目选项") private List options; } 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 index 6bca3dc..5b5f453 100644 --- 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 @@ -1,10 +1,8 @@ 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 com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -16,11 +14,12 @@ import org.jeecg.common.aspect.annotation.Dict; import io.swagger.v3.oas.annotations.media.Schema; import java.io.UnsupportedEncodingException; +import java.util.List; /** * @Description: 题目选项 * @Author: jeecg-boot - * @Date: 2025-08-20 + * @Date: 2025-09-05 * @Version: V1.0 */ @Schema(description="题目选项") @@ -63,27 +62,31 @@ public class AppletQuestionsOptions implements Serializable { @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; - - @Excel(name = "方案", width = 15, dictTable = "applet_scheme", dicText = "title", dicCode = "id") + /**方案*/ + @Excel(name = "方案", width = 15, dictTable = "applet_scheme", dicText = "title", dicCode = "id") + @Dict(dictTable = "applet_scheme", dicText = "title", dicCode = "id") @Schema(description = "方案") private java.lang.String schemeId; - - @Excel(name = "商品", width = 15, dictTable = "applet_product", dicText = "name", dicCode = "id") - @Schema(description = "商品") + /**产品*/ + @Excel(name = "产品", width = 15, dictTable = "applet_product", dicText = "name", dicCode = "id") + @Dict(dictTable = "applet_product", dicText = "name", dicCode = "id") + @Schema(description = "产品") private java.lang.String productId; + /**设置关联*/ + @Excel(name = "设置关联", width = 15, dicCode = "topic_associate_tag") + @Dict(dicCode = "topic_associate_tag") + @Schema(description = "设置关联") + private java.lang.String settingTag; } 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 index 422b7e7..ee28228 100644 --- 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 @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 题目 * @Author: jeecg-boot - * @Date: 2025-08-20 + * @Date: 2025-09-05 * @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 index 53e6d3d..e6ec986 100644 --- 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 @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 题目选项 * @Author: jeecg-boot - * @Date: 2025-08-20 + * @Date: 2025-09-05 * @Version: V1.0 */ public interface AppletQuestionsOptionsMapper extends BaseMapper { 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 index 3ec5cad..a6b8512 100644 --- 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 @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 题目选项 * @Author: jeecg-boot - * @Date: 2025-08-20 + * @Date: 2025-09-05 * @Version: V1.0 */ public interface IAppletQuestionsOptionsService extends IService { 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 index 637d7a0..348967b 100644 --- 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 @@ -10,7 +10,7 @@ import java.util.List; /** * @Description: 题目 * @Author: jeecg-boot - * @Date: 2025-08-20 + * @Date: 2025-09-05 * @Version: V1.0 */ public interface IAppletQuestionsService extends IService { 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 index 2ea63c8..e23c0a5 100644 --- 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 @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 题目选项 * @Author: jeecg-boot - * @Date: 2025-08-20 + * @Date: 2025-09-05 * @Version: V1.0 */ @Service 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 index 7cf2d71..f1a06c7 100644 --- 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 @@ -16,7 +16,7 @@ import java.util.Collection; /** * @Description: 题目 * @Author: jeecg-boot - * @Date: 2025-08-20 + * @Date: 2025-09-05 * @Version: V1.0 */ @Service 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 index f3eb495..70ecc71 100644 --- 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 @@ -19,7 +19,7 @@ import io.swagger.v3.oas.annotations.media.Schema; /** * @Description: 题目 * @Author: jeecg-boot - * @Date: 2025-08-20 + * @Date: 2025-09-05 * @Version: V1.0 */ @Data @@ -69,6 +69,15 @@ public class AppletQuestionsPage { @Excel(name = "备注", width = 15) @Schema(description = "备注") private java.lang.String remark; + /**排序*/ + @Excel(name = "排序", width = 15) + @Schema(description = "排序") + private java.lang.Integer sort; + /**关联标签*/ + @Excel(name = "关联标签", width = 15, dicCode = "topic_associate_tag") + @Dict(dicCode = "topic_associate_tag") + @Schema(description = "关联标签") + private java.lang.String needTag; @ExcelCollection(name="题目选项") @Schema(description = "题目选项") diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletQuestions.data.ts b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletQuestions.data.ts index b9f14e8..2546232 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletQuestions.data.ts +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/AppletQuestions.data.ts @@ -34,6 +34,16 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'remark' }, + { + title: '排序', + align:"center", + dataIndex: 'sort' + }, + { + title: '关联标签', + align:"center", + dataIndex: 'needTag_dictText' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -54,7 +64,8 @@ export const formSchema: FormSchema[] = [ field: 'type', component: 'JDictSelectTag', componentProps:{ - dictCode:"applett_topic_type" + dictCode:"applett_topic_type", + type: "radio" }, }, { @@ -78,6 +89,19 @@ export const formSchema: FormSchema[] = [ label: '备注', field: 'remark', component: 'Input', + }, + { + label: '排序', + field: 'sort', + component: 'InputNumber', + }, + { + label: '关联标签', + field: 'needTag', + component: 'JSelectMultiple', + componentProps:{ + dictCode:"topic_associate_tag" + }, }, // TODO 主键隐藏字段，目前写死为ID { @@ -116,6 +140,21 @@ export const appletQuestionsOptionsColumns: BasicColumn[] = [ align:"center", dataIndex: 'imageAfter' }, + { + title: '方案', + align:"center", + dataIndex: 'schemeId_dictText' + }, + { + title: '产品', + align:"center", + dataIndex: 'productId_dictText' + }, + { + title: '设置关联', + align:"center", + dataIndex: 'settingTag_dictText' + }, ]; //子表表格配置 export const appletQuestionsOptionsJVxeColumns: JVxeColumn[] = [ @@ -161,15 +200,47 @@ export const appletQuestionsOptionsJVxeColumns: JVxeColumn[] = [ placeholder: '请输入${title}', defaultValue:'', }, + { + title: '方案', + key: 'schemeId', + type: JVxeTypes.selectMultiple, + options:[], + dictCode:"applet_scheme,title,id", + width:"250px", + placeholder: '请输入${title}', + defaultValue:'', + }, + { + title: '产品', + key: 'productId', + type: JVxeTypes.selectMultiple, + options:[], + dictCode:"applet_product,name,id", + width:"250px", + placeholder: '请输入${title}', + defaultValue:'', + }, + { + title: '设置关联', + key: 'settingTag', + type: JVxeTypes.selectMultiple, + options:[], + dictCode:"topic_associate_tag", + width:"250px", + placeholder: '请输入${title}', + defaultValue:'', + }, ] // 高级查询数据 export const superQuerySchema = { - type: {title: '类型',order: 0,view: 'list', type: 'string',dictCode: 'applett_topic_type',}, + type: {title: '类型',order: 0,view: 'radio', 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',}, + sort: {title: '排序',order: 5,view: 'number', type: 'number',}, + needTag: {title: '关联标签',order: 6,view: 'list_multi', type: 'string',dictCode: 'topic_associate_tag',}, //子表高级查询 appletQuestionsOptions: { title: '题目选项', @@ -180,6 +251,9 @@ export const superQuerySchema = { suffix: {title: '后缀文字',order: 2,view: 'text', type: 'string',}, image: {title: '选中前图片',order: 3,view: 'image', type: 'string',}, imageAfter: {title: '选中后图片',order: 4,view: 'text', type: 'string',}, + schemeId: {title: '方案',order: 5,view: 'list_multi', type: 'string',dictTable: "applet_scheme", dictCode: 'id', dictText: 'title',}, + productId: {title: '产品',order: 6,view: 'list_multi', type: 'string',dictTable: "applet_product", dictCode: 'id', dictText: 'name',}, + settingTag: {title: '设置关联',order: 7,view: 'list_multi', type: 'string',dictCode: 'topic_associate_tag',}, } }, }; diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/V20250905_1__menu_insert_AppletQuestions.sql b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/V20250905_1__menu_insert_AppletQuestions.sql new file mode 100644 index 0000000..a3a013a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletPaper/vue3/V20250905_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 ('2025090505045210570', 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-09-05 17:04:57', 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 ('2025090505045210571', '2025090505045210570', '添加题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-09-05 17:04:57', 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 ('2025090505045210572', '2025090505045210570', '编辑题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-09-05 17:04:57', 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 ('2025090505045210573', '2025090505045210570', '删除题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-09-05 17:04:57', 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 ('2025090505045210574', '2025090505045210570', '批量删除题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-09-05 17:04:57', 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 ('2025090505045210575', '2025090505045210570', '导出excel_题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-09-05 17:04:57', 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 ('2025090505045210576', '2025090505045210570', '导入excel_题目', NULL, NULL, 0, NULL, NULL, 2, 'appletPaper:applet_questions:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-09-05 17:04:57', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/personalizedRecommen/entity/PersonalizedRecommen.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/personalizedRecommen/entity/PersonalizedRecommen.java index 79be11b..8d93910 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/personalizedRecommen/entity/PersonalizedRecommen.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/personalizedRecommen/entity/PersonalizedRecommen.java @@ -76,4 +76,8 @@ public class PersonalizedRecommen implements Serializable { @Excel(name = "调查问卷", width = 15) @Schema(description = "调查问卷") private java.lang.String paperId; + /**图片*/ + @Excel(name = "图片", width = 15) + @Schema(description = "图片") + private java.lang.String image; }