fix:个人信息更新修改

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

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

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下拉列表处理器

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