From 541822c0a7cdee300f6f3db2f4789cfd3392a02e Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 10 Jul 2025 10:24:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E6=B4=BB=E5=8A=A8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7xiuga?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expert/controller/ExpertController.java   | 12 ++++++++++
 .../app/expert/service/ExpertService.java     | 23 +++++++++++--------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertController.java
index eb2f679..683ca6a 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertController.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertController.java
@@ -23,6 +23,7 @@ import net.lab1024.sa.admin.module.business.area.service.AreaService;
 import net.lab1024.sa.admin.module.business.bankcard.domain.form.CaseplatformBankAddForm;
 import net.lab1024.sa.admin.module.business.bankcard.service.CaseplatformBankService;
 import net.lab1024.sa.admin.module.business.captcha.service.CaptchaService;
+import net.lab1024.sa.admin.module.business.caseplatformcase.domain.entity.CaseplatformAcAppEntity;
 import net.lab1024.sa.admin.module.system.login.service.LoginService;
 import net.lab1024.sa.common.common.annoation.NoNeedLogin;
 import net.lab1024.sa.common.common.constant.RequestHeaderConst;
@@ -651,4 +652,15 @@ public class ExpertController {
 
         return expertService.addCaseplatformAcApp(expertId);
     }
+
+    @ApiOperation("专家活动申请查询")
+    @GetMapping("/caseplatformCase/activity")
+    public ResponseDTO<CaseplatformAcAppEntity> getCaseplatformAcApp() {
+        Long expertId = SmartRequestUtil.getRequestUserId();
+        if (expertId == null) {
+            return ResponseDTO.error(LOGIN_STATE_INVALID);
+        }
+
+        return expertService.getCaseplatformAcApp(expertId);
+    }
 }
diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertService.java
index 5e5ff06..ebd0a7e 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertService.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertService.java
@@ -98,13 +98,7 @@ public class ExpertService {
         queryWrapper.eq(CaseplatformAcAppEntity::getExpertId,expertId);
         CaseplatformAcAppEntity caseplatformAcApp = caseplatformAcAppDao.selectOne(queryWrapper);
         if (caseplatformAcApp != null) {
-            if (caseplatformAcApp.getStatus() == 1){
-                return ResponseDTO.app_ok("恭喜您，您的病例交流活动申请已通过审核");
-            }
-
-            if (caseplatformAcApp.getStatus() == 2){
-                return ResponseDTO.app_ok("您的病例交流活动申请正在审核中");
-            }
+            return ResponseDTO.app_ok();
         }
 
         LambdaQueryWrapper<MedicalRecordEntity> caseCountQueryWrapper = new LambdaQueryWrapper<>();
@@ -112,7 +106,7 @@ public class ExpertService {
         caseCountQueryWrapper.eq(MedicalRecordEntity::getStatus, 1);
         Long caseCount = medicalRecorDao.selectCount(caseCountQueryWrapper);
         if (caseCount < 2){
-            return ResponseDTO.app_ok("病例审核通过2份及以上可申请病例交流活动");
+            return ResponseDTO.userErrorParam("病例审核通过2份及以上可申请病例交流活动");
         }
 
         CaseplatformAcAppEntity caseplatformAcAppData = new CaseplatformAcAppEntity();
@@ -121,6 +115,17 @@ public class ExpertService {
         caseplatformAcAppData.setCreateTime(LocalDateTime.now());
         caseplatformAcAppDao.insert(caseplatformAcAppData);
 
-        return ResponseDTO.app_ok("您已成功申请，请耐心等待审核");
+        return ResponseDTO.app_ok();
+    }
+
+    /**
+     * 专家活动申请-查询
+     */
+    public ResponseDTO<CaseplatformAcAppEntity> getCaseplatformAcApp(Long expertId) {
+        LambdaQueryWrapper<CaseplatformAcAppEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CaseplatformAcAppEntity::getExpertId,expertId);
+        CaseplatformAcAppEntity caseplatformAcApp = caseplatformAcAppDao.selectOne(queryWrapper);
+
+        return ResponseDTO.app_ok(caseplatformAcApp);
     }
 }