From 3e751604da46f77e9d260940e0e45aeb0ae22edd Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 4 Jun 2025 13:46:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=B4=E5=AE=A0=E5=B8=88?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B5=81=E7=A8=8B=E5=92=8C=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CatmDogd-Mall-Front-test/.env.production           |   2 +-
 .../AppletUsersTeacher/components/ExamInfo.vue     |  60 +++++-
 .../views/model/AppletUsersTeacher/openindex.vue   |   2 +-
 .../contoller/ApiAppletExaminationController.java  | 203 ++++++++++++++++++---
 .../controller/AppletUsersTeacherController.java   |  24 +--
 .../model/domain/AppletOrderDateFrequency.java     |   4 +
 .../ruoyi/model/mapper/AppletAnswerBaseMapper.java |   5 +-
 .../model/mapper/AppletAnswerTrainMapper.java      |   5 +-
 .../model/mapper/AppletUsersTeacherMapper.java     |   5 +-
 .../model/service/IAppletAnswerBaseService.java    |   5 +-
 .../model/service/IAppletAnswerTrainService.java   |   5 +-
 .../model/service/IAppletUsersTeacherService.java  |   5 +-
 .../service/impl/AppletAnswerBaseServiceImpl.java  |   5 +-
 .../service/impl/AppletAnswerTrainServiceImpl.java |   4 +-
 .../impl/AppletOrderDateFrequencyServiceImpl.java  |   4 +-
 .../impl/AppletUsersTeacherServiceImpl.java        |   7 +-
 16 files changed, 287 insertions(+), 58 deletions(-)

diff --git a/CatmDogd-Mall-Front-test/.env.production b/CatmDogd-Mall-Front-test/.env.production
index 76a0d56..e638a8e 100644
--- a/CatmDogd-Mall-Front-test/.env.production
+++ b/CatmDogd-Mall-Front-test/.env.production
@@ -5,5 +5,5 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/api'
 VUE_APP_JUDGE_STAR = 0
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/components/ExamInfo.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/components/ExamInfo.vue
index 69ad200..0476d16 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/components/ExamInfo.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/components/ExamInfo.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="考核信息" :visible.sync="visible" width="60%" append-to-body>
+    <el-dialog title="考核信息" :visible="dialogVisible" @close="handleClose" width="60%" append-to-body>
         <div v-loading="loading">
             <el-tabs v-model="activeTab">
                 <!-- <el-tab-pane label="基本信息" name="basic">
@@ -16,6 +16,7 @@
                         <div class="question-title">
                             <span class="question-index">{{ index + 1 }}.</span>
                             <span class="question-type">[{{ question.type === '培训' ? '填空题' : '选择题' }}]</span>
+                            <span v-if="!isQuestionAnswered(question)" class="unanswered-tag">未答题</span>
                             <span class="question-content">{{ question.title }}</span>
                         </div>
 
@@ -23,14 +24,20 @@
                         <template v-if="question.type === '培训'">
                             <div class="answer-content">
                                 <div class="answer-label">答案：</div>
-                                <div class="answer-text">{{ question.userAppletAnswerTrain.answer }}</div>
+                                <div class="answer-text" :class="{ 'no-answer': !isQuestionAnswered(question) }">
+                                    {{ question.userAppletAnswerTrain && question.userAppletAnswerTrain.answer || '暂无答案' }}
+                                </div>
                                 <div class="answer-requirement">最少字数要求：{{ question.numberWords }}</div>
                             </div>
                         </template>
 
                         <!-- 选择题答案 -->
                         <template v-else>
-                            <div class="options-list">
+                            <div v-if="!isQuestionAnswered(question)" class="no-answer-tip">
+                                <i class="el-icon-warning"></i>
+                                该题目尚未作答
+                            </div>
+                            <div v-else class="options-list">
                                 <div v-for="option in question.answerList" :key="option.orderNo"
                                     :class="['option-item', { 
                                         'correct': option.isTrue, 
