From 55a9aedd454e182344e14cf810b872ceef2cf7fa Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Mon, 31 Mar 2025 22:52:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=A0=E7=89=A9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AE=80=E4=BB=8B=E3=80=81=E5=B9=B4=E9=BE=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=202=E3=80=81=E8=AF=84=E8=AE=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=203=E3=80=81=E6=9C=8D=E5=8A=A1=E6=97=A5=E5=BF=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?-id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contoller/ApiAppletHhrWorkInController.java | 5 +++-- .../applet/contoller/ApiAppletInfoController.java | 14 ++++++++++++ .../contoller/ApiAppletServiceInfoController.java | 18 ++++++++++++++++ .../java/com/ruoyi/model/domain/AppletComment.java | 25 ++++++++++++++++++++++ .../java/com/ruoyi/model/domain/AppletPet.java | 9 ++++++++ .../resources/mapper/model/AppletPetMapper.xml | 4 +++- .../mapper/model/AppletServiceLogMapper.xml | 1 + 7 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletServiceInfoController.java diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java index 93aaa97..2dd372c 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkInController.java @@ -48,7 +48,8 @@ public class ApiAppletHhrWorkInController extends BaseController { icon2.setType(0); icon2.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/2.png"); icon2.setName("我的用户"); - icon2.setUrl("/otherPages/workbenchManage/myUser/"); + //icon2.setUrl("/otherPages/workbenchManage/myUser/"); + icon2.setUrl("/otherPages/workbenchManage/myUser/index"); AppletIcon icon3 = new AppletIcon(); icon3.setType(0); @@ -78,7 +79,7 @@ public class ApiAppletHhrWorkInController extends BaseController { icon6.setType(1); icon6.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/6.png"); icon6.setName("服务记录"); - icon6.setUrl(""); + icon6.setUrl("/otherPages/authentication/serve/record"); AppletIcon icon7 = new AppletIcon(); icon7.setType(1); diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java index 1089c3c..d1d3c50 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java @@ -7,8 +7,10 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.model.domain.AppUsers; import com.ruoyi.model.domain.AppletComment; import com.ruoyi.model.domain.AppletServiceLog; +import com.ruoyi.model.domain.AppletUsersTeacher; import com.ruoyi.model.service.IAppUsersService; import com.ruoyi.model.service.IAppletCommentService; +import com.ruoyi.model.service.IAppletUsersTeacherService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +27,8 @@ public class ApiAppletInfoController { @Autowired private IAppUsersService appUsersService; @Autowired + private IAppletUsersTeacherService appletUsersTeacherService; + @Autowired private IAppletCommentService appletCommentService; //修改用户信息接口 @@ -45,6 +49,16 @@ public class ApiAppletInfoController { @GetMapping("/appletCommentList") public AjaxResult appletCommentList(AppletComment comment){ List logList = appletCommentService.selectAppletCommentList(comment); + + for (AppletComment appletComment : logList) { + //关联评价人员信息 + AppUsers appUsers = appUsersService.selectAppUsersByUserId(appletComment.getUser1Id()); + appletComment.setAppUsers(appUsers); + //关联服务人员信息 + AppletUsersTeacher appletUsersTeacher = appletUsersTeacherService.selectAppletUsersTeacherById(appletComment.getUser2Id()); + appletComment.setAppletUsersTeacher(appletUsersTeacher); + } + return AjaxResult.success("获取我的评价列表数据带分页",logList); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletServiceInfoController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletServiceInfoController.java new file mode 100644 index 0000000..95ce06e --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletServiceInfoController.java @@ -0,0 +1,18 @@ +package com.ruoyi.applet.contoller; + +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.model.domain.AppletServiceLog; +import com.ruoyi.model.service.IAppletServiceLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(description = "伴宠师工作台-服务信息") +@RestController +@RequestMapping("/applet/serviceInfo") +public class ApiAppletServiceInfoController { + +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletComment.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletComment.java index 3ac3856..1cbaf1b 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletComment.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletComment.java @@ -1,5 +1,6 @@ package com.ruoyi.model.domain; +import com.baomidou.mybatisplus.annotation.TableField; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -37,6 +38,30 @@ public class AppletComment extends BaseEntity /** 删除标识 */ private Integer delFlag; + //关联评价人员信息 + @TableField(exist = false) + private AppUsers appUsers; + + //关联服务人员信息 + @TableField(exist = false) + private AppletUsersTeacher appletUsersTeacher; + + public AppUsers getAppUsers() { + return appUsers; + } + + public void setAppUsers(AppUsers appUsers) { + this.appUsers = appUsers; + } + + public AppletUsersTeacher getAppletUsersTeacher() { + return appletUsersTeacher; + } + + public void setAppletUsersTeacher(AppletUsersTeacher appletUsersTeacher) { + this.appletUsersTeacher = appletUsersTeacher; + } + public void setId(Long id) { this.id = id; diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletPet.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletPet.java index d0e95b7..4507a7f 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletPet.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletPet.java @@ -84,6 +84,15 @@ public class AppletPet { @Excel(name = "订单标识") private Long orderId; + /** 宠物简介 */ + @Excel(name = "宠物简介") + private String brief; + + /** 年龄 */ + @Excel(name = "年龄") + private Integer age; + + /** 创建人 */ private String createBy; diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletPetMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletPetMapper.xml index 8fda194..7bc1830 100644 --- a/ruoyi-catdog/src/main/resources/mapper/model/AppletPetMapper.xml +++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletPetMapper.xml @@ -21,6 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -33,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, head_image, nick_name, sex, type, birthday, weight, personality, vaccine, deworm, neutered, pet_type, health, pet_card, health_other, del_flag, create_by, create_time, update_by, update_time, order_id , create_by, create_time, update_by, update_time from applet_pet + select id, head_image, nick_name, sex, type, birthday, weight, personality, vaccine, deworm, neutered, pet_type, health, pet_card, health_other, del_flag, brief, age create_by, create_time, update_by, update_time, order_id , create_by, create_time, update_by, update_time from applet_pet + and id = #{id} and user_id = #{userId} and service_type = #{serviceType} and service_time = #{serviceTime}