diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 951e0a6..ce5cd3f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-09-18 + * @Date: 2025-09-19 * @Version: V1.0 */ @Api(tags="han_hai_member") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java index 2d2f2c6..17146b2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-09-18 + * @Date: 2025-09-19 * @Version: V1.0 */ @Data @@ -159,7 +159,8 @@ public class HanHaiMember implements Serializable { @ApiModelProperty(value = "shareId") private java.lang.String shareId; /**邀请人*/ - @Excel(name = "邀请人", width = 15) + @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 vid; /**邀请时间*/ @@ -200,4 +201,8 @@ public class HanHaiMember implements Serializable { @Excel(name = "是否分销商", width = 15) @ApiModelProperty(value = "是否分销商") private java.lang.String isDai; + /**总佣金*/ + @Excel(name = "总佣金", width = 15) + @ApiModelProperty(value = "总佣金") + private java.math.BigDecimal commission; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java index 9b81e63..225e9db 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-09-18 + * @Date: 2025-09-19 * @Version: V1.0 */ public interface HanHaiMemberMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java index 4f2f5e1..b648fb3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-09-18 + * @Date: 2025-09-19 * @Version: V1.0 */ public interface IHanHaiMemberService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java index bc81d07..b114f2f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: han_hai_member * @Author: jeecg-boot - * @Date: 2025-09-18 + * @Date: 2025-09-19 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue index 4a5278e..1efafa6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue @@ -99,6 +99,7 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import HanHaiMemberModal from './modules/HanHaiMemberModal' + import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'HanHaiMemberList', @@ -140,7 +141,7 @@ { title:'邀请人', align:"center", - dataIndex: 'vid' + dataIndex: 'vid_dictText' }, { title:'邀请时间', @@ -155,6 +156,11 @@ align:"center", dataIndex: 'price' }, + { + title:'总佣金', + align:"center", + dataIndex: 'commission' + }, { title: '操作', dataIndex: 'action', @@ -192,9 +198,10 @@ fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''}) fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) - fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:''}) + fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:"han_hai_member,nick_name,id"}) fieldList.push({type:'date',value:'vtime',text:'邀请时间'}) fieldList.push({type:'BigDecimal',value:'price',text:'余额',dictCode:''}) + fieldList.push({type:'BigDecimal',value:'commission',text:'总佣金',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue index 1fb962c..678bc71 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue @@ -20,7 +20,7 @@ - + @@ -33,6 +33,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts index 2502114..7a77dbd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts @@ -23,7 +23,7 @@ export const columns: BasicColumn[] = [ { title: '邀请人', align:"center", - dataIndex: 'vid' + dataIndex: 'vid_dictText' }, { title: '邀请时间', @@ -38,6 +38,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'price' }, + { + title: '总佣金', + align:"center", + dataIndex: 'commission' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -70,7 +75,10 @@ export const formSchema: FormSchema[] = [ { label: '邀请人', field: 'vid', - component: 'Input', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"han_hai_member,nick_name,id" + }, }, { label: '邀请时间', @@ -82,4 +90,9 @@ export const formSchema: FormSchema[] = [ field: 'price', component: 'InputNumber', }, + { + label: '总佣金', + field: 'commission', + component: 'InputNumber', + }, ]; 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 e9a5f44..9ffc719 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 @@ -146,9 +146,45 @@ public class StudytourActivity implements Serializable { @ApiModelProperty(value = "活动团期") List dateList; - //活动活动评论 + + //是否被收藏 + @TableField(exist = false) + @ApiModelProperty(value = "是否被收藏：0-否 1是") + String isCollection; + + //价格下限 + @TableField(exist = false) + @ApiModelProperty(value = "价格下限") + BigDecimal priceLow; + + //价格上限 + @TableField(exist = false) + @ApiModelProperty(value = "价格上限") + BigDecimal priceHigh; + + //出发日期下限 @TableField(exist = false) - @ApiModelProperty(value = "活动评论") - List commentList; + @ApiModelProperty(value = "出发日期下限") + String dateLow; + + //出发日期上限 + @TableField(exist = false) + @ApiModelProperty(value = "出发日期上限") + String dateHigh; + + //销量排序 + @TableField(exist = false) + @ApiModelProperty(value = "销量排序：0-从高到低 1-从低到高") + String saleOrder; + + //价格排序 + @TableField(exist = false) + @ApiModelProperty(value = "价格排序：0-从高到低 1-从低到高") + String priceOrder; + +// //活动活动评论 +// @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 42db3bf..b526746 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 @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 订单评价表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-18 * @Version: V1.0 */ @Api(tags="订单评价表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/entity/StudytourComment.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/entity/StudytourComment.java index 7d2bc30..4f83a2f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/entity/StudytourComment.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/entity/StudytourComment.java @@ -4,8 +4,6 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import java.util.List; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -24,7 +22,7 @@ import lombok.experimental.Accessors; /** * @Description: 订单评价表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-18 * @Version: V1.0 */ @Data @@ -71,6 +69,10 @@ public class StudytourComment implements Serializable { @Excel(name = "导师分数", width = 15) @ApiModelProperty(value = "导师分数") private java.lang.Integer teacherScore; + /**活动标题*/ + @Excel(name = "活动标题", width = 15) + @ApiModelProperty(value = "活动标题") + private java.lang.String activityTitle; /**关联订单id*/ @Excel(name = "关联订单id", width = 15, dictTable = "studytour_order", dicText = "id", dicCode = "id") @Dict(dictTable = "studytour_order", dicText = "id", dicCode = "id") @@ -82,7 +84,7 @@ public class StudytourComment implements Serializable { @ApiModelProperty(value = "关联用户id") private java.lang.String userId; - //活动活动评论 + //用户信息 @TableField(exist = false) @ApiModelProperty(value = "用户信息") HanHaiMember user; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/mapper/StudytourCommentMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/mapper/StudytourCommentMapper.java index b82bfe1..609e801 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/mapper/StudytourCommentMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/mapper/StudytourCommentMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 订单评价表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-18 * @Version: V1.0 */ public interface StudytourCommentMapper extends BaseMapper { 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 21a8ff1..13ffa8e 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 @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 订单评价表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-18 * @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 9aadbc1..bfe8b7d 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 @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 订单评价表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-18 * @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 2fb1d23..b3983b9 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 @@ -148,6 +148,11 @@ align:"center", dataIndex: 'teacherScore' }, + { + title:'活动标题', + align:"center", + dataIndex: 'activityTitle' + }, { title:'关联订单id', align:"center", @@ -197,6 +202,7 @@ fieldList.push({type:'int',value:'processScore',text:'行程分数',dictCode:''}) fieldList.push({type:'int',value:'spotScore',text:'景点分数',dictCode:''}) fieldList.push({type:'int',value:'teacherScore',text:'导师分数',dictCode:''}) + fieldList.push({type:'Text',value:'activityTitle',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"}) 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 fb58623..75ad56a 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 @@ -28,6 +28,11 @@ + + + + + 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 7ff29a5..4d73b81 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 @@ -30,6 +30,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'teacherScore' }, + { + title: '活动标题', + align:"center", + dataIndex: 'activityTitle' + }, { title: '关联订单id', align:"center", @@ -73,6 +78,11 @@ export const formSchema: FormSchema[] = [ field: 'teacherScore', component: 'InputNumber', }, + { + label: '活动标题', + field: 'activityTitle', + component: 'Input', + }, { label: '关联订单id', field: 'orderId', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/controller/StudytourCommentOptionController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/controller/StudytourCommentOptionController.java new file mode 100644 index 0000000..6471c3c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/controller/StudytourCommentOptionController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.studytourCommentOption.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.studytourCommentOption.entity.StudytourCommentOption; +import org.jeecg.modules.studytourCommentOption.service.IStudytourCommentOptionService; + +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-18 + * @Version: V1.0 + */ +@Api(tags="评论选项表") +@RestController +@RequestMapping("/studytourCommentOption/studytourCommentOption") +@Slf4j +public class StudytourCommentOptionController extends JeecgController { + @Autowired + private IStudytourCommentOptionService studytourCommentOptionService; + + /** + * 分页列表查询 + * + * @param studytourCommentOption + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "评论选项表-分页列表查询") + @ApiOperation(value="评论选项表-分页列表查询", notes="评论选项表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(StudytourCommentOption studytourCommentOption, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(studytourCommentOption, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = studytourCommentOptionService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param studytourCommentOption + * @return + */ + @AutoLog(value = "评论选项表-添加") + @ApiOperation(value="评论选项表-添加", notes="评论选项表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody StudytourCommentOption studytourCommentOption) { + studytourCommentOptionService.save(studytourCommentOption); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param studytourCommentOption + * @return + */ + @AutoLog(value = "评论选项表-编辑") + @ApiOperation(value="评论选项表-编辑", notes="评论选项表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody StudytourCommentOption studytourCommentOption) { + studytourCommentOptionService.updateById(studytourCommentOption); + 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) { + studytourCommentOptionService.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.studytourCommentOptionService.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) { + StudytourCommentOption studytourCommentOption = studytourCommentOptionService.getById(id); + if(studytourCommentOption==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(studytourCommentOption); + } + + /** + * 导出excel + * + * @param request + * @param studytourCommentOption + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, StudytourCommentOption studytourCommentOption) { + return super.exportXls(request, studytourCommentOption, StudytourCommentOption.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, StudytourCommentOption.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/entity/StudytourCommentOption.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/entity/StudytourCommentOption.java new file mode 100644 index 0000000..232ffde --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/entity/StudytourCommentOption.java @@ -0,0 +1,54 @@ +package org.jeecg.modules.studytourCommentOption.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-18 + * @Version: V1.0 + */ +@Data +@TableName("studytour_comment_option") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="studytour_comment_option对象", description="评论选项表") +public class StudytourCommentOption 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 title; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/mapper/StudytourCommentOptionMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/mapper/StudytourCommentOptionMapper.java new file mode 100644 index 0000000..6569694 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/mapper/StudytourCommentOptionMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.studytourCommentOption.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.studytourCommentOption.entity.StudytourCommentOption; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 评论选项表 + * @Author: jeecg-boot + * @Date: 2025-09-18 + * @Version: V1.0 + */ +public interface StudytourCommentOptionMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/mapper/xml/StudytourCommentOptionMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/mapper/xml/StudytourCommentOptionMapper.xml new file mode 100644 index 0000000..59671ee --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/mapper/xml/StudytourCommentOptionMapper.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/studytourCommentOption/service/IStudytourCommentOptionService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/service/IStudytourCommentOptionService.java new file mode 100644 index 0000000..efbc139 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/service/IStudytourCommentOptionService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.studytourCommentOption.service; + +import org.jeecg.modules.studytourCommentOption.entity.StudytourCommentOption; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 评论选项表 + * @Author: jeecg-boot + * @Date: 2025-09-18 + * @Version: V1.0 + */ +public interface IStudytourCommentOptionService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/service/impl/StudytourCommentOptionServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/service/impl/StudytourCommentOptionServiceImpl.java new file mode 100644 index 0000000..69fe58d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/service/impl/StudytourCommentOptionServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.studytourCommentOption.service.impl; + +import org.jeecg.modules.studytourCommentOption.entity.StudytourCommentOption; +import org.jeecg.modules.studytourCommentOption.mapper.StudytourCommentOptionMapper; +import org.jeecg.modules.studytourCommentOption.service.IStudytourCommentOptionService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 评论选项表 + * @Author: jeecg-boot + * @Date: 2025-09-18 + * @Version: V1.0 + */ +@Service +public class StudytourCommentOptionServiceImpl extends ServiceImpl implements IStudytourCommentOptionService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/StudytourCommentOptionList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/StudytourCommentOptionList.vue new file mode 100644 index 0000000..002b51c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/StudytourCommentOptionList.vue @@ -0,0 +1,171 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionForm.vue new file mode 100644 index 0000000..759be35 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionForm.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionModal.Style#Drawer.vue new file mode 100644 index 0000000..392053e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionModal.vue new file mode 100644 index 0000000..9af36bb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue/modules/StudytourCommentOptionModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/StudytourCommentOption.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/StudytourCommentOption.api.ts new file mode 100644 index 0000000..32a8067 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/StudytourCommentOption.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/studytourCommentOption/studytourCommentOption/list', + save='/studytourCommentOption/studytourCommentOption/add', + edit='/studytourCommentOption/studytourCommentOption/edit', + deleteOne = '/studytourCommentOption/studytourCommentOption/delete', + deleteBatch = '/studytourCommentOption/studytourCommentOption/deleteBatch', + importExcel = '/studytourCommentOption/studytourCommentOption/importExcel', + exportXls = '/studytourCommentOption/studytourCommentOption/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/studytourCommentOption/vue3/StudytourCommentOption.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/StudytourCommentOption.data.ts new file mode 100644 index 0000000..f4b0a60 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/StudytourCommentOption.data.ts @@ -0,0 +1,23 @@ +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: 'title' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '评论选项内容', + field: 'title', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/StudytourCommentOptionList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/StudytourCommentOptionList.vue new file mode 100644 index 0000000..b1b5bfb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/StudytourCommentOptionList.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/studytourCommentOption/vue3/components/StudytourCommentOptionModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/components/StudytourCommentOptionModal.vue new file mode 100644 index 0000000..deed2d0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommentOption/vue3/components/StudytourCommentOptionModal.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/studytourCommissionLog/controller/StudytourCommissionLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/controller/StudytourCommissionLogController.java new file mode 100644 index 0000000..ec0cc93 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/controller/StudytourCommissionLogController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.studytourCommissionLog.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.studytourCommissionLog.entity.StudytourCommissionLog; +import org.jeecg.modules.studytourCommissionLog.service.IStudytourCommissionLogService; + +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-19 + * @Version: V1.0 + */ +@Api(tags="佣金记录表") +@RestController +@RequestMapping("/studytourCommissionLog/studytourCommissionLog") +@Slf4j +public class StudytourCommissionLogController extends JeecgController { + @Autowired + private IStudytourCommissionLogService studytourCommissionLogService; + + /** + * 分页列表查询 + * + * @param studytourCommissionLog + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "佣金记录表-分页列表查询") + @ApiOperation(value="佣金记录表-分页列表查询", notes="佣金记录表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(StudytourCommissionLog studytourCommissionLog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(studytourCommissionLog, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = studytourCommissionLogService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param studytourCommissionLog + * @return + */ + @AutoLog(value = "佣金记录表-添加") + @ApiOperation(value="佣金记录表-添加", notes="佣金记录表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody StudytourCommissionLog studytourCommissionLog) { + studytourCommissionLogService.save(studytourCommissionLog); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param studytourCommissionLog + * @return + */ + @AutoLog(value = "佣金记录表-编辑") + @ApiOperation(value="佣金记录表-编辑", notes="佣金记录表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody StudytourCommissionLog studytourCommissionLog) { + studytourCommissionLogService.updateById(studytourCommissionLog); + 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) { + studytourCommissionLogService.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.studytourCommissionLogService.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) { + StudytourCommissionLog studytourCommissionLog = studytourCommissionLogService.getById(id); + if(studytourCommissionLog==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(studytourCommissionLog); + } + + /** + * 导出excel + * + * @param request + * @param studytourCommissionLog + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, StudytourCommissionLog studytourCommissionLog) { + return super.exportXls(request, studytourCommissionLog, StudytourCommissionLog.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, StudytourCommissionLog.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/entity/StudytourCommissionLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/entity/StudytourCommissionLog.java new file mode 100644 index 0000000..af5f85d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/entity/StudytourCommissionLog.java @@ -0,0 +1,70 @@ +package org.jeecg.modules.studytourCommissionLog.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.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 佣金记录表 + * @Author: jeecg-boot + * @Date: 2025-09-19 + * @Version: V1.0 + */ +@Data +@TableName("studytour_commission_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="studytour_commission_log对象", description="佣金记录表") +public class StudytourCommissionLog 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.math.BigDecimal amount; + /**来源用户*/ + @Excel(name = "来源用户", width = 15) + @ApiModelProperty(value = "来源用户") + private java.lang.String commissionId; + /**获得用户*/ + @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; + + //用户信息 + @TableField(exist = false) + @ApiModelProperty(value = "佣金来源用户信息") + HanHaiMember commissionUser; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/StudytourCommissionLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/StudytourCommissionLogMapper.java new file mode 100644 index 0000000..500e9e4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/StudytourCommissionLogMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.studytourCommissionLog.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.studytourCommissionLog.entity.StudytourCommissionLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 佣金记录表 + * @Author: jeecg-boot + * @Date: 2025-09-19 + * @Version: V1.0 + */ +public interface StudytourCommissionLogMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/xml/StudytourCommissionLogMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/xml/StudytourCommissionLogMapper.xml new file mode 100644 index 0000000..0183ade --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/xml/StudytourCommissionLogMapper.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/studytourCommissionLog/service/IStudytourCommissionLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/IStudytourCommissionLogService.java new file mode 100644 index 0000000..bd870bc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/IStudytourCommissionLogService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.studytourCommissionLog.service; + +import org.jeecg.modules.studytourCommissionLog.entity.StudytourCommissionLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 佣金记录表 + * @Author: jeecg-boot + * @Date: 2025-09-19 + * @Version: V1.0 + */ +public interface IStudytourCommissionLogService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/impl/StudytourCommissionLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/impl/StudytourCommissionLogServiceImpl.java new file mode 100644 index 0000000..cb1626c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/impl/StudytourCommissionLogServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.studytourCommissionLog.service.impl; + +import org.jeecg.modules.studytourCommissionLog.entity.StudytourCommissionLog; +import org.jeecg.modules.studytourCommissionLog.mapper.StudytourCommissionLogMapper; +import org.jeecg.modules.studytourCommissionLog.service.IStudytourCommissionLogService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 佣金记录表 + * @Author: jeecg-boot + * @Date: 2025-09-19 + * @Version: V1.0 + */ +@Service +public class StudytourCommissionLogServiceImpl extends ServiceImpl implements IStudytourCommissionLogService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/StudytourCommissionLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/StudytourCommissionLogList.vue new file mode 100644 index 0000000..b2dc3d2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/StudytourCommissionLogList.vue @@ -0,0 +1,184 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogForm.vue new file mode 100644 index 0000000..739e91e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogForm.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/studytourCommissionLog/vue/modules/StudytourCommissionLogModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogModal.Style#Drawer.vue new file mode 100644 index 0000000..0d5a6d5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogModal.vue new file mode 100644 index 0000000..cae7c15 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLog.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLog.api.ts new file mode 100644 index 0000000..1be8d7d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLog.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/studytourCommissionLog/studytourCommissionLog/list', + save='/studytourCommissionLog/studytourCommissionLog/add', + edit='/studytourCommissionLog/studytourCommissionLog/edit', + deleteOne = '/studytourCommissionLog/studytourCommissionLog/delete', + deleteBatch = '/studytourCommissionLog/studytourCommissionLog/deleteBatch', + importExcel = '/studytourCommissionLog/studytourCommissionLog/importExcel', + exportXls = '/studytourCommissionLog/studytourCommissionLog/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/studytourCommissionLog/vue3/StudytourCommissionLog.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLog.data.ts new file mode 100644 index 0000000..c5d4f2d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLog.data.ts @@ -0,0 +1,49 @@ +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: 'amount_dictText' + }, + { + title: '来源用户', + align:"center", + dataIndex: 'commissionId' + }, + { + title: '获得用户', + align:"center", + dataIndex: 'userId_dictText' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '佣金金额', + field: 'amount', + component: 'JSearchSelect', + componentProps:{ + dict:"" + }, + }, + { + label: '来源用户', + field: 'commissionId', + component: 'Input', + }, + { + 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/studytourCommissionLog/vue3/StudytourCommissionLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLogList.vue new file mode 100644 index 0000000..0c7fdac --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLogList.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/studytourCommissionLog/vue3/components/StudytourCommissionLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/components/StudytourCommissionLogModal.vue new file mode 100644 index 0000000..5279d99 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/components/StudytourCommissionLogModal.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/studytourExperience/controller/StudytourExperienceController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/controller/StudytourExperienceController.java index 9db134f..0f896f5 100644 --- 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 @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 学员心得表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-19 * @Version: V1.0 */ @Api(tags="学员心得表") 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 index 1fa61c5..a022d0d 100644 --- 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 @@ -5,10 +5,12 @@ import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; @@ -20,7 +22,7 @@ import lombok.experimental.Accessors; /** * @Description: 学员心得表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-19 * @Version: V1.0 */ @Data @@ -55,14 +57,19 @@ public class StudytourExperience implements Serializable { @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 = "studytour_record", dicText = "activity_id", dicCode = "id") + @Dict(dictTable = "studytour_record", dicText = "activity_id", dicCode = "id") + @ApiModelProperty(value = "关联成长档案") + private java.lang.String experienceId; /**关联用户*/ @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; + + //用户信息 + @TableField(exist = false) + @ApiModelProperty(value = "用户信息") + HanHaiMember user; } 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 index 913e4e2..6d520f2 100644 --- 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 @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 学员心得表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-19 * @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/service/IStudytourExperienceService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/IStudytourExperienceService.java index 21ac4f1..930af06 100644 --- 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 @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 学员心得表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-19 * @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 index e7f6858..199fa8d 100644 --- 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 @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 学员心得表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-19 * @Version: V1.0 */ @Service 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 index df20691..1052971 100644 --- 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 @@ -134,9 +134,9 @@ scopedSlots: {customRender: 'imgSlot'} }, { - title:'关联活动', + title:'关联成长档案', align:"center", - dataIndex: 'activityId_dictText' + dataIndex: 'experienceId_dictText' }, { title:'关联用户', @@ -179,7 +179,7 @@ let fieldList=[]; fieldList.push({type:'Text',value:'content',text:'文字内容',dictCode:''}) fieldList.push({type:'Text',value:'image',text:'图片内容',dictCode:''}) - fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'}) + fieldList.push({type:'sel_search',value:'experienceId',text:'关联成长档案',dictTable:"studytour_record", dictText:'activity_id', 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/studytourExperience/vue/modules/StudytourExperienceForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceForm.vue index a2e184b..26de00c 100644 --- 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 @@ -14,8 +14,8 @@ - - + + 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 index e360d40..23c1cf1 100644 --- 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 @@ -16,9 +16,9 @@ export const columns: BasicColumn[] = [ customRender:render.renderAvatar, }, { - title: '关联活动', + title: '关联成长档案', align:"center", - dataIndex: 'activityId_dictText' + dataIndex: 'experienceId_dictText' }, { title: '关联用户', @@ -44,11 +44,11 @@ export const formSchema: FormSchema[] = [ }, }, { - label: '关联活动', - field: 'activityId', + label: '关联成长档案', + field: 'experienceId', component: 'JSearchSelect', componentProps:{ - dict:"studytour_activity,title,id" + dict:"studytour_record,activity_id,id" }, }, { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/controller/StudytourExperienceQuestionController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/controller/StudytourExperienceQuestionController.java new file mode 100644 index 0000000..a9960a2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/controller/StudytourExperienceQuestionController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.studytourExperienceQuestion.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.studytourExperienceQuestion.entity.StudytourExperienceQuestion; +import org.jeecg.modules.studytourExperienceQuestion.service.IStudytourExperienceQuestionService; + +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-18 + * @Version: V1.0 + */ +@Api(tags="心得问题表") +@RestController +@RequestMapping("/studytourExperienceQuestion/studytourExperienceQuestion") +@Slf4j +public class StudytourExperienceQuestionController extends JeecgController { + @Autowired + private IStudytourExperienceQuestionService studytourExperienceQuestionService; + + /** + * 分页列表查询 + * + * @param studytourExperienceQuestion + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "心得问题表-分页列表查询") + @ApiOperation(value="心得问题表-分页列表查询", notes="心得问题表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(StudytourExperienceQuestion studytourExperienceQuestion, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(studytourExperienceQuestion, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = studytourExperienceQuestionService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param studytourExperienceQuestion + * @return + */ + @AutoLog(value = "心得问题表-添加") + @ApiOperation(value="心得问题表-添加", notes="心得问题表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody StudytourExperienceQuestion studytourExperienceQuestion) { + studytourExperienceQuestionService.save(studytourExperienceQuestion); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param studytourExperienceQuestion + * @return + */ + @AutoLog(value = "心得问题表-编辑") + @ApiOperation(value="心得问题表-编辑", notes="心得问题表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody StudytourExperienceQuestion studytourExperienceQuestion) { + studytourExperienceQuestionService.updateById(studytourExperienceQuestion); + 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) { + studytourExperienceQuestionService.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.studytourExperienceQuestionService.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) { + StudytourExperienceQuestion studytourExperienceQuestion = studytourExperienceQuestionService.getById(id); + if(studytourExperienceQuestion==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(studytourExperienceQuestion); + } + + /** + * 导出excel + * + * @param request + * @param studytourExperienceQuestion + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, StudytourExperienceQuestion studytourExperienceQuestion) { + return super.exportXls(request, studytourExperienceQuestion, StudytourExperienceQuestion.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, StudytourExperienceQuestion.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/entity/StudytourExperienceQuestion.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/entity/StudytourExperienceQuestion.java new file mode 100644 index 0000000..a0ccbd2 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/entity/StudytourExperienceQuestion.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.studytourExperienceQuestion.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-18 + * @Version: V1.0 + */ +@Data +@TableName("studytour_experience_question") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="studytour_experience_question对象", description="心得问题表") +public class StudytourExperienceQuestion 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 question; + /**排序编号*/ + @Excel(name = "排序编号", width = 15) + @ApiModelProperty(value = "排序编号") + private java.lang.Integer orderNo; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/mapper/StudytourExperienceQuestionMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/mapper/StudytourExperienceQuestionMapper.java new file mode 100644 index 0000000..56af239 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/mapper/StudytourExperienceQuestionMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.studytourExperienceQuestion.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.studytourExperienceQuestion.entity.StudytourExperienceQuestion; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 心得问题表 + * @Author: jeecg-boot + * @Date: 2025-09-18 + * @Version: V1.0 + */ +public interface StudytourExperienceQuestionMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/mapper/xml/StudytourExperienceQuestionMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/mapper/xml/StudytourExperienceQuestionMapper.xml new file mode 100644 index 0000000..bddfb64 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/mapper/xml/StudytourExperienceQuestionMapper.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/studytourExperienceQuestion/service/IStudytourExperienceQuestionService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/service/IStudytourExperienceQuestionService.java new file mode 100644 index 0000000..4e3279f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/service/IStudytourExperienceQuestionService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.studytourExperienceQuestion.service; + +import org.jeecg.modules.studytourExperienceQuestion.entity.StudytourExperienceQuestion; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 心得问题表 + * @Author: jeecg-boot + * @Date: 2025-09-18 + * @Version: V1.0 + */ +public interface IStudytourExperienceQuestionService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/service/impl/StudytourExperienceQuestionServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/service/impl/StudytourExperienceQuestionServiceImpl.java new file mode 100644 index 0000000..d7d68d4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/service/impl/StudytourExperienceQuestionServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.studytourExperienceQuestion.service.impl; + +import org.jeecg.modules.studytourExperienceQuestion.entity.StudytourExperienceQuestion; +import org.jeecg.modules.studytourExperienceQuestion.mapper.StudytourExperienceQuestionMapper; +import org.jeecg.modules.studytourExperienceQuestion.service.IStudytourExperienceQuestionService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 心得问题表 + * @Author: jeecg-boot + * @Date: 2025-09-18 + * @Version: V1.0 + */ +@Service +public class StudytourExperienceQuestionServiceImpl extends ServiceImpl implements IStudytourExperienceQuestionService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/StudytourExperienceQuestionList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/StudytourExperienceQuestionList.vue new file mode 100644 index 0000000..5707739 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/StudytourExperienceQuestionList.vue @@ -0,0 +1,177 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionForm.vue new file mode 100644 index 0000000..f69ad65 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionModal.Style#Drawer.vue new file mode 100644 index 0000000..f89c0e4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionModal.vue new file mode 100644 index 0000000..04b88d5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue/modules/StudytourExperienceQuestionModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/StudytourExperienceQuestion.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/StudytourExperienceQuestion.api.ts new file mode 100644 index 0000000..7454fd3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/StudytourExperienceQuestion.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/studytourExperienceQuestion/studytourExperienceQuestion/list', + save='/studytourExperienceQuestion/studytourExperienceQuestion/add', + edit='/studytourExperienceQuestion/studytourExperienceQuestion/edit', + deleteOne = '/studytourExperienceQuestion/studytourExperienceQuestion/delete', + deleteBatch = '/studytourExperienceQuestion/studytourExperienceQuestion/deleteBatch', + importExcel = '/studytourExperienceQuestion/studytourExperienceQuestion/importExcel', + exportXls = '/studytourExperienceQuestion/studytourExperienceQuestion/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/studytourExperienceQuestion/vue3/StudytourExperienceQuestion.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/StudytourExperienceQuestion.data.ts new file mode 100644 index 0000000..fbef1fc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/StudytourExperienceQuestion.data.ts @@ -0,0 +1,33 @@ +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: 'question' + }, + { + title: '排序编号', + align:"center", + dataIndex: 'orderNo' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '心得问题', + field: 'question', + component: 'Input', + }, + { + label: '排序编号', + field: 'orderNo', + component: 'InputNumber', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/StudytourExperienceQuestionList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/StudytourExperienceQuestionList.vue new file mode 100644 index 0000000..aaeaa63 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/StudytourExperienceQuestionList.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/studytourExperienceQuestion/vue3/components/StudytourExperienceQuestionModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/components/StudytourExperienceQuestionModal.vue new file mode 100644 index 0000000..07254dd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperienceQuestion/vue3/components/StudytourExperienceQuestionModal.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/studytourJournal/controller/StudytourJournalController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/controller/StudytourJournalController.java new file mode 100644 index 0000000..0d5a2e8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/controller/StudytourJournalController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.studytourJournal.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.studytourJournal.entity.StudytourJournal; +import org.jeecg.modules.studytourJournal.service.IStudytourJournalService; + +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-19 + * @Version: V1.0 + */ +@Api(tags="研学日记表") +@RestController +@RequestMapping("/studytourJournal/studytourJournal") +@Slf4j +public class StudytourJournalController extends JeecgController { + @Autowired + private IStudytourJournalService studytourJournalService; + + /** + * 分页列表查询 + * + * @param studytourJournal + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "研学日记表-分页列表查询") + @ApiOperation(value="研学日记表-分页列表查询", notes="研学日记表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(StudytourJournal studytourJournal, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(studytourJournal, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = studytourJournalService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param studytourJournal + * @return + */ + @AutoLog(value = "研学日记表-添加") + @ApiOperation(value="研学日记表-添加", notes="研学日记表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody StudytourJournal studytourJournal) { + studytourJournalService.save(studytourJournal); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param studytourJournal + * @return + */ + @AutoLog(value = "研学日记表-编辑") + @ApiOperation(value="研学日记表-编辑", notes="研学日记表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody StudytourJournal studytourJournal) { + studytourJournalService.updateById(studytourJournal); + 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) { + studytourJournalService.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.studytourJournalService.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) { + StudytourJournal studytourJournal = studytourJournalService.getById(id); + if(studytourJournal==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(studytourJournal); + } + + /** + * 导出excel + * + * @param request + * @param studytourJournal + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, StudytourJournal studytourJournal) { + return super.exportXls(request, studytourJournal, StudytourJournal.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, StudytourJournal.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/entity/StudytourJournal.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/entity/StudytourJournal.java new file mode 100644 index 0000000..18ce311 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/entity/StudytourJournal.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.studytourJournal.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-19 + * @Version: V1.0 + */ +@Data +@TableName("studytour_journal") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="studytour_journal对象", description="研学日记表") +public class StudytourJournal 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 title; + /**详情*/ + @Excel(name = "详情", width = 15) + @ApiModelProperty(value = "详情") + private java.lang.String content; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/mapper/StudytourJournalMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/mapper/StudytourJournalMapper.java new file mode 100644 index 0000000..a784aca --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/mapper/StudytourJournalMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.studytourJournal.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.studytourJournal.entity.StudytourJournal; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 研学日记表 + * @Author: jeecg-boot + * @Date: 2025-09-19 + * @Version: V1.0 + */ +public interface StudytourJournalMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/mapper/xml/StudytourJournalMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/mapper/xml/StudytourJournalMapper.xml new file mode 100644 index 0000000..9770740 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/mapper/xml/StudytourJournalMapper.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/studytourJournal/service/IStudytourJournalService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/service/IStudytourJournalService.java new file mode 100644 index 0000000..acb2677 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/service/IStudytourJournalService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.studytourJournal.service; + +import org.jeecg.modules.studytourJournal.entity.StudytourJournal; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 研学日记表 + * @Author: jeecg-boot + * @Date: 2025-09-19 + * @Version: V1.0 + */ +public interface IStudytourJournalService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/service/impl/StudytourJournalServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/service/impl/StudytourJournalServiceImpl.java new file mode 100644 index 0000000..2363ee1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/service/impl/StudytourJournalServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.studytourJournal.service.impl; + +import org.jeecg.modules.studytourJournal.entity.StudytourJournal; +import org.jeecg.modules.studytourJournal.mapper.StudytourJournalMapper; +import org.jeecg.modules.studytourJournal.service.IStudytourJournalService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 研学日记表 + * @Author: jeecg-boot + * @Date: 2025-09-19 + * @Version: V1.0 + */ +@Service +public class StudytourJournalServiceImpl extends ServiceImpl implements IStudytourJournalService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/StudytourJournalList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/StudytourJournalList.vue new file mode 100644 index 0000000..84c923f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/StudytourJournalList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalForm.vue new file mode 100644 index 0000000..e1499bf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalModal.Style#Drawer.vue new file mode 100644 index 0000000..b4d732c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalModal.vue new file mode 100644 index 0000000..8fc07d4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue/modules/StudytourJournalModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/StudytourJournal.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/StudytourJournal.api.ts new file mode 100644 index 0000000..bdd0fb5 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/StudytourJournal.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/studytourJournal/studytourJournal/list', + save='/studytourJournal/studytourJournal/add', + edit='/studytourJournal/studytourJournal/edit', + deleteOne = '/studytourJournal/studytourJournal/delete', + deleteBatch = '/studytourJournal/studytourJournal/deleteBatch', + importExcel = '/studytourJournal/studytourJournal/importExcel', + exportXls = '/studytourJournal/studytourJournal/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/studytourJournal/vue3/StudytourJournal.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/StudytourJournal.data.ts new file mode 100644 index 0000000..bff60e9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/StudytourJournal.data.ts @@ -0,0 +1,34 @@ +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: 'title' + }, + { + title: '详情', + align:"center", + dataIndex: 'content', + slots: { customRender: 'htmlSlot' }, + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '标题', + field: 'title', + component: 'Input', + }, + { + label: '详情', + field: 'content', + component: 'JCodeEditor', //TODO String后缀暂未添加 + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/StudytourJournalList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/StudytourJournalList.vue new file mode 100644 index 0000000..120c220 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/StudytourJournalList.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/studytourJournal/vue3/components/StudytourJournalModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/components/StudytourJournalModal.vue new file mode 100644 index 0000000..38223a7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourJournal/vue3/components/StudytourJournalModal.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/studytourMedalUser/controller/StudytourMedalUserController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/controller/StudytourMedalUserController.java index 5c33ee2..33a2744 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/controller/StudytourMedalUserController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/controller/StudytourMedalUserController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 用户勋章表 * @Author: jeecg-boot - * @Date: 2025-09-18 + * @Date: 2025-09-19 * @Version: V1.0 */ @Api(tags="用户勋章表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/entity/StudytourMedalUser.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/entity/StudytourMedalUser.java index 86db813..97ef69b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/entity/StudytourMedalUser.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/entity/StudytourMedalUser.java @@ -5,10 +5,12 @@ import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.modules.studytourMedal.entity.StudytourMedal; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; @@ -20,7 +22,7 @@ import lombok.experimental.Accessors; /** * @Description: 用户勋章表 * @Author: jeecg-boot - * @Date: 2025-09-18 + * @Date: 2025-09-19 * @Version: V1.0 */ @Data @@ -56,7 +58,7 @@ public class StudytourMedalUser implements Serializable { @Excel(name = "关联勋章id", width = 15, dictTable = "studytour_medal", dicText = "title", dicCode = "id") @Dict(dictTable = "studytour_medal", dicText = "title", dicCode = "id") @ApiModelProperty(value = "关联勋章id") - private java.lang.String metalId; + private java.lang.String medalId; /**是否点亮*/ @Excel(name = "是否点亮", width = 15, dicCode = "is_true") @Dict(dicCode = "is_true") @@ -73,4 +75,9 @@ public class StudytourMedalUser implements Serializable { @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "关联用户id") private java.lang.String userId; + + //勋章信息 + @TableField(exist = false) + @ApiModelProperty(value = "勋章信息") + StudytourMedal medal; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/mapper/StudytourMedalUserMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/mapper/StudytourMedalUserMapper.java index 547bf4e..3ce8f2a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/mapper/StudytourMedalUserMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/mapper/StudytourMedalUserMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 用户勋章表 * @Author: jeecg-boot - * @Date: 2025-09-18 + * @Date: 2025-09-19 * @Version: V1.0 */ public interface StudytourMedalUserMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/IStudytourMedalUserService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/IStudytourMedalUserService.java index e5bf04b..a5eeab0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/IStudytourMedalUserService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/IStudytourMedalUserService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 用户勋章表 * @Author: jeecg-boot - * @Date: 2025-09-18 + * @Date: 2025-09-19 * @Version: V1.0 */ public interface IStudytourMedalUserService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/impl/StudytourMedalUserServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/impl/StudytourMedalUserServiceImpl.java index e9fc951..0232321 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/impl/StudytourMedalUserServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/impl/StudytourMedalUserServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 用户勋章表 * @Author: jeecg-boot - * @Date: 2025-09-18 + * @Date: 2025-09-19 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/StudytourMedalUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/StudytourMedalUserList.vue index e124510..99113b5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/StudytourMedalUserList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/StudytourMedalUserList.vue @@ -130,7 +130,7 @@ { title:'关联勋章id', align:"center", - dataIndex: 'metalId_dictText' + dataIndex: 'medalId_dictText' }, { title:'是否点亮', @@ -185,7 +185,7 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'}) - fieldList.push({type:'string',value:'metalId',text:'关联勋章id',dictCode:"studytour_medal,title,id"}) + fieldList.push({type:'string',value:'medalId',text:'关联勋章id',dictCode:"studytour_medal,title,id"}) fieldList.push({type:'string',value:'isLight',text:'是否点亮',dictCode:'is_true'}) fieldList.push({type:'date',value:'lightDate',text:'点亮日期'}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/modules/StudytourMedalUserForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/modules/StudytourMedalUserForm.vue index a4443f6..87788b2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/modules/StudytourMedalUserForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/modules/StudytourMedalUserForm.vue @@ -9,8 +9,8 @@ - - + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue3/StudytourMedalUser.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue3/StudytourMedalUser.data.ts index 970d558..6b01314 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue3/StudytourMedalUser.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue3/StudytourMedalUser.data.ts @@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [ { title: '关联勋章id', align:"center", - dataIndex: 'metalId_dictText' + dataIndex: 'medalId_dictText' }, { title: '是否点亮', @@ -48,7 +48,7 @@ export const formSchema: FormSchema[] = [ }, { label: '关联勋章id', - field: 'metalId', + field: 'medalId', component: 'JDictSelectTag', componentProps:{ dictCode:"studytour_medal,title,id" diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/controller/StudytourNoticeController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/controller/StudytourNoticeController.java index 1e14fc1..9d1757d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/controller/StudytourNoticeController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/controller/StudytourNoticeController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 开营通知表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-18 * @Version: V1.0 */ @Api(tags="开营通知表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/entity/StudytourNotice.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/entity/StudytourNotice.java index e6eeff7..9fd1392 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/entity/StudytourNotice.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/entity/StudytourNotice.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 开营通知表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-18 * @Version: V1.0 */ @Data @@ -47,15 +47,29 @@ public class StudytourNotice implements Serializable { /**更新日期*/ @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; + /**通知标题*/ + @Excel(name = "通知标题", width = 15) + @ApiModelProperty(value = "通知标题") + private java.lang.String title; /**通知信息*/ @Excel(name = "通知信息", width = 15) @ApiModelProperty(value = "通知信息") private java.lang.String content; + /**通知日期*/ + @Excel(name = "通知日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "通知日期") + private java.util.Date noticeDate; /**是否已读*/ @Excel(name = "是否已读", width = 15, dicCode = "is_true") @Dict(dicCode = "is_true") @ApiModelProperty(value = "是否已读") private java.lang.String isRead; + /**导师电话*/ + @Excel(name = "导师电话", width = 15) + @ApiModelProperty(value = "导师电话") + private java.lang.String teacherPhone; /**关联用户*/ @Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/mapper/StudytourNoticeMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/mapper/StudytourNoticeMapper.java index ca37171..082e953 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/mapper/StudytourNoticeMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/mapper/StudytourNoticeMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 开营通知表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-18 * @Version: V1.0 */ public interface StudytourNoticeMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/IStudytourNoticeService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/IStudytourNoticeService.java index 934833e..52e51d3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/IStudytourNoticeService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/IStudytourNoticeService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 开营通知表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-18 * @Version: V1.0 */ public interface IStudytourNoticeService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/impl/StudytourNoticeServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/impl/StudytourNoticeServiceImpl.java index 66f0600..1ffa38b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/impl/StudytourNoticeServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/service/impl/StudytourNoticeServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 开营通知表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-18 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/StudytourNoticeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/StudytourNoticeList.vue index 775e655..94b9aa2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/StudytourNoticeList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/StudytourNoticeList.vue @@ -122,17 +122,35 @@ return parseInt(index)+1; } }, + { + title:'通知标题', + align:"center", + dataIndex: 'title' + }, { title:'通知信息', align:"center", dataIndex: 'content', scopedSlots: {customRender: 'htmlSlot'} }, + { + title:'通知日期', + align:"center", + dataIndex: 'noticeDate', + customRender:function (text) { + return !text?"":(text.length>10?text.substr(0,10):text) + } + }, { title:'是否已读', align:"center", dataIndex: 'isRead_dictText' }, + { + title:'导师电话', + align:"center", + dataIndex: 'teacherPhone' + }, { title:'关联用户', align:"center", @@ -172,8 +190,11 @@ }, getSuperFieldList(){ let fieldList=[]; + fieldList.push({type:'string',value:'title',text:'通知标题',dictCode:''}) fieldList.push({type:'Text',value:'content',text:'通知信息',dictCode:''}) + fieldList.push({type:'date',value:'noticeDate',text:'通知日期'}) fieldList.push({type:'string',value:'isRead',text:'是否已读',dictCode:'is_true'}) + fieldList.push({type:'string',value:'teacherPhone',text:'导师电话',dictCode:''}) 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/studytourNotice/vue/modules/StudytourNoticeForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourNotice/vue/modules/StudytourNoticeForm.vue index 017b098..f91dd16 100644 --- 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 @@ -3,16 +3,31 @@ + + + + + + + + + + + + + + + @@ -55,6 +70,10 @@ }, confirmLoading: false, validatorRules: { + teacherPhone: [ + { required: false}, + { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, + ], }, url: { add: "/studytourNotice/studytourNotice/add", 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 index 8a72269..8da695f 100644 --- 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 @@ -5,16 +5,34 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { + title: '通知标题', + align:"center", + dataIndex: 'title' + }, + { title: '通知信息', align:"center", dataIndex: 'content', slots: { customRender: 'htmlSlot' }, }, + { + title: '通知日期', + align:"center", + dataIndex: 'noticeDate', + customRender:({text}) =>{ + return !text?"":(text.length>10?text.substr(0,10):text) + }, + }, { title: '是否已读', align:"center", dataIndex: 'isRead_dictText' }, + { + title: '导师电话', + align:"center", + dataIndex: 'teacherPhone' + }, { title: '关联用户', align:"center", @@ -26,11 +44,21 @@ export const searchFormSchema: FormSchema[] = [ ]; //表单数据 export const formSchema: FormSchema[] = [ + { + label: '通知标题', + field: 'title', + component: 'Input', + }, { label: '通知信息', field: 'content', component: 'JCodeEditor', //TODO String后缀暂未添加 }, + { + label: '通知日期', + field: 'noticeDate', + component: 'DatePicker', + }, { label: '是否已读', field: 'isRead', @@ -39,6 +67,17 @@ export const formSchema: FormSchema[] = [ dictCode:"is_true" }, }, + { + label: '导师电话', + field: 'teacherPhone', + component: 'Input', + dynamicRules: ({model,schema}) => { + return [ + { required: false}, + { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'}, + ]; + }, + }, { label: '关联用户', field: 'userId', 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 379d599..02d1c1d 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-16 + * @Date: 2025-09-18 * @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 9d9353e..dbe81ca 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 @@ -3,6 +3,8 @@ package org.jeecg.modules.studytourOrder.entity; 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.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -18,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2025-09-16 + * @Date: 2025-09-18 * @Version: V1.0 */ @ApiModel(value="studytour_order对象", description="订单信息表") @@ -113,6 +115,10 @@ public class StudytourOrder implements Serializable { @Excel(name = "活动标签", width = 15) @ApiModelProperty(value = "活动标签") private java.lang.String activityTag; + /**导师电话*/ + @Excel(name = "导师电话", width = 15) + @ApiModelProperty(value = "导师电话") + private java.lang.String teacherPhone; /**关联活动*/ @Excel(name = "关联活动", width = 15, dictTable = "studytour_activity", dicText = "title", dicCode = "id") @Dict(dictTable = "studytour_activity", dicText = "title", dicCode = "id") @@ -128,4 +134,9 @@ public class StudytourOrder implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "出行人id(以;分隔)") String tourisIds; + + //订单出行人信息 + @TableField(exist = false) + @ApiModelProperty(value = "出行人信息") + List orderPersonList; } 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 ae8f4da..6a5c753 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-16 + * @Date: 2025-09-18 * @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 0dfdf6b..6fca160 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-16 + * @Date: 2025-09-18 * @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 0dc2a4e..c19c0db 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-16 + * @Date: 2025-09-18 * @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 7383b9b..c344509 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-16 + * @Date: 2025-09-18 * @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 5c75c26..e21b3bb 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-16 + * @Date: 2025-09-18 * @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 7191de8..416f9d5 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-16 + * @Date: 2025-09-18 * @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 96b3fb3..ed52fac 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-16 + * @Date: 2025-09-18 * @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 65c0f4f..ced48a9 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-16 + * @Date: 2025-09-18 * @Version: V1.0 */ @Data @@ -109,6 +109,10 @@ public class StudytourOrderPage { @Excel(name = "活动标签", width = 15) @ApiModelProperty(value = "活动标签") private java.lang.String activityTag; + /**导师电话*/ + @Excel(name = "导师电话", width = 15) + @ApiModelProperty(value = "导师电话") + private java.lang.String teacherPhone; /**关联活动*/ @Excel(name = "关联活动", width = 15, dictTable = "studytour_activity", dicText = "title", dicCode = "id") @Dict(dictTable = "studytour_activity", dicText = "title", dicCode = "id") 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 ca2c502..1e41002 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 @@ -207,6 +207,11 @@ align:"center", dataIndex: 'activityTag' }, + { + title:'导师电话', + align:"center", + dataIndex: 'teacherPhone' + }, { title:'关联活动', align:"center", @@ -251,24 +256,25 @@ }, 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:'string',value:'teacherPhone',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 d503f2f..7e8a127 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 @@ -84,14 +84,19 @@ + + + + + - + - + @@ -100,8 +105,7 @@ - + :actionButton="true"/> @@ -120,17 +123,14 @@