@@ -145,7 +152,7 @@ export default {
                 .map(option => option.id);
             
             // 获取用户选择的答案ID
-            const userAnswerIds = question.userAnswerBaseList.map(answer => answer.answerId);
+            const userAnswerIds = [...new Set(question.userAnswerBaseList.map(answer => answer.answerId))];
             
             // 判断用户选择的答案数量是否与正确答案数量相同
             if (userAnswerIds.length !== correctOptionIds.length) {
@@ -154,6 +161,22 @@ export default {
             
             // 判断用户选择的答案是否都是正确的
             return userAnswerIds.every(answerId => correctOptionIds.includes(answerId));
+        },
+        isQuestionAnswered(question) {
+            if (question.type === '培训') {
+                // 填空题：检查是否有答案且答案不为空
+                return question.userAppletAnswerTrain && 
+                       question.userAppletAnswerTrain.answer && 
+                       question.userAppletAnswerTrain.answer.trim() !== '';
+            } else {
+                // 选择题：检查是否有选择的答案
+                return question.userAnswerBaseList && question.userAnswerBaseList.length > 0;
+            }
+        }
+    },
+    computed: {
+        dialogVisible() {
+            return this.visible;
         }
     }
 };
@@ -179,6 +202,15 @@ export default {
             color: #409EFF;
             margin-right: 8px;
         }
