From bb9a13f1fcd7a998dbc1bac5c80ce08a38114e1c Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Tue, 16 Sep 2025 21:17:52 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9B=BE=E7=89=87=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=202=E3=80=81=E6=88=90=E9=95=BF=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E6=A8=A1=E5=9D=97=203=E3=80=81=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=204=E3=80=81=E5=BC=80=E8=90=A5=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/StudytourActivity.java | 6 + .../controller/StudytourCommentController.java | 32 ++-- .../studytourComment/entity/StudytourComment.java | 20 ++- .../mapper/StudytourCommentMapper.java | 4 +- .../service/IStudytourCommentService.java | 4 +- .../service/impl/StudytourCommentServiceImpl.java | 4 +- .../studytourComment/vue/StudytourCommentList.vue | 10 +- .../vue/modules/StudytourCommentForm.vue | 5 - .../studytourComment/vue3/StudytourComment.data.ts | 13 -- .../studytourComment/vue3/StudytourCommentList.vue | 4 +- .../controller/StudytourExperienceController.java | 171 ++++++++++++++++++ .../entity/StudytourExperience.java | 68 ++++++++ .../mapper/StudytourExperienceMapper.java | 17 ++ .../mapper/xml/StudytourExperienceMapper.xml | 5 + .../service/IStudytourExperienceService.java | 14 ++ .../impl/StudytourExperienceServiceImpl.java | 19 ++ .../vue/StudytourExperienceList.vue | 191 +++++++++++++++++++++ .../vue/modules/StudytourExperienceForm.vue | 119 +++++++++++++ .../StudytourExperienceModal.Style#Drawer.vue} | 8 +- .../vue/modules/StudytourExperienceModal.vue | 60 +++++++ .../vue3/StudytourExperience.api.ts | 61 +++++++ .../vue3/StudytourExperience.data.ts | 62 +++++++ .../vue3/StudytourExperienceList.vue | 162 +++++++++++++++++ .../vue3/components/StudytourExperienceModal.vue | 58 +++++++ .../controller/StudytourImageController.java | 2 +- .../studytourImage/entity/StudytourImage.java | 2 +- .../entity/StudytourImageContent.java | 6 +- .../mapper/StudytourImageContentMapper.java | 2 +- .../mapper/StudytourImageMapper.java | 2 +- .../service/IStudytourImageContentService.java | 2 +- .../service/IStudytourImageService.java | 2 +- .../impl/StudytourImageContentServiceImpl.java | 2 +- .../service/impl/StudytourImageServiceImpl.java | 2 +- .../studytourImage/vo/StudytourImagePage.java | 2 +- .../studytourImage/vue/StudytourImageList.vue | 8 +- .../vue/modules/StudytourImageForm.vue | 66 ++++--- .../studytourImage/vue3/StudytourImage.data.ts | 9 + .../controller/StudytourNoticeController.java | 171 ++++++++++++++++++ .../studytourNotice/entity/StudytourNotice.java | 64 +++++++ .../mapper/StudytourNoticeMapper.java | 17 ++ .../mapper/xml/StudytourNoticeMapper.xml | 5 + .../service/IStudytourNoticeService.java | 14 ++ .../service/impl/StudytourNoticeServiceImpl.java | 19 ++ .../studytourNotice/vue/StudytourNoticeList.vue | 185 ++++++++++++++++++++ .../vue/modules/StudytourNoticeForm.vue | 114 ++++++++++++ .../modules/StudytourNoticeModal.Style#Drawer.vue} | 8 +- .../vue/modules/StudytourNoticeModal.vue | 60 +++++++ .../studytourNotice/vue3/StudytourNotice.api.ts | 61 +++++++ .../studytourNotice/vue3/StudytourNotice.data.ts | 50 ++++++ .../studytourNotice/vue3/StudytourNoticeList.vue | 162 +++++++++++++++++ .../vue3/components/StudytourNoticeModal.vue | 58 +++++++ .../controller/StudytourOrderController.java | 2 +- .../studytourOrder/entity/StudytourOrder.java | 2 +- .../entity/StudytourOrderPerson.java | 2 +- .../mapper/StudytourOrderMapper.java | 2 +- .../mapper/StudytourOrderPersonMapper.java | 2 +- .../service/IStudytourOrderPersonService.java | 2 +- .../service/IStudytourOrderService.java | 2 +- .../impl/StudytourOrderPersonServiceImpl.java | 2 +- .../service/impl/StudytourOrderServiceImpl.java | 2 +- .../studytourOrder/vo/StudytourOrderPage.java | 2 +- .../studytourOrder/vue/StudytourOrderList.vue | 36 ++-- .../vue/modules/StudytourOrderForm.vue | 64 +++---- .../studytourOrder/vue3/StudytourOrder.api.ts | 7 + .../studytourOrder/vue3/StudytourOrder.data.ts | 55 ++++++ .../studytourOrder/vue3/StudytourOrderList.vue | 30 ++-- .../vue3/components/StudytourOrderModal.vue | 63 ++++++- .../studytourRecord/entity/StudytourRecord.java | 22 +++ .../jeecg/modules/api/service/CommentService.java | 11 ++ .../modules/api/service/ExperienceService.java | 3 +- .../jeecg/modules/api/service/ImageService.java | 8 +- .../api/service/Impl/ActivityServiceImpl.java | 35 ++++ .../api/service/Impl/CommentServiceImpl.java | 111 ++++++++++++ .../api/service/Impl/ExperienceServiceImpl.java | 66 +++++-- .../modules/api/service/Impl/ImageServiceImpl.java | 38 +++- .../api/service/Impl/NoticeServiceImpl.java | 106 ++++++++++++ .../jeecg/modules/api/service/NoticeService.java | 15 ++ .../api/studytourController/CommentController.java | 22 ++- .../api/studytourController/ConfigController.java | 2 - .../studytourController/ExperienceController.java | 10 +- .../api/studytourController/ImageController.java | 20 +-- .../api/studytourController/NoticeController.java | 41 +++++ 82 files changed, 2761 insertions(+), 236 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/controller/StudytourExperienceController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/entity/StudytourExperience.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/StudytourExperienceMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/xml/StudytourExperienceMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/IStudytourExperienceService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/impl/StudytourExperienceServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/StudytourExperienceList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceForm.vue rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourOrder/vue/modules/StudytourOrderModal.Style#Drawer.vue => studytourExperience/vue/modules/StudytourExperienceModal.Style#Drawer.vue} (85%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperience.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperience.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperienceList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/components/StudytourExperienceModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/controller/StudytourNoticeController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/entity/StudytourNotice.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/mapper/StudytourNoticeMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/mapper/xml/StudytourNoticeMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/IStudytourNoticeService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/impl/StudytourNoticeServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/StudytourNoticeList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeForm.vue rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourImage/vue/modules/StudytourImageModal.Style#Drawer.vue => studytourNotice/vue/modules/StudytourNoticeModal.Style#Drawer.vue} (86%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNotice.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNotice.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNoticeList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/components/StudytourNoticeModal.vue create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/NoticeServiceImpl.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/NoticeService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/NoticeController.java diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourActivity/entity/StudytourActivity.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourActivity/entity/StudytourActivity.java index 05cf925..e9a5f44 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourActivity/entity/StudytourActivity.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourActivity/entity/StudytourActivity.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.jeecg.modules.studytourActivityDate.entity.StudytourActivityDate; +import org.jeecg.modules.studytourComment.entity.StudytourComment; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; @@ -145,4 +146,9 @@ public class StudytourActivity implements Serializable { @ApiModelProperty(value = "活动团期") List dateList; + //活动活动评论 + @TableField(exist = false) + @ApiModelProperty(value = "活动评论") + List commentList; + } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/controller/StudytourCommentController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/controller/StudytourCommentController.java index c7c16ce..42db3bf 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/controller/StudytourCommentController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/controller/StudytourCommentController.java @@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; /** - * @Description: 订单评价心得表 + * @Description: 订单评价表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-16 * @Version: V1.0 */ -@Api(tags="订单评价心得表") +@Api(tags="订单评价表") @RestController @RequestMapping("/studytourComment/studytourComment") @Slf4j @@ -59,8 +59,8 @@ public class StudytourCommentController extends JeecgController> queryPageList(StudytourComment studytourComment, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -78,8 +78,8 @@ public class StudytourCommentController extends JeecgController add(@RequestBody StudytourComment studytourComment) { studytourCommentService.save(studytourComment); @@ -92,8 +92,8 @@ public class StudytourCommentController extends JeecgController edit(@RequestBody StudytourComment studytourComment) { studytourCommentService.updateById(studytourComment); @@ -106,8 +106,8 @@ public class StudytourCommentController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { studytourCommentService.removeById(id); @@ -120,8 +120,8 @@ public class StudytourCommentController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.studytourCommentService.removeByIds(Arrays.asList(ids.split(","))); @@ -134,8 +134,8 @@ public class StudytourCommentController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { StudytourComment studytourComment = studytourCommentService.getById(id); @@ -153,7 +153,7 @@ public class StudytourCommentController extends JeecgController { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/IStudytourCommentService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/IStudytourCommentService.java index f8c6fd3..21a8ff1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/IStudytourCommentService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/IStudytourCommentService.java @@ -4,9 +4,9 @@ import org.jeecg.modules.studytourComment.entity.StudytourComment; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 订单评价心得表 + * @Description: 订单评价表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-16 * @Version: V1.0 */ public interface IStudytourCommentService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/impl/StudytourCommentServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/impl/StudytourCommentServiceImpl.java index e4f876f..9aadbc1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/impl/StudytourCommentServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/impl/StudytourCommentServiceImpl.java @@ -8,9 +8,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 订单评价心得表 + * @Description: 订单评价表 * @Author: jeecg-boot - * @Date: 2025-08-25 + * @Date: 2025-09-16 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/StudytourCommentList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/StudytourCommentList.vue index 075bda8..2fb1d23 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/StudytourCommentList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/StudytourCommentList.vue @@ -12,7 +12,7 @@
新增 - 导出 + 导出 导入 @@ -109,7 +109,7 @@ }, data () { return { - description: '订单评价心得表管理页面', + description: '订单评价表管理页面', // 表头 columns: [ { @@ -158,11 +158,6 @@ align:"center", dataIndex: 'userId_dictText' }, - { - title:'类型', - align:"center", - dataIndex: 'type_dictText' - }, { title: '操作', dataIndex: 'action', @@ -204,7 +199,6 @@ fieldList.push({type:'int',value:'teacherScore',text:'导师分数',dictCode:''}) fieldList.push({type:'string',value:'orderId',text:'关联订单id',dictCode:"studytour_order,id,id"}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) - fieldList.push({type:'string',value:'type',text:'类型',dictCode:'comment_type'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/modules/StudytourCommentForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/modules/StudytourCommentForm.vue index 2ffd853..fb58623 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/modules/StudytourCommentForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/modules/StudytourCommentForm.vue @@ -38,11 +38,6 @@ - - - - - diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue3/StudytourComment.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue3/StudytourComment.data.ts index 4c53227..7ff29a5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue3/StudytourComment.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue3/StudytourComment.data.ts @@ -40,11 +40,6 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'userId_dictText' }, - { - title: '类型', - align:"center", - dataIndex: 'type_dictText' - }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -94,12 +89,4 @@ export const formSchema: FormSchema[] = [ dictCode:"han_hai_member,nick_name,id" }, }, - { - label: '类型', - field: 'type', - component: 'JDictSelectTag', - componentProps:{ - dictCode:"comment_type" - }, - }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue3/StudytourCommentList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue3/StudytourCommentList.vue index 3e11876..57fd2d4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue3/StudytourCommentList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue3/StudytourCommentList.vue @@ -53,7 +53,7 @@ //注册table数据 const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ tableProps:{ - title: '订单评价心得表', + title: '订单评价表', api: list, columns, canResize:false, @@ -70,7 +70,7 @@ }, }, exportConfig: { - name:"订单评价心得表", + name:"订单评价表", url: getExportUrl, }, importConfig: { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/controller/StudytourExperienceController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/controller/StudytourExperienceController.java new file mode 100644 index 0000000..9db134f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/controller/StudytourExperienceController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.studytourExperience.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.studytourExperience.entity.StudytourExperience; +import org.jeecg.modules.studytourExperience.service.IStudytourExperienceService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 学员心得表 + * @Author: jeecg-boot + * @Date: 2025-09-16 + * @Version: V1.0 + */ +@Api(tags="学员心得表") +@RestController +@RequestMapping("/studytourExperience/studytourExperience") +@Slf4j +public class StudytourExperienceController extends JeecgController { + @Autowired + private IStudytourExperienceService studytourExperienceService; + + /** + * 分页列表查询 + * + * @param studytourExperience + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "学员心得表-分页列表查询") + @ApiOperation(value="学员心得表-分页列表查询", notes="学员心得表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(StudytourExperience studytourExperience, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(studytourExperience, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = studytourExperienceService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param studytourExperience + * @return + */ + @AutoLog(value = "学员心得表-添加") + @ApiOperation(value="学员心得表-添加", notes="学员心得表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody StudytourExperience studytourExperience) { + studytourExperienceService.save(studytourExperience); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param studytourExperience + * @return + */ + @AutoLog(value = "学员心得表-编辑") + @ApiOperation(value="学员心得表-编辑", notes="学员心得表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody StudytourExperience studytourExperience) { + studytourExperienceService.updateById(studytourExperience); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "学员心得表-通过id删除") + @ApiOperation(value="学员心得表-通过id删除", notes="学员心得表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + studytourExperienceService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "学员心得表-批量删除") + @ApiOperation(value="学员心得表-批量删除", notes="学员心得表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.studytourExperienceService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "学员心得表-通过id查询") + @ApiOperation(value="学员心得表-通过id查询", notes="学员心得表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + StudytourExperience studytourExperience = studytourExperienceService.getById(id); + if(studytourExperience==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(studytourExperience); + } + + /** + * 导出excel + * + * @param request + * @param studytourExperience + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, StudytourExperience studytourExperience) { + return super.exportXls(request, studytourExperience, StudytourExperience.class, "学员心得表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, StudytourExperience.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/entity/StudytourExperience.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/entity/StudytourExperience.java new file mode 100644 index 0000000..1fa61c5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/entity/StudytourExperience.java @@ -0,0 +1,68 @@ +package org.jeecg.modules.studytourExperience.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 学员心得表 + * @Author: jeecg-boot + * @Date: 2025-09-16 + * @Version: V1.0 + */ +@Data +@TableName("studytour_experience") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="studytour_experience对象", description="学员心得表") +public class StudytourExperience implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**文字内容*/ + @Excel(name = "文字内容", width = 15) + @ApiModelProperty(value = "文字内容") + private java.lang.String content; + /**图片内容*/ + @Excel(name = "图片内容", width = 15) + @ApiModelProperty(value = "图片内容") + private java.lang.String image; + /**关联活动*/ + @Excel(name = "关联活动", width = 15, dictTable = "studytour_activity", dicText = "title", dicCode = "id") + @Dict(dictTable = "studytour_activity", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联活动") + private java.lang.String activityId; + /**关联用户*/ + @Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/StudytourExperienceMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/StudytourExperienceMapper.java new file mode 100644 index 0000000..913e4e2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/StudytourExperienceMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.studytourExperience.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.studytourExperience.entity.StudytourExperience; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 学员心得表 + * @Author: jeecg-boot + * @Date: 2025-09-16 + * @Version: V1.0 + */ +public interface StudytourExperienceMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/xml/StudytourExperienceMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/xml/StudytourExperienceMapper.xml new file mode 100644 index 0000000..11152bf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/xml/StudytourExperienceMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/IStudytourExperienceService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/IStudytourExperienceService.java new file mode 100644 index 0000000..21ac4f1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/IStudytourExperienceService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.studytourExperience.service; + +import org.jeecg.modules.studytourExperience.entity.StudytourExperience; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 学员心得表 + * @Author: jeecg-boot + * @Date: 2025-09-16 + * @Version: V1.0 + */ +public interface IStudytourExperienceService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/impl/StudytourExperienceServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/impl/StudytourExperienceServiceImpl.java new file mode 100644 index 0000000..e7f6858 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/impl/StudytourExperienceServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.studytourExperience.service.impl; + +import org.jeecg.modules.studytourExperience.entity.StudytourExperience; +import org.jeecg.modules.studytourExperience.mapper.StudytourExperienceMapper; +import org.jeecg.modules.studytourExperience.service.IStudytourExperienceService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 学员心得表 + * @Author: jeecg-boot + * @Date: 2025-09-16 + * @Version: V1.0 + */ +@Service +public class StudytourExperienceServiceImpl extends ServiceImpl implements IStudytourExperienceService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/StudytourExperienceList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/StudytourExperienceList.vue new file mode 100644 index 0000000..df20691 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/StudytourExperienceList.vue @@ -0,0 +1,191 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceForm.vue new file mode 100644 index 0000000..a2e184b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceForm.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/modules/StudytourOrderModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceModal.Style#Drawer.vue similarity index 85% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/modules/StudytourOrderModal.Style#Drawer.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceModal.Style#Drawer.vue index 0e79298..14ff405 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/modules/StudytourOrderModal.Style#Drawer.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceModal.Style#Drawer.vue @@ -7,7 +7,7 @@ @close="close" destroyOnClose :visible="visible"> - +
关闭 提交 @@ -17,12 +17,12 @@ \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperience.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperience.api.ts new file mode 100644 index 0000000..700c1ea --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperience.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/studytourExperience/studytourExperience/list', + save='/studytourExperience/studytourExperience/add', + edit='/studytourExperience/studytourExperience/edit', + deleteOne = '/studytourExperience/studytourExperience/delete', + deleteBatch = '/studytourExperience/studytourExperience/deleteBatch', + importExcel = '/studytourExperience/studytourExperience/importExcel', + exportXls = '/studytourExperience/studytourExperience/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperience.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperience.data.ts new file mode 100644 index 0000000..e360d40 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperience.data.ts @@ -0,0 +1,62 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '文字内容', + align:"center", + dataIndex: 'content' + }, + { + title: '图片内容', + align:"center", + dataIndex: 'image', + customRender:render.renderAvatar, + }, + { + title: '关联活动', + align:"center", + dataIndex: 'activityId_dictText' + }, + { + title: '关联用户', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '文字内容', + field: 'content', + component: 'InputTextArea',//TODO 注意string转换问题 + }, + { + label: '图片内容', + field: 'image', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '关联活动', + field: 'activityId', + component: 'JSearchSelect', + componentProps:{ + dict:"studytour_activity,title,id" + }, + }, + { + label: '关联用户', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperienceList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperienceList.vue new file mode 100644 index 0000000..e50460a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/StudytourExperienceList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/components/StudytourExperienceModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/components/StudytourExperienceModal.vue new file mode 100644 index 0000000..760a58f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue3/components/StudytourExperienceModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/controller/StudytourImageController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/controller/StudytourImageController.java index 8d1a1fc..0546ea6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/controller/StudytourImageController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/controller/StudytourImageController.java @@ -45,7 +45,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 图片直播表 * @Author: jeecg-boot - * @Date: 2025-09-12 + * @Date: 2025-09-16 * @Version: V1.0 */ @Api(tags="图片直播表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/entity/StudytourImage.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/entity/StudytourImage.java index 2e23d2e..6ca3890 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/entity/StudytourImage.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/entity/StudytourImage.java @@ -17,7 +17,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 图片直播表 * @Author: jeecg-boot - * @Date: 2025-09-12 + * @Date: 2025-09-16 * @Version: V1.0 */ @ApiModel(value="studytour_image对象", description="图片直播表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/entity/StudytourImageContent.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/entity/StudytourImageContent.java index 793c116..e0e1368 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/entity/StudytourImageContent.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/entity/StudytourImageContent.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 用户图片直播表 * @Author: jeecg-boot - * @Date: 2025-09-12 + * @Date: 2025-09-16 * @Version: V1.0 */ @ApiModel(value="studytour_image_content对象", description="用户图片直播表") @@ -52,6 +52,10 @@ public class StudytourImageContent implements Serializable { /**关联图片直播*/ @ApiModelProperty(value = "关联图片直播") private java.lang.String imageId; + /**关联活动*/ + @Excel(name = "关联活动", width = 15, dictTable = "studytour_activity", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "关联活动") + private java.lang.String activityId; /**关联用户*/ @Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "关联用户") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/mapper/StudytourImageContentMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/mapper/StudytourImageContentMapper.java index 4a68366..8f2273b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/mapper/StudytourImageContentMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/mapper/StudytourImageContentMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 用户图片直播表 * @Author: jeecg-boot - * @Date: 2025-09-12 + * @Date: 2025-09-16 * @Version: V1.0 */ public interface StudytourImageContentMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/mapper/StudytourImageMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/mapper/StudytourImageMapper.java index 4f2a044..5e73d4c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/mapper/StudytourImageMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/mapper/StudytourImageMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 图片直播表 * @Author: jeecg-boot - * @Date: 2025-09-12 + * @Date: 2025-09-16 * @Version: V1.0 */ public interface StudytourImageMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/IStudytourImageContentService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/IStudytourImageContentService.java index 601cf7a..265783e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/IStudytourImageContentService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/IStudytourImageContentService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 用户图片直播表 * @Author: jeecg-boot - * @Date: 2025-09-12 + * @Date: 2025-09-16 * @Version: V1.0 */ public interface IStudytourImageContentService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/IStudytourImageService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/IStudytourImageService.java index 5db376a..978c597 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/IStudytourImageService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/IStudytourImageService.java @@ -10,7 +10,7 @@ import java.util.List; /** * @Description: 图片直播表 * @Author: jeecg-boot - * @Date: 2025-09-12 + * @Date: 2025-09-16 * @Version: V1.0 */ public interface IStudytourImageService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/impl/StudytourImageContentServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/impl/StudytourImageContentServiceImpl.java index 60eb66a..9b6e370 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/impl/StudytourImageContentServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/impl/StudytourImageContentServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 用户图片直播表 * @Author: jeecg-boot - * @Date: 2025-09-12 + * @Date: 2025-09-16 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/impl/StudytourImageServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/impl/StudytourImageServiceImpl.java index 57fd349..0800d03 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/impl/StudytourImageServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/service/impl/StudytourImageServiceImpl.java @@ -16,7 +16,7 @@ import java.util.Collection; /** * @Description: 图片直播表 * @Author: jeecg-boot - * @Date: 2025-09-12 + * @Date: 2025-09-16 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vo/StudytourImagePage.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vo/StudytourImagePage.java index 1c85046..cfe4f05 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vo/StudytourImagePage.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vo/StudytourImagePage.java @@ -17,7 +17,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 图片直播表 * @Author: jeecg-boot - * @Date: 2025-09-12 + * @Date: 2025-09-16 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/StudytourImageList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/StudytourImageList.vue index 1a13b28..c1c7a0f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/StudytourImageList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/StudytourImageList.vue @@ -176,10 +176,10 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) - fieldList.push({type:'Text',value:'address',text:'地址',dictCode:''}) - fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'}) - fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) + fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''}) + fieldList.push({type:'Text',value:'address',text:'地址',dictCode:''}) + fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'}) + fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/modules/StudytourImageForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/modules/StudytourImageForm.vue index f0b7569..2057bd7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/modules/StudytourImageForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/modules/StudytourImageForm.vue @@ -16,12 +16,12 @@ - + - + @@ -30,7 +30,8 @@ - + :toolbar="true" + /> @@ -48,14 +50,17 @@ + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeForm.vue new file mode 100644 index 0000000..017b098 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeForm.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/modules/StudytourImageModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeModal.Style#Drawer.vue similarity index 86% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/modules/StudytourImageModal.Style#Drawer.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeModal.Style#Drawer.vue index 948edd6..0977a9c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourImage/vue/modules/StudytourImageModal.Style#Drawer.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeModal.Style#Drawer.vue @@ -7,7 +7,7 @@ @close="close" destroyOnClose :visible="visible"> - +
关闭 提交 @@ -17,12 +17,12 @@ \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNotice.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNotice.api.ts new file mode 100644 index 0000000..ea0aaa0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNotice.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/studytourNotice/studytourNotice/list', + save='/studytourNotice/studytourNotice/add', + edit='/studytourNotice/studytourNotice/edit', + deleteOne = '/studytourNotice/studytourNotice/delete', + deleteBatch = '/studytourNotice/studytourNotice/deleteBatch', + importExcel = '/studytourNotice/studytourNotice/importExcel', + exportXls = '/studytourNotice/studytourNotice/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNotice.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNotice.data.ts new file mode 100644 index 0000000..8a72269 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNotice.data.ts @@ -0,0 +1,50 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '通知信息', + align:"center", + dataIndex: 'content', + slots: { customRender: 'htmlSlot' }, + }, + { + title: '是否已读', + align:"center", + dataIndex: 'isRead_dictText' + }, + { + title: '关联用户', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '通知信息', + field: 'content', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, + { + label: '是否已读', + field: 'isRead', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"is_true" + }, + }, + { + label: '关联用户', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNoticeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNoticeList.vue new file mode 100644 index 0000000..1319d8d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/StudytourNoticeList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/components/StudytourNoticeModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/components/StudytourNoticeModal.vue new file mode 100644 index 0000000..b47c2a5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue3/components/StudytourNoticeModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/controller/StudytourOrderController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/controller/StudytourOrderController.java index 0ababf7..379d599 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/controller/StudytourOrderController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/controller/StudytourOrderController.java @@ -45,7 +45,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-09-10 + * @Date: 2025-09-16 * @Version: V1.0 */ @Api(tags="订单信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/entity/StudytourOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/entity/StudytourOrder.java index e6926a5..9d9353e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/entity/StudytourOrder.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/entity/StudytourOrder.java @@ -18,7 +18,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-09-10 + * @Date: 2025-09-16 * @Version: V1.0 */ @ApiModel(value="studytour_order对象", description="订单信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/entity/StudytourOrderPerson.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/entity/StudytourOrderPerson.java index b8d5455..ae8f4da 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/entity/StudytourOrderPerson.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/entity/StudytourOrderPerson.java @@ -16,7 +16,7 @@ import java.io.UnsupportedEncodingException; /** * @Description: 订单人员表 * @Author: jeecg-boot - * @Date: 2025-09-10 + * @Date: 2025-09-16 * @Version: V1.0 */ @ApiModel(value="studytour_order_person对象", description="订单人员表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/mapper/StudytourOrderMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/mapper/StudytourOrderMapper.java index 496b919..0dfdf6b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/mapper/StudytourOrderMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/mapper/StudytourOrderMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-09-10 + * @Date: 2025-09-16 * @Version: V1.0 */ public interface StudytourOrderMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/mapper/StudytourOrderPersonMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/mapper/StudytourOrderPersonMapper.java index 03bbc6d..0dc2a4e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/mapper/StudytourOrderPersonMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/mapper/StudytourOrderPersonMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 订单人员表 * @Author: jeecg-boot - * @Date: 2025-09-10 + * @Date: 2025-09-16 * @Version: V1.0 */ public interface StudytourOrderPersonMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/IStudytourOrderPersonService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/IStudytourOrderPersonService.java index 3fb4fe3..7383b9b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/IStudytourOrderPersonService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/IStudytourOrderPersonService.java @@ -7,7 +7,7 @@ import java.util.List; /** * @Description: 订单人员表 * @Author: jeecg-boot - * @Date: 2025-09-10 + * @Date: 2025-09-16 * @Version: V1.0 */ public interface IStudytourOrderPersonService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/IStudytourOrderService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/IStudytourOrderService.java index a43a99b..5c75c26 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/IStudytourOrderService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/IStudytourOrderService.java @@ -10,7 +10,7 @@ import java.util.List; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-09-10 + * @Date: 2025-09-16 * @Version: V1.0 */ public interface IStudytourOrderService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/impl/StudytourOrderPersonServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/impl/StudytourOrderPersonServiceImpl.java index 613af46..7191de8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/impl/StudytourOrderPersonServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/impl/StudytourOrderPersonServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 订单人员表 * @Author: jeecg-boot - * @Date: 2025-09-10 + * @Date: 2025-09-16 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/impl/StudytourOrderServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/impl/StudytourOrderServiceImpl.java index 56606bb..96b3fb3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/impl/StudytourOrderServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/service/impl/StudytourOrderServiceImpl.java @@ -16,7 +16,7 @@ import java.util.Collection; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-09-10 + * @Date: 2025-09-16 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vo/StudytourOrderPage.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vo/StudytourOrderPage.java index db47710..65c0f4f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vo/StudytourOrderPage.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vo/StudytourOrderPage.java @@ -17,7 +17,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-09-10 + * @Date: 2025-09-16 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/StudytourOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/StudytourOrderList.vue index e629fa2..ca2c502 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/StudytourOrderList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/StudytourOrderList.vue @@ -251,24 +251,24 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''}) - fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) - fieldList.push({type:'date',value:'startDate',text:'开始日期'}) - fieldList.push({type:'date',value:'endDate',text:'结束日期'}) - fieldList.push({type:'int',value:'dayNum',text:'活动天数',dictCode:''}) - fieldList.push({type:'BigDecimal',value:'priceOrigin',text:'原价',dictCode:''}) - fieldList.push({type:'BigDecimal',value:'priceDiscount',text:'优惠价',dictCode:''}) - fieldList.push({type:'BigDecimal',value:'discount',text:'优惠券优惠金额',dictCode:''}) - fieldList.push({type:'BigDecimal',value:'payAmount',text:'支付金额',dictCode:''}) - fieldList.push({type:'datetime',value:'payTime',text:'支付时间'}) - fieldList.push({type:'string',value:'couponId',text:'关联优惠券id',dictCode:''}) - fieldList.push({type:'string',value:'receiptId',text:'发票类型',dictCode:'receipt_type'}) - fieldList.push({type:'string',value:'status',text:'订单状态',dictCode:'order_status'}) - fieldList.push({type:'Text',value:'activityTitle',text:'活动标题',dictCode:''}) - fieldList.push({type:'Text',value:'activityBrief',text:'活动简介',dictCode:''}) - fieldList.push({type:'Text',value:'activityTag',text:'活动标签',dictCode:''}) - fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'}) - fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) + fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''}) + fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) + fieldList.push({type:'date',value:'startDate',text:'开始日期'}) + fieldList.push({type:'date',value:'endDate',text:'结束日期'}) + fieldList.push({type:'int',value:'dayNum',text:'活动天数',dictCode:''}) + fieldList.push({type:'BigDecimal',value:'priceOrigin',text:'原价',dictCode:''}) + fieldList.push({type:'BigDecimal',value:'priceDiscount',text:'优惠价',dictCode:''}) + fieldList.push({type:'BigDecimal',value:'discount',text:'优惠券优惠金额',dictCode:''}) + fieldList.push({type:'BigDecimal',value:'payAmount',text:'支付金额',dictCode:''}) + fieldList.push({type:'datetime',value:'payTime',text:'支付时间'}) + fieldList.push({type:'string',value:'couponId',text:'关联优惠券id',dictCode:''}) + fieldList.push({type:'string',value:'receiptId',text:'发票类型',dictCode:'receipt_type'}) + fieldList.push({type:'string',value:'status',text:'订单状态',dictCode:'order_status'}) + fieldList.push({type:'Text',value:'activityTitle',text:'活动标题',dictCode:''}) + fieldList.push({type:'Text',value:'activityBrief',text:'活动简介',dictCode:''}) + fieldList.push({type:'Text',value:'activityTag',text:'活动标签',dictCode:''}) + fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'}) + fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/modules/StudytourOrderForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/modules/StudytourOrderForm.vue index 5600765..d503f2f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/modules/StudytourOrderForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourOrder/vue/modules/StudytourOrderForm.vue @@ -86,12 +86,12 @@ - + - + @@ -100,7 +100,8 @@ - + :toolbar="true" + /> @@ -118,14 +120,17 @@