Merge branch 'master' of http://175.178.51.79:3000/Augcl/pet-admin

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);

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<AppletComment> 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);
     }
 

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 {
+
+}

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;

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;

ruoyi-catdog/src/main/resources/mapper/model/AppletPetMapper.xml

@@ -21,6 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="petCard" column="pet_card"/>
         <result property="healthOther" column="health_other"/>
         <result property="delFlag" column="del_flag"/>
+        <result property="brief" column="brief"/>
+        <result property="age" column="age"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -33,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAppletPetVo">
-        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
     </sql>
 
     <select id="selectAppletPetList" parameterType="AppletPet" resultMap="AppletPetResult">

ruoyi-catdog/src/main/resources/mapper/model/AppletServiceLogMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAppletServiceLogList" parameterType="AppletServiceLog" resultMap="AppletServiceLogResult">
         <include refid="selectAppletServiceLogVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="serviceType != null  and serviceType != ''"> and service_type = #{serviceType}</if>
             <if test="serviceTime != null "> and service_time = #{serviceTime}</if>