From d5e17554add09d4f6b345602f0b1e5536b5b7760 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Fri, 31 Oct 2025 10:43:33 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A1=8C=E5=90=8E=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StudytourEmailController.java} | 84 +-- .../studytourEmail/entity/StudytourEmail.java | 71 ++ .../mapper/StudytourEmailMapper.java | 17 + .../mapper/xml/StudytourEmailMapper.xml} | 2 +- .../service/IStudytourEmailService.java | 14 + .../service/impl/StudytourEmailServiceImpl.java | 19 + .../vue/StudytourEmailList.vue} | 48 +- .../vue/modules/StudytourEmailForm.vue} | 25 +- .../modules/StudytourEmailModal.Style#Drawer.vue} | 8 +- .../vue/modules/StudytourEmailModal.vue} | 8 +- .../vue3/StudytourEmail.api.ts} | 14 +- .../vue3/StudytourEmail.data.ts} | 47 +- .../vue3/StudytourEmailList.vue} | 14 +- .../vue3/components/StudytourEmailModal.vue} | 4 +- .../impl/StudytourExperienceServiceImpl.java | 19 - .../controller/StudytourRecordController.java | 167 ++++- .../entity/StudytourExperience.java | 19 +- .../studytourRecord/entity/StudytourRecord.java | 14 +- .../studytourRecord/entity/StudytourReport.java | 355 +++++++++ .../mapper/StudytourExperienceMapper.java | 12 +- .../mapper/StudytourRecordMapper.java | 2 +- .../mapper/StudytourReportMapper.java | 19 + .../mapper/xml/StudytourExperienceMapper.xml | 16 + .../mapper/xml/StudytourReportMapper.xml | 16 + .../service/IStudytourExperienceService.java | 8 +- .../service/IStudytourRecordService.java | 29 +- .../service/IStudytourReportService.java | 16 + .../impl/StudytourExperienceServiceImpl.java | 27 + .../service/impl/StudytourRecordServiceImpl.java | 83 ++- .../service/impl/StudytourReportServiceImpl.java | 27 + .../studytourRecord/vo/StudytourRecordPage.java | 85 +++ .../studytourRecord/vue/StudytourRecordList.vue | 46 +- .../vue/modules/StudytourRecordForm.vue | 823 +++++++++++++++++++-- .../vue/modules/StudytourRecordModal.vue | 20 +- .../modules/api/service/ExperienceService.java | 22 +- .../api/service/Impl/ExperienceServiceImpl.java | 105 ++- .../modules/api/service/Impl/OrderServiceImpl.java | 27 + .../studytourController/ExperienceController.java | 22 +- 38 files changed, 2036 insertions(+), 318 deletions(-) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience/controller/StudytourExperienceController.java => studytourEmail/controller/StudytourEmailController.java} (53%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/entity/StudytourEmail.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/mapper/StudytourEmailMapper.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience/mapper/xml/StudytourExperienceMapper.xml => studytourEmail/mapper/xml/StudytourEmailMapper.xml} (59%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/service/IStudytourEmailService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/service/impl/StudytourEmailServiceImpl.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience/vue/StudytourExperienceList.vue => studytourEmail/vue/StudytourEmailList.vue} (80%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience/vue/modules/StudytourExperienceForm.vue => studytourEmail/vue/modules/StudytourEmailForm.vue} (71%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience/vue/modules/StudytourExperienceModal.Style#Drawer.vue => studytourEmail/vue/modules/StudytourEmailModal.Style#Drawer.vue} (85%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience/vue/modules/StudytourExperienceModal.vue => studytourEmail/vue/modules/StudytourEmailModal.vue} (79%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience/vue3/StudytourExperience.api.ts => studytourEmail/vue3/StudytourEmail.api.ts} (71%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience/vue3/StudytourExperience.data.ts => studytourEmail/vue3/StudytourEmail.data.ts} (57%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience/vue3/StudytourExperienceList.vue => studytourEmail/vue3/StudytourEmailList.vue} (90%) rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience/vue3/components/StudytourExperienceModal.vue => studytourEmail/vue3/components/StudytourEmailModal.vue} (93%) delete mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/service/impl/StudytourExperienceServiceImpl.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience => studytourRecord}/entity/StudytourExperience.java (79%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/entity/StudytourReport.java rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience => studytourRecord}/mapper/StudytourExperienceMapper.java (50%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/mapper/StudytourReportMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/mapper/xml/StudytourExperienceMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/mapper/xml/StudytourReportMapper.xml rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/{studytourExperience => studytourRecord}/service/IStudytourExperienceService.java (50%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/service/IStudytourReportService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/service/impl/StudytourExperienceServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/service/impl/StudytourReportServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/vo/StudytourRecordPage.java 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/studytourEmail/controller/StudytourEmailController.java similarity index 53% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/controller/StudytourExperienceController.java rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/controller/StudytourEmailController.java index 0f896f5..b6fa440 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/studytourEmail/controller/StudytourEmailController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.studytourExperience.controller; +package org.jeecg.modules.studytourEmail.controller; import java.util.Arrays; import java.util.List; @@ -12,8 +12,8 @@ import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.studytourExperience.entity.StudytourExperience; -import org.jeecg.modules.studytourExperience.service.IStudytourExperienceService; +import org.jeecg.modules.studytourEmail.entity.StudytourEmail; +import org.jeecg.modules.studytourEmail.service.IStudytourEmailService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,66 +37,66 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; /** - * @Description: 学员心得表 + * @Description: 邮件信息表 * @Author: jeecg-boot - * @Date: 2025-09-19 + * @Date: 2025-10-29 * @Version: V1.0 */ -@Api(tags="学员心得表") +@Api(tags="邮件信息表") @RestController -@RequestMapping("/studytourExperience/studytourExperience") +@RequestMapping("/studytourEmail/studytourEmail") @Slf4j -public class StudytourExperienceController extends JeecgController { +public class StudytourEmailController extends JeecgController { @Autowired - private IStudytourExperienceService studytourExperienceService; + private IStudytourEmailService studytourEmailService; /** * 分页列表查询 * - * @param studytourExperience + * @param studytourEmail * @param pageNo * @param pageSize * @param req * @return */ - //@AutoLog(value = "学员心得表-分页列表查询") - @ApiOperation(value="学员心得表-分页列表查询", notes="学员心得表-分页列表查询") + //@AutoLog(value = "邮件信息表-分页列表查询") + @ApiOperation(value="邮件信息表-分页列表查询", notes="邮件信息表-分页列表查询") @GetMapping(value = "/list") - public Result> queryPageList(StudytourExperience studytourExperience, + public Result> queryPageList(StudytourEmail studytourEmail, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(studytourExperience, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = studytourExperienceService.page(page, queryWrapper); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(studytourEmail, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = studytourEmailService.page(page, queryWrapper); return Result.OK(pageList); } /** * 添加 * - * @param studytourExperience + * @param studytourEmail * @return */ - @AutoLog(value = "学员心得表-添加") - @ApiOperation(value="学员心得表-添加", notes="学员心得表-添加") + @AutoLog(value = "邮件信息表-添加") + @ApiOperation(value="邮件信息表-添加", notes="邮件信息表-添加") @PostMapping(value = "/add") - public Result add(@RequestBody StudytourExperience studytourExperience) { - studytourExperienceService.save(studytourExperience); + public Result add(@RequestBody StudytourEmail studytourEmail) { + studytourEmailService.save(studytourEmail); return Result.OK("添加成功！"); } /** * 编辑 * - * @param studytourExperience + * @param studytourEmail * @return */ - @AutoLog(value = "学员心得表-编辑") - @ApiOperation(value="学员心得表-编辑", notes="学员心得表-编辑") + @AutoLog(value = "邮件信息表-编辑") + @ApiOperation(value="邮件信息表-编辑", notes="邮件信息表-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody StudytourExperience studytourExperience) { - studytourExperienceService.updateById(studytourExperience); + public Result edit(@RequestBody StudytourEmail studytourEmail) { + studytourEmailService.updateById(studytourEmail); return Result.OK("编辑成功!"); } @@ -106,11 +106,11 @@ public class StudytourExperienceController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { - studytourExperienceService.removeById(id); + studytourEmailService.removeById(id); return Result.OK("删除成功!"); } @@ -120,11 +120,11 @@ public class StudytourExperienceController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.studytourExperienceService.removeByIds(Arrays.asList(ids.split(","))); + this.studytourEmailService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -134,26 +134,26 @@ public class StudytourExperienceController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - StudytourExperience studytourExperience = studytourExperienceService.getById(id); - if(studytourExperience==null) { + public Result queryById(@RequestParam(name="id",required=true) String id) { + StudytourEmail studytourEmail = studytourEmailService.getById(id); + if(studytourEmail==null) { return Result.error("未找到对应数据"); } - return Result.OK(studytourExperience); + return Result.OK(studytourEmail); } /** * 导出excel * * @param request - * @param studytourExperience + * @param studytourEmail */ @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, StudytourExperience studytourExperience) { - return super.exportXls(request, studytourExperience, StudytourExperience.class, "学员心得表"); + public ModelAndView exportXls(HttpServletRequest request, StudytourEmail studytourEmail) { + return super.exportXls(request, studytourEmail, StudytourEmail.class, "邮件信息表"); } /** @@ -165,7 +165,7 @@ public class StudytourExperienceController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, StudytourExperience.class); + return super.importExcel(request, response, StudytourEmail.class); } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/entity/StudytourEmail.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/entity/StudytourEmail.java new file mode 100644 index 0000000..8cd9974 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/entity/StudytourEmail.java @@ -0,0 +1,71 @@ +package org.jeecg.modules.studytourEmail.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-10-29 + * @Version: V1.0 + */ +@Data +@TableName("studytour_email") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="studytour_email对象", description="邮件信息表") +public class StudytourEmail 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 name; + /**电话*/ + @Excel(name = "电话", width = 15) + @ApiModelProperty(value = "电话") + private java.lang.String phone; + /**邮寄地址*/ + @Excel(name = "邮寄地址", width = 15) + @ApiModelProperty(value = "邮寄地址") + private java.lang.String address; + /**行后报告*/ + @Excel(name = "行后报告", width = 15) + @ApiModelProperty(value = "行后报告") + private java.lang.String report; + /**关联用户*/ + @Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "关联用户") + private java.lang.String userId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/mapper/StudytourEmailMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/mapper/StudytourEmailMapper.java new file mode 100644 index 0000000..5fd903d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/mapper/StudytourEmailMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.studytourEmail.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.studytourEmail.entity.StudytourEmail; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 邮件信息表 + * @Author: jeecg-boot + * @Date: 2025-10-29 + * @Version: V1.0 + */ +public interface StudytourEmailMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/xml/StudytourExperienceMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/mapper/xml/StudytourEmailMapper.xml similarity index 59% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/xml/StudytourExperienceMapper.xml rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/mapper/xml/StudytourEmailMapper.xml index 11152bf..8092bf4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/mapper/xml/StudytourExperienceMapper.xml +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/mapper/xml/StudytourEmailMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/service/IStudytourEmailService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/service/IStudytourEmailService.java new file mode 100644 index 0000000..61e97f8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/service/IStudytourEmailService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.studytourEmail.service; + +import org.jeecg.modules.studytourEmail.entity.StudytourEmail; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 邮件信息表 + * @Author: jeecg-boot + * @Date: 2025-10-29 + * @Version: V1.0 + */ +public interface IStudytourEmailService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/service/impl/StudytourEmailServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/service/impl/StudytourEmailServiceImpl.java new file mode 100644 index 0000000..766f8c8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/service/impl/StudytourEmailServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.studytourEmail.service.impl; + +import org.jeecg.modules.studytourEmail.entity.StudytourEmail; +import org.jeecg.modules.studytourEmail.mapper.StudytourEmailMapper; +import org.jeecg.modules.studytourEmail.service.IStudytourEmailService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 邮件信息表 + * @Author: jeecg-boot + * @Date: 2025-10-29 + * @Version: V1.0 + */ +@Service +public class StudytourEmailServiceImpl extends ServiceImpl implements IStudytourEmailService { + +} 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/studytourEmail/vue/StudytourEmailList.vue similarity index 80% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/StudytourExperienceList.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/vue/StudytourEmailList.vue index 1052971..d8f145a 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/studytourEmail/vue/StudytourEmailList.vue @@ -12,7 +12,7 @@
新增 - 导出 + 导出 导入 @@ -89,7 +89,7 @@
- + @@ -98,18 +98,18 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import StudytourExperienceModal from './modules/StudytourExperienceModal' + import StudytourEmailModal from './modules/StudytourEmailModal' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { - name: 'StudytourExperienceList', + name: 'StudytourEmailList', mixins:[JeecgListMixin, mixinDevice], components: { - StudytourExperienceModal + StudytourEmailModal }, data () { return { - description: '学员心得表管理页面', + description: '邮件信息表管理页面', // 表头 columns: [ { @@ -123,20 +123,25 @@ } }, { - title:'文字内容', + title:'姓名', align:"center", - dataIndex: 'content' + dataIndex: 'name' }, { - title:'图片内容', + title:'电话', align:"center", - dataIndex: 'image', - scopedSlots: {customRender: 'imgSlot'} + dataIndex: 'phone' }, { - title:'关联成长档案', + title:'邮寄地址', align:"center", - dataIndex: 'experienceId_dictText' + dataIndex: 'address' + }, + { + title:'行后报告', + align:"center", + dataIndex: 'report', + scopedSlots: {customRender: 'fileSlot'} }, { title:'关联用户', @@ -153,11 +158,11 @@ } ], url: { - list: "/studytourExperience/studytourExperience/list", - delete: "/studytourExperience/studytourExperience/delete", - deleteBatch: "/studytourExperience/studytourExperience/deleteBatch", - exportXlsUrl: "/studytourExperience/studytourExperience/exportXls", - importExcelUrl: "studytourExperience/studytourExperience/importExcel", + list: "/studytourEmail/studytourEmail/list", + delete: "/studytourEmail/studytourEmail/delete", + deleteBatch: "/studytourEmail/studytourEmail/deleteBatch", + exportXlsUrl: "/studytourEmail/studytourEmail/exportXls", + importExcelUrl: "studytourEmail/studytourEmail/importExcel", }, dictOptions:{}, @@ -177,9 +182,10 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'Text',value:'content',text:'文字内容',dictCode:''}) - fieldList.push({type:'Text',value:'image',text:'图片内容',dictCode:''}) - fieldList.push({type:'sel_search',value:'experienceId',text:'关联成长档案',dictTable:"studytour_record", dictText:'activity_id', dictCode:'id'}) + fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''}) + fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''}) + fieldList.push({type:'Text',value:'address',text:'邮寄地址',dictCode:''}) + fieldList.push({type:'Text',value:'report',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/studytourExperience/vue/modules/StudytourExperienceForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/vue/modules/StudytourEmailForm.vue similarity index 71% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceForm.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/vue/modules/StudytourEmailForm.vue index 26de00c..7acedb4 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/studytourEmail/vue/modules/StudytourEmailForm.vue @@ -4,18 +4,23 @@ - - + + - - + + - - + + + + + + + @@ -35,7 +40,7 @@ import { validateDuplicateValue } from '@/utils/util' export default { - name: 'StudytourExperienceForm', + name: 'StudytourEmailForm', components: { }, props: { @@ -62,9 +67,9 @@ validatorRules: { }, url: { - add: "/studytourExperience/studytourExperience/add", - edit: "/studytourExperience/studytourExperience/edit", - queryById: "/studytourExperience/studytourExperience/queryById" + add: "/studytourEmail/studytourEmail/add", + edit: "/studytourEmail/studytourEmail/edit", + queryById: "/studytourEmail/studytourEmail/queryById" } } }, diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/vue/modules/StudytourEmailModal.Style#Drawer.vue similarity index 85% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceModal.Style#Drawer.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/vue/modules/StudytourEmailModal.Style#Drawer.vue index 14ff405..d9f8484 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourExperience/vue/modules/StudytourExperienceModal.Style#Drawer.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourEmail/vue/modules/StudytourEmailModal.Style#Drawer.vue @@ -7,7 +7,7 @@ @close="close" destroyOnClose :visible="visible"> - +
关闭 提交 @@ -17,12 +17,12 @@ \ No newline at end of file + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/vue/modules/StudytourRecordModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/vue/modules/StudytourRecordModal.vue index cd58108..64b37ef 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/vue/modules/StudytourRecordModal.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourRecord/vue/modules/StudytourRecordModal.vue @@ -1,26 +1,27 @@ \ No newline at end of file + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ExperienceService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ExperienceService.java index ee98de8..d373767 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ExperienceService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ExperienceService.java @@ -3,9 +3,10 @@ package org.jeecg.modules.api.service; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.api.bean.PageBean; -import org.jeecg.modules.studytourBindperson.entity.StudytourBindperson; -import org.jeecg.modules.studytourExperience.entity.StudytourExperience; +import org.jeecg.modules.studytourEmail.entity.StudytourEmail; +import org.jeecg.modules.studytourRecord.entity.StudytourExperience; import org.jeecg.modules.studytourRecord.entity.StudytourRecord; +import org.jeecg.modules.studytourRecord.entity.StudytourReport; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -13,12 +14,21 @@ import org.springframework.web.bind.annotation.RequestMethod; public interface ExperienceService { //成长档案-查询成长档案列表 - public Result queryExperienceList(@RequestHeader("X-Access-Token") String token, StudytourRecord studytourRecord, PageBean pageBean); + public Result queryExperienceList(String token, StudytourRecord studytourRecord, PageBean pageBean); //成长档案-查询成长档案详情 - public Result queryExperienceById(@RequestHeader("X-Access-Token") String token, String recordId); + public Result queryExperienceById(String token, String recordId); - //成长档案-新增成长档案 - public Result addExperience(@RequestHeader("X-Access-Token") String token, StudytourExperience studytourExperience); + //成长档案-新增学员心得 + public Result addExperience(String token, StudytourExperience studytourExperience); + + //成长档案-查看行后报告详情 + public Result queryReportById(String token, String recordId); + + //成长档案-修改行后报告 + public Result updateReport(String token, StudytourReport studytourReport); + + //成长档案-申请邮寄 + public Result addEmail(String token, StudytourEmail studytourEmail); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/ExperienceServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/ExperienceServiceImpl.java index 5af80c4..b31d61e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/ExperienceServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/ExperienceServiceImpl.java @@ -10,16 +10,18 @@ import org.jeecg.modules.api.bean.PageBean; import org.jeecg.modules.api.service.ExperienceService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; -import org.jeecg.modules.studytourActivity.entity.StudytourActivity; -import org.jeecg.modules.studytourBindperson.entity.StudytourBindperson; -import org.jeecg.modules.studytourExperience.entity.StudytourExperience; -import org.jeecg.modules.studytourExperience.service.IStudytourExperienceService; +import org.jeecg.modules.studytourEmail.entity.StudytourEmail; +import org.jeecg.modules.studytourEmail.service.IStudytourEmailService; import org.jeecg.modules.studytourImage.entity.StudytourImage; import org.jeecg.modules.studytourImage.entity.StudytourImageContent; import org.jeecg.modules.studytourImage.service.IStudytourImageContentService; import org.jeecg.modules.studytourImage.service.IStudytourImageService; +import org.jeecg.modules.studytourRecord.entity.StudytourExperience; import org.jeecg.modules.studytourRecord.entity.StudytourRecord; +import org.jeecg.modules.studytourRecord.entity.StudytourReport; +import org.jeecg.modules.studytourRecord.service.IStudytourExperienceService; import org.jeecg.modules.studytourRecord.service.IStudytourRecordService; +import org.jeecg.modules.studytourRecord.service.IStudytourReportService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -42,6 +44,12 @@ public class ExperienceServiceImpl implements ExperienceService { //学员心得 @Resource private IStudytourExperienceService studytourExperienceService; + //行后报告 + @Resource + private IStudytourReportService studytourReportService; + //邮件信息 + @Resource + private IStudytourEmailService studytourEmailService; //图片直播 @Resource private IStudytourImageService studytourImageService; @@ -161,7 +169,7 @@ public class ExperienceServiceImpl implements ExperienceService { } } - //成长档案-新增成长档案 + //成长档案-新增学员心得 @Override public Result addExperience(String token, StudytourExperience studytourExperience) { log.info("开始新增学员心得信息"); @@ -172,7 +180,7 @@ public class ExperienceServiceImpl implements ExperienceService { String massege = ""; try{ - //1、新增成长档案信息 + //1、新增学员心得信息 studytourExperience.setUserId(hanHaiMember.getId()); boolean result = studytourExperienceService.save(studytourExperience); @@ -191,4 +199,89 @@ public class ExperienceServiceImpl implements ExperienceService { } } + //成长档案-查看行后报告详情 + @Override + public Result queryReportById(String token, String recordId) { + log.info("开始查询行后报告详情"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + //返回信息 + String massege = ""; + + try{ + //行后报告详情 + StudytourReport one = studytourReportService + .lambdaQuery() + .eq(StudytourReport::getRecordId, recordId) + .one(); + + log.info("行后报告详情查询结束"); + return Result.OK("行后报告详情", one); + }catch (Exception e){ + log.info("行后报告详情查询失败"); + e.printStackTrace(); + return Result.error("行后报告详情查询失败"); + } + } + + //成长档案-修改行后报告 + @Override + public Result updateReport(String token, StudytourReport studytourReport) { + log.info("开始修改行后报告信息"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + //返回信息 + String massege = ""; + + try{ + //1、修改行后报告信息 + boolean result = studytourReportService.updateById(studytourReport); + + if(result){ + log.info("行后报告信息修改成功"); + return Result.OK("行后报告信息修改成功"); + }else { + log.info("行后报告信息修改失败"); + return Result.error("行后报告信息修改失败"); + } + + }catch (Exception e){ + log.info("行后报告信息修改失败"); + e.printStackTrace(); + return Result.error("行后报告信息修改失败"); + } + } + + //成长档案-申请邮寄 + @Override + public Result addEmail(String token, StudytourEmail studytourEmail) { + log.info("开始申请邮寄"); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token); + //返回信息 + String massege = ""; + + try{ + //1、修改行后报告信息 + studytourEmail.setUserId(hanHaiMember.getId()); + boolean result = studytourEmailService.save(studytourEmail); + + if(result){ + log.info("申请邮寄成功"); + return Result.OK("申请邮寄成功"); + }else { + log.info("申请邮寄失败"); + return Result.error("申请邮寄失败"); + } + + }catch (Exception e){ + log.info("申请邮寄失败"); + e.printStackTrace(); + return Result.error("申请邮寄失败"); + } + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/OrderServiceImpl.java index 809e330..cce7e7d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/OrderServiceImpl.java @@ -33,7 +33,9 @@ import org.jeecg.modules.studytourOrder.service.IStudytourOrderService; import org.jeecg.modules.studytourPerson.entity.StudytourPerson; import org.jeecg.modules.studytourPerson.service.IStudytourPersonService; import org.jeecg.modules.studytourRecord.entity.StudytourRecord; +import org.jeecg.modules.studytourRecord.entity.StudytourReport; import org.jeecg.modules.studytourRecord.service.IStudytourRecordService; +import org.jeecg.modules.studytourRecord.service.IStudytourReportService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -82,6 +84,9 @@ public class OrderServiceImpl implements OrderService { //用户成长档案信息 @Resource private IStudytourRecordService studytourRecordService; + //用户行后报告信息 + @Resource + private IStudytourReportService studytourReportService; //开营通知信息 @Resource private IStudytourNoticeService studytourNoticeService; @@ -532,12 +537,17 @@ public class OrderServiceImpl implements OrderService { if(recordList.size() < 1){ //没有该活动的成长档案，进行添加 StudytourRecord studytourRecord = new StudytourRecord(); + String recordId = IdWorker.getIdStr();//生成成长档案id + studytourRecord.setId(recordId);//成长档案id studytourRecord.setActivityId(studytourOrder.getActivityId());//关联活动 studytourRecord.setUserId(studytourOrder.getUserId());//关联用户 boolean result = studytourRecordService.save(studytourRecord); if(!result){ log.error("用户成长档案添加失败"); } + + //添加行后报告信息 + addReport(studytourOrder, recordId); } }catch (Exception e){ @@ -546,6 +556,23 @@ public class OrderServiceImpl implements OrderService { } } + //添加行后报告 + public void addReport(StudytourOrder studytourOrder, String recordId){ + try{ + StudytourReport studytourReport = new StudytourReport(); + studytourReport.setRecordId(recordId); + boolean result = studytourReportService.save(studytourReport); + if(!result){ + log.error("用户行后报告添加失败"); + } + + + }catch (Exception e){ + e.printStackTrace(); + log.error("用户行后报告添加失败"); + } + } + //添加开营通知 public void addNotice(StudytourOrder studytourOrder){ try{ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ExperienceController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ExperienceController.java index f18e249..11d945b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ExperienceController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ExperienceController.java @@ -6,8 +6,10 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.api.bean.PageBean; import org.jeecg.modules.api.service.ExperienceService; -import org.jeecg.modules.studytourExperience.entity.StudytourExperience; +import org.jeecg.modules.studytourEmail.entity.StudytourEmail; +import org.jeecg.modules.studytourRecord.entity.StudytourExperience; import org.jeecg.modules.studytourRecord.entity.StudytourRecord; +import org.jeecg.modules.studytourRecord.entity.StudytourReport; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -45,5 +47,23 @@ public class ExperienceController { return experienceService.addExperience(token, studytourExperience); } + @ApiOperation(value="成长档案-查看行后报告详情", notes="recordId：成长档案id") + @RequestMapping(value = "/queryReportById", method = {RequestMethod.GET}) + public Result queryReportById(@RequestHeader("X-Access-Token") String token, String recordId){ + return experienceService.queryReportById(token,recordId); + } + + @ApiOperation(value="成长档案-修改行后报告", notes="成长档案-修改行后报告") + @RequestMapping(value = "/updateReport", method = {RequestMethod.POST}) + public Result updateReport(@RequestHeader("X-Access-Token") String token, StudytourReport studytourReport){ + return experienceService.updateReport(token, studytourReport); + } + + @ApiOperation(value="成长档案-申请邮寄", notes="成长档案-申请邮寄") + @RequestMapping(value = "/addEmail", method = {RequestMethod.POST}) + public Result addEmail(@RequestHeader("X-Access-Token") String token, StudytourEmail studytourEmail){ + return experienceService.addEmail(token, studytourEmail); + } + }