+
+        .unanswered-tag {
+            background: #f56c6c;
+            color: #fff;
+            font-size: 12px;
+            padding: 2px 6px;
+            border-radius: 2px;
+            margin-right: 8px;
+        }
     }
 
     .answer-content {
@@ -194,6 +226,10 @@ export default {
         .answer-text {
             margin-bottom: 8px;
             line-height: 1.5;
+
+            &.no-answer {
+                color: #909399;
+            }
         }
 
         .answer-requirement {
@@ -271,5 +307,21 @@ export default {
             font-size: 16px;
         }
     }
+
+    .no-answer-tip {
+        margin-bottom: 10px;
+        padding: 8px 12px;
+        background: #fff;
+        border-radius: 4px;
+        display: flex;
+        align-items: center;
+        font-size: 14px;
+        color: #909399;
+
+        i {
+            margin-right: 8px;
+            font-size: 16px;
+        }
+    }
 }
 </style>
\ No newline at end of file
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/openindex.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/openindex.vue
index 6c0d14f..1f7733d 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/openindex.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/openindex.vue
@@ -271,7 +271,7 @@
         </el-dialog>
 
         <!-- 考核信息查看对话框 -->
-        <exam-info :visible.sync="examInfoVisible" :userId="currentUserId" />
+        <exam-info :visible="examInfoVisible" :userId="currentUserId" @update:visible="examInfoVisible = $event" />
     </div>
 </template>
 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java
index 9c82540..fda3481 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletExaminationController.java
@@ -1,7 +1,14 @@
 package com.ruoyi.applet.contoller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.model.domain.*;
+import com.ruoyi.model.mapper.AppletAnswerBaseMapper;
+import com.ruoyi.model.mapper.AppletAnswerTrainMapper;
 import com.ruoyi.model.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,10 +42,24 @@ public class ApiAppletExaminationController {
     @Autowired
     private IAppletAnswerBaseService appletAnswerBaseService;
 
+    //用户基本考核答案
+    @Autowired
+    private AppletAnswerBaseMapper appletAnswerBaseMapper;
+
     //用户培训考核答案
     @Autowired
     private IAppletAnswerTrainService appletAnswerTrainService;
 
+    //用户培训考核答案
+    @Autowired
+    private AppletAnswerTrainMapper appletAnswerTrainMapper;
+
+    @Autowired
+    private IAppUsersService appUsersService;
+
+    @Autowired
+    private IAppletUsersTeacherService appletUsersTeacherService;
+
     @ApiOperation("伴宠师工作台-题目列表数据查询")
     @GetMapping("/questionList")
     public AjaxResult questionList(AppletQuestion question){
@@ -83,8 +104,32 @@ public class ApiAppletExaminationController {
     }
 
 
+
+    //查询用户考核状态
+//    @ApiOperation("伴宠师工作台-查询用户考核状态")
+//    @GetMapping("/answerStatus")
+//    public AjaxResult answerStatus(Long userId){
+//        /**
+//         * 返回值 0 进入伴宠师资料页面，补充资料
+//         * 返回值 1 进入基本考核
+//         * 返回值 2 进入培训考核
+//         * 返回值 3 进入审核中页面
+//         * 返回值 4 进入审核失败页面
+//         * 返回值 5 进入审核成功页面
+//         */
+//
+//        AppletAnswerBase answerBase = new AppletAnswerBase();
+//        answerBase.setUserId(userId);
+//        List<AppletAnswerBase> answerBaseList = appletAnswerBaseService.selectAppletAnswerBaseList(answerBase);
+//        if(answerBaseList.size() > 0){
+//            return AjaxResult.success(1);//进入伴宠师资料页面，补充资料
+//        }
+//
+//        return AjaxResult.error("用户基本考核未完成");
+//    }
+
     //查询基本考核是否完成
-    @ApiOperation("伴宠师工作台-查询用户基本考核是否完成")
+    @ApiOperation("伴宠师工作台-查询用户基本考核是否完成【废弃】")
     @GetMapping("/answeBaseIsFinish")
     public AjaxResult answeBaseIsFinish(Long userId){
         AppletAnswerBase answerBase = new AppletAnswerBase();
@@ -96,10 +141,44 @@ public class ApiAppletExaminationController {
         return AjaxResult.error("用户基本考核未完成");
     }
 
+    //查询基本考核是否完成
+    @ApiOperation("伴宠师工作台-查询用户基本考核是否完成")
+    @GetMapping("/answeBaseIsFinishV2")
+    public AjaxResult answeBaseIsFinishV2(Long userId){
+        AppletAnswerBase answerBase = new AppletAnswerBase();
+        answerBase.setUserId(userId);
+        List<AppletAnswerBase> answerBaseList = appletAnswerBaseService.selectAppletAnswerBaseList(answerBase);
+        if(answerBaseList.size() > 0){
+            return AjaxResult.success(1);
+        }
+        return AjaxResult.success(0);
+    }
 
 
-
-
+    //查询培训考核是否完成
+    @ApiOperation("伴宠师工作台-查询用户培训考核是否完成【废弃】")
+    @GetMapping("/answeTrainIsFinish")
+    public AjaxResult answeTrainIsFinish(Long userId){
+        AppletAnswerTrain answerTrain = new AppletAnswerTrain();
+        answerTrain.setUserId(userId);
+        List<AppletAnswerTrain> answerTrainList = appletAnswerTrainService.selectAppletAnswerTrainList(answerTrain);
+        if(answerTrainList.size() > 0){
+            return AjaxResult.success("用户培训考核已完成");
+        }
+        return AjaxResult.error("用户培训考核未完成");
+    }
+    //查询培训考核是否完成
+    @ApiOperation("伴宠师工作台-查询用户培训考核是否完成")
+    @GetMapping("/answeTrainIsFinishV2")
+    public AjaxResult answeTrainIsFinishV2(Long userId){
+        AppletAnswerTrain answerTrain = new AppletAnswerTrain();
+        answerTrain.setUserId(userId);
+        List<AppletAnswerTrain> answerTrainList = appletAnswerTrainService.selectAppletAnswerTrainList(answerTrain);
+        if(answerTrainList.size() > 0){
+            return AjaxResult.success(1);
+        }
+        return AjaxResult.success(0);
+    }
 
 
 
@@ -123,17 +202,55 @@ public class ApiAppletExaminationController {
     @ApiOperation("伴宠师工作台-添加用户基本考核答案")
     @PostMapping("/addBaseAnswer")
     public AjaxResult addBaseAnswer(@RequestBody AppletAnswerBase answerBase){
+
         if(answerBase.getUserId() == null){
             return AjaxResult.error("userId用户信息标识不能为空");
         }
-        return toAjax(appletAnswerBaseService.insertAppletAnswerBase(answerBase));
-    }
-
-
+        if(answerBase.getQuestionId() == null){
+            return AjaxResult.error("questionId标识不能为空");
+        }
+//        //选删除之前的答案，再去添加新的
+        LambdaQueryWrapper<AppletAnswerBase> qw = Wrappers.<AppletAnswerBase>lambdaQuery()
+                .eq(AppletAnswerBase::getUserId, answerBase.getUserId())
+                .eq(AppletAnswerBase::getQuestionId, answerBase.getQuestionId());
 
+        appletAnswerBaseService.remove(qw);
 
+        return toAjax(appletAnswerBaseService.insertAppletAnswerBase(answerBase));
+    }
 
 
+//    @ApiOperation("伴宠师工作台-添加用户基本考核答案")
+//    @PostMapping("/addBaseAnswer")
+//    public AjaxResult addBaseAnswer(@RequestBody String list){
+//
+//        if (StringUtils.isBlank(list)){
+//            return AjaxResult.error("list不能为空");
+//        }
+//
+//        List<AppletAnswerBase> answerBase = JsonUtils.parseArray(list, AppletAnswerBase.class);
+//
+//        Long userId = null;
+//
+//        for (AppletAnswerBase appletAnswerBase : answerBase) {
+//            if(appletAnswerBase.getUserId() == null){
+//                return AjaxResult.error("userId用户信息标识不能为空");
+//            }
+//            if(appletAnswerBase.getQuestionId() == null){
+//                return AjaxResult.error("questionId标识不能为空");
+//            }
+//            userId = appletAnswerBase.getUserId();
+//        }
+//
+//
+////        //选删除之前的答案，再去添加新的
+//        LambdaQueryWrapper<AppletAnswerBase> qw = Wrappers.<AppletAnswerBase>lambdaQuery()
+//                .eq(AppletAnswerBase::getUserId, userId);
+//
+//        appletAnswerBaseService.remove(qw);
+//
+//        return toAjax(appletAnswerBaseService.saveBatch(answerBase));
+//    }
 
 
 
@@ -150,20 +267,6 @@ public class ApiAppletExaminationController {
         return AjaxResult.success("用户培训考核答案列表数据",answerTrainList);
     }
 
-    //查询培训考核是否完成
-    @ApiOperation("伴宠师工作台-查询用户培训考核是否完成")
-    @GetMapping("/answeTrainIsFinish")
-    public AjaxResult answeTrainIsFinish(Long userId){
-        AppletAnswerTrain answerTrain = new AppletAnswerTrain();
-        answerTrain.setUserId(userId);
-        List<AppletAnswerTrain> answerTrainList = appletAnswerTrainService.selectAppletAnswerTrainList(answerTrain);
-        if(answerTrainList.size() > 0){
-            return AjaxResult.success("用户培训考核已完成");
-        }
-       return AjaxResult.error("用户培训考核未完成");
-    }
-
-
 
 
 
@@ -187,11 +290,69 @@ public class ApiAppletExaminationController {
         if(answerTrain.getUserId() == null){
             return AjaxResult.error("userId用户信息标识不能为空");
         }
+        if(answerTrain.getQuestionId() == null){
+            return AjaxResult.error("questionId标识不能为空");
+        }
+
+//        //选删除之前的答案，再去添加新的
+        LambdaQueryWrapper<AppletAnswerTrain> qw = Wrappers.<AppletAnswerTrain>lambdaQuery()
+                .eq(AppletAnswerTrain::getUserId, answerTrain.getUserId())
+                .eq(AppletAnswerTrain::getQuestionId, answerTrain.getQuestionId());
+
+        appletAnswerTrainMapper.delete(qw);
+
         return toAjax(appletAnswerTrainService.insertAppletAnswerTrain(answerTrain));
     }
 
+
+    //查询培训考核是否完成
+    @ApiOperation("伴宠师工作台-成为伴宠师")
+    @GetMapping("/appletUsersTeacher")
+    public AjaxResult appletUsersTeacher(Long userId){
+        //审核通过，修改用户表
+        AppUsers appUsers = appUsersService.selectAppUsersByUserId(userId);
+        //用户不存在
+        if(appUsers == null){
+            return AjaxResult.error("用户不存在");
+        }
+        appUsers.setUserBcs(1);
+        appUsers.setUserBcsRole(1);
+        appUsersService.updateAppUsers(appUsers);
+        return AjaxResult.success(0);
+    }
+
+
+    @ApiOperation("伴宠师工作台-重新考试")
+    @GetMapping("/retakeExam")
+    public AjaxResult retakeExam(Long userId){
+
+        LambdaQueryWrapper<AppletAnswerBase> qw1 = Wrappers.<AppletAnswerBase>lambdaQuery()
+                .eq(AppletAnswerBase::getUserId, userId);
+
+        appletAnswerBaseMapper.delete(qw1);
+
+        LambdaQueryWrapper<AppletAnswerTrain> qw2 = Wrappers.<AppletAnswerTrain>lambdaQuery()
+                .eq(AppletAnswerTrain::getUserId, userId);
+
+        appletAnswerTrainMapper.delete(qw2);
+
+        AppletUsersTeacher one = appletUsersTeacherService.lambdaQuery()
+                .eq(AppletUsersTeacher::getUserId, userId)
+                .one();
+
+        if (ObjectUtils.isNotEmpty(one)){
+            one.setStatus(0L);
+            appletUsersTeacherService.updateById(one);
+        }
+
+        return AjaxResult.success();
+    }
+
     protected AjaxResult toAjax(int rows) {
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
+    protected AjaxResult toAjax(boolean b) {
+        return b ? AjaxResult.success() : AjaxResult.error();
+    }
 
 }
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUsersTeacherController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUsersTeacherController.java
index 5d55aa5..a081a3b 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUsersTeacherController.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUsersTeacherController.java
@@ -100,18 +100,18 @@ public class AppletUsersTeacherController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody AppletUsersTeacher appletUsersTeacher)
     {
-        //如果审核状态为通过status = 1
-        if(appletUsersTeacher.getStatus() == 1){
-            //审核通过，修改用户表
-            AppUsers appUsers = appUsersService.selectAppUsersByUserId(appletUsersTeacher.getUserId());
-            //用户不存在
-            if(appUsers == null){
-                return AjaxResult.error("用户不存在");
-            }
-            appUsers.setUserBcs(1);
-            appUsers.setUserBcsRole(1);
-            appUsersService.updateAppUsers(appUsers);
-        }
+//        //如果审核状态为通过status = 1
+//        if(appletUsersTeacher.getStatus() == 1){
+//            //审核通过，修改用户表
+//            AppUsers appUsers = appUsersService.selectAppUsersByUserId(appletUsersTeacher.getUserId());
+//            //用户不存在
+//            if(appUsers == null){
+//                return AjaxResult.error("用户不存在");
+//            }
+//            appUsers.setUserBcs(1);
+//            appUsers.setUserBcsRole(1);
+//            appUsersService.updateAppUsers(appUsers);
+//        }
         return toAjax(appletUsersTeacherService.updateAppletUsersTeacher(appletUsersTeacher));
     }
 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java
index 2f3abd5..48f1a23 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderDateFrequency.java
@@ -104,4 +104,8 @@ public class AppletOrderDateFrequency {
     @TableField(exist = false)
     private Member user;
 
+    // 下单用户
+    @TableField(exist = false)
+    private String orderByDate;
+
 }
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletAnswerBaseMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletAnswerBaseMapper.java
index 967076b..2c08056 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletAnswerBaseMapper.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletAnswerBaseMapper.java
@@ -1,6 +1,8 @@
 package com.ruoyi.model.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.model.domain.AppletAnswerBase;
 
 /**
@@ -9,8 +11,7 @@ import com.ruoyi.model.domain.AppletAnswerBase;
  * @author ruoyi
  * @date 2025-03-28
  */
-public interface AppletAnswerBaseMapper 
-{
+public interface AppletAnswerBaseMapper extends BaseMapper<AppletAnswerBase> {
     /**
      * 查询用户基本考核答案
      * 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletAnswerTrainMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletAnswerTrainMapper.java
index dac4126..0cc1453 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletAnswerTrainMapper.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletAnswerTrainMapper.java
@@ -1,6 +1,8 @@
 package com.ruoyi.model.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.model.domain.AppletAnswerTrain;
 
 /**
@@ -9,8 +11,7 @@ import com.ruoyi.model.domain.AppletAnswerTrain;
  * @author ruoyi
  * @date 2025-03-28
  */
-public interface AppletAnswerTrainMapper 
-{
+public interface AppletAnswerTrainMapper extends BaseMapper<AppletAnswerTrain> {
     /**
      * 查询用户培训考核答案
      * 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletUsersTeacherMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletUsersTeacherMapper.java
index 9eafdc6..a8b0416 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletUsersTeacherMapper.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletUsersTeacherMapper.java
@@ -1,6 +1,8 @@
 package com.ruoyi.model.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.model.domain.AppletUsersTeacher;
 
 /**
@@ -9,8 +11,7 @@ import com.ruoyi.model.domain.AppletUsersTeacher;
  * @author ruoyi
  * @date 2025-03-27
  */
-public interface AppletUsersTeacherMapper 
-{
+public interface AppletUsersTeacherMapper extends BaseMapper<AppletUsersTeacher> {
     /**
      * 查询伴宠师认证
      * 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletAnswerBaseService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletAnswerBaseService.java
index 7e359d2..40b6de2 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletAnswerBaseService.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletAnswerBaseService.java
@@ -1,6 +1,8 @@
 package com.ruoyi.model.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.model.domain.AppletAnswerBase;
 
 /**
@@ -9,8 +11,7 @@ import com.ruoyi.model.domain.AppletAnswerBase;
  * @author ruoyi
  * @date 2025-03-28
  */
-public interface IAppletAnswerBaseService 
-{
+public interface IAppletAnswerBaseService extends IService<AppletAnswerBase> {
     /**
      * 查询用户基本考核答案
      * 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletAnswerTrainService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletAnswerTrainService.java
index 55c9fa9..1173fd8 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletAnswerTrainService.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletAnswerTrainService.java
@@ -1,6 +1,8 @@
 package com.ruoyi.model.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.model.domain.AppletAnswerTrain;
 
 /**
@@ -9,8 +11,7 @@ import com.ruoyi.model.domain.AppletAnswerTrain;
  * @author ruoyi
  * @date 2025-03-28
  */
-public interface IAppletAnswerTrainService 
-{
+public interface IAppletAnswerTrainService extends IService<AppletAnswerTrain> {
     /**
      * 查询用户培训考核答案
      * 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletUsersTeacherService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletUsersTeacherService.java
index e374b88..3ef2f08 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletUsersTeacherService.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletUsersTeacherService.java
@@ -1,6 +1,8 @@
 package com.ruoyi.model.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.model.domain.AppletUsersTeacher;
 
 /**
@@ -9,8 +11,7 @@ import com.ruoyi.model.domain.AppletUsersTeacher;
  * @author ruoyi
  * @date 2025-03-27
  */
-public interface IAppletUsersTeacherService 
-{
+public interface IAppletUsersTeacherService extends IService<AppletUsersTeacher> {
     /**
      * 查询伴宠师认证
      * 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAnswerBaseServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAnswerBaseServiceImpl.java
index 97c6e20..bc263f3 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAnswerBaseServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAnswerBaseServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.model.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,8 +17,7 @@ import com.ruoyi.model.service.IAppletAnswerBaseService;
  * @date 2025-03-28
  */
 @Service
-public class AppletAnswerBaseServiceImpl implements IAppletAnswerBaseService 
-{
+public class AppletAnswerBaseServiceImpl extends ServiceImpl<AppletAnswerBaseMapper, AppletAnswerBase> implements IAppletAnswerBaseService {
     @Autowired
     private AppletAnswerBaseMapper appletAnswerBaseMapper;
 
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAnswerTrainServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAnswerTrainServiceImpl.java
index 4d5f516..1b71709 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAnswerTrainServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletAnswerTrainServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.model.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,7 +17,7 @@ import com.ruoyi.model.service.IAppletAnswerTrainService;
  * @date 2025-03-28
  */
 @Service
-public class AppletAnswerTrainServiceImpl implements IAppletAnswerTrainService 
+public class AppletAnswerTrainServiceImpl extends ServiceImpl<AppletAnswerTrainMapper, AppletAnswerTrain> implements IAppletAnswerTrainService
 {
     @Autowired
     private AppletAnswerTrainMapper appletAnswerTrainMapper;
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
index 7f84539..d7a2698 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
@@ -93,7 +93,9 @@ public class AppletOrderDateFrequencyServiceImpl extends ServiceImpl<AppletOrder
                 .eq(frequency.getMasterId() != null, AppletOrderDateFrequency::getMasterId, frequency.getMasterId())//伴宠师
                 .eq(frequency.getUserId() != null, AppletOrderDateFrequency::getUserId, frequency.getUserId())//下单用户
                 .eq(frequency.getServiceDate() != null, AppletOrderDateFrequency::getServiceDate, frequency.getServiceDate())//下单用户
-                .orderByAsc(AppletOrderDateFrequency::getServiceDate);
+
+                // 当前条件默认asc，传desc则desc
+                .orderBy(true, !"desc".equals(frequency.getOrderByDate()), AppletOrderDateFrequency::getServiceDate);
 
         if (frequency.getStatus() != null){
             qw.in(AppletOrderDateFrequency::getStatus,
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletUsersTeacherServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletUsersTeacherServiceImpl.java
index 8a8f554..0fcc48e 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletUsersTeacherServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletUsersTeacherServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.model.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.model.domain.*;
 import com.ruoyi.model.mapper.*;
@@ -15,8 +17,7 @@ import com.ruoyi.model.service.IAppletUsersTeacherService;
  * @date 2025-03-27
  */
 @Service
-public class AppletUsersTeacherServiceImpl implements IAppletUsersTeacherService 
-{
+public class AppletUsersTeacherServiceImpl extends ServiceImpl<AppletUsersTeacherMapper, AppletUsersTeacher> implements IAppletUsersTeacherService {
     @Autowired
     private AppletUsersTeacherMapper appletUsersTeacherMapper;
     @Autowired
@@ -59,7 +60,7 @@ public class AppletUsersTeacherServiceImpl implements IAppletUsersTeacherService
                     appletAnswerTrain.setQuestionId(appletQuestion.getId());
                     appletAnswerTrain.setUserId(appletUsersTeacher.getUserId());
                     List<AppletAnswerTrain> appletAnswerTrains = appletAnswerTrainMapper.selectAppletAnswerTrainList(appletAnswerTrain);
-                    appletQuestion.setUserAppletAnswerTrain(appletAnswerTrains.get(0));
+                    appletQuestion.setUserAppletAnswerTrain(appletAnswerTrains.size() > 0 ? appletAnswerTrains.get(0) : null);
                 }
             }