From ab9808731dc189a4704395d5f29afc61dac452ec Mon Sep 17 00:00:00 2001
From: wang <wzh@>
Date: Wed, 18 Mar 2026 20:40:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ServiceApplicationsController.java        |  7 +++++
 .../form/ServiceApplicationsUpdateForm.java   |  1 +
 .../service/ServiceApplicationsService.java   | 28 +++++++++++++++++++
 .../domain/form/EmployeeUpdateCenterForm.java |  2 ++
 4 files changed, 38 insertions(+)

diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.java
index 3208c92..56cd95a 100644
--- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.java
+++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.java
@@ -81,6 +81,13 @@ public class ServiceApplicationsController {
     public ResponseDTO<String> review(@RequestBody @Valid ServiceApplicationsUpdateForm updateForm) {
         return serviceApplicationsService.review(updateForm);
     }
+
+    @Operation(summary = "驳回 @author wzh")
+    @PostMapping("/serviceApplications/noreview")
+    //@SaCheckPermission("serviceApplications:review")
+    public ResponseDTO<String> noreview(@RequestBody @Valid ServiceApplicationsUpdateForm updateForm) {
+        return serviceApplicationsService.noreview(updateForm);
+    }
     //批量审核
     @Operation(summary = "批量审核 @author wzh")
     @PostMapping("/serviceApplications/batchReview")
diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java
index 2e0e043..2744eee 100644
--- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java
+++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java
@@ -75,6 +75,7 @@ public class ServiceApplicationsUpdateForm{
     private Long associationAuditUser;
     @Schema(description = "协会审核意见")
     private String associationAuditOpinion;
+    private String firmAuditOpinion;
     private Integer auditResult;
     /**
      * 职务id
diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java
index efadd62..c18bdb9 100644
--- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java
+++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java
@@ -1334,6 +1334,34 @@ public class ServiceApplicationsService {
         return serviceApplicationsDao.queryNoReview(departmentId);
     }
 
+    public ResponseDTO<String> noreview(@Valid ServiceApplicationsUpdateForm updateForm) {
+        RequestEmployee requestUser = AdminRequestUtil.getRequestUser();
+
+        List<RoleVO> roles = roleEmployeeService.getRoleIdList(requestUser.getEmployeeId());
+        if (roles.isEmpty()) {
+            return ResponseDTO.error(UserErrorCode.NO_PERMISSION);
+        }
+        String roleCode = roles.get(0).getRoleCode();
+        ServiceApplicationsEntity serviceApplicationsEntity = serviceApplicationsDao.selectById(updateForm.getApplicationId());
+        if (UserTypeEnum.CEO.getDesc().equals(roleCode)) {
+            // CEO角色：修改协会审核状态
+            serviceApplicationsEntity.setAssociationAuditStatus(updateForm.getAssociationAuditStatus());
+            serviceApplicationsEntity.setAssociationAuditUser(requestUser.getEmployeeId());
+            serviceApplicationsEntity.setAssociationAuditTime(LocalDateTime.now());
+            serviceApplicationsEntity.setAssociationAuditOpinion(updateForm.getAssociationAuditOpinion());
+        } else {
+            // 其他角色（如律所管理员）：修改律所审核状态
+            serviceApplicationsEntity.setFirmAuditStatus(updateForm.getFirmAuditStatus());
+            serviceApplicationsEntity.setFirmAuditUser(requestUser.getEmployeeId());
+            serviceApplicationsEntity.setFirmAuditTime(LocalDateTime.now());
+            serviceApplicationsEntity.setFirmAuditOpinion(updateForm.getFirmAuditOpinion());
+        }
+
+
+        serviceApplicationsDao.updateById(serviceApplicationsEntity);
+        return ResponseDTO.ok();
+    }
+
 
     /**
      * Excel下拉列表处理器
diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateCenterForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateCenterForm.java
index 8a1be15..4354272 100644
--- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateCenterForm.java
+++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateCenterForm.java
@@ -49,4 +49,6 @@ public class EmployeeUpdateCenterForm {
     @Schema(description = "备注")
     @Length(max = 200, message = "备注最多200字符")
     private String remark;
+
+    private String certificateNumber;
 }
\ No newline at end of file