Ver Fonte

更新!

TRX há 1 ano atrás
pai
commit
b4089ca103

+ 19 - 6
FullCardClient/src/main/java/com/zhongshu/card/client/model/base/OutNumberModel.java

@@ -8,6 +8,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * 批量操作结果 返回 (成功多少,失败多少)
+ *
  * @author TRX
  * @date 2025/3/3
  */
@@ -17,26 +19,33 @@ public class OutNumberModel {
     @Schema(description = "成功数量")
     private Long success = 0L;
 
+    @Schema(description = "成功的数据")
+    private List<OutMessage> successList = new ArrayList<>();
+
     public void addSuccess() {
         this.success++;
     }
 
-    private List<OutMessage> successList = new ArrayList<>();
-
     public void addSuccess(String key, String msg) {
         this.successList.add(new OutMessage(key, msg));
         this.success++;
     }
 
+    public void addSuccess(String key) {
+        this.successList.add(new OutMessage(key, "成功"));
+        this.success++;
+    }
+
     @Schema(description = "失败数量")
     private Long fail = 0L;
 
+    @Schema(description = "失败的数据")
+    private List<OutMessage> failList = new ArrayList<>();
+
     public void addFail() {
         this.fail++;
     }
 
-    private List<OutMessage> failList = new ArrayList<>();
-
     public void addFail(String key, String msg) {
         this.fail++;
         this.failList.add(new OutMessage(key, msg));
@@ -45,7 +54,11 @@ public class OutNumberModel {
     @Data
     @Builder
     public static class OutMessage {
-        String key;
-        String msg;
+
+        @Schema(description = "相关数据")
+        private String key;
+
+        @Schema(description = "结果")
+        private String msg;
     }
 }

+ 2 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/orgFace/OrgUserFaceAuditsParam.java

@@ -2,6 +2,7 @@ package com.zhongshu.card.client.model.projectAbout.orgFace;
 
 import com.zhongshu.card.client.type.common.AuditState;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -19,6 +20,7 @@ public class OrgUserFaceAuditsParam {
     @Schema(description = "审核备注")
     private String auditRemark;
 
+    @NotNull
     @Schema(description = "审核状态")
     private AuditState auditState;
 }

+ 7 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/OrgUserFaceService.java

@@ -242,6 +242,11 @@ public class OrgUserFaceService extends SuperService {
         if (auditState == null) {
             return ResultContent.buildFail("审核状态不能为空");
         }
+        if (auditState == AuditState.Refuse && StringUtils.isEmpty(auditRemark)) {
+            return ResultContent.buildFail("原因不能为空");
+        }
+
+        // 操作结果
         OutNumberModel numberModel = new OutNumberModel();
         for (String id : ids) {
             OrgUserFaceAuditParam param1 = new OrgUserFaceAuditParam();
@@ -269,10 +274,11 @@ public class OrgUserFaceService extends SuperService {
         if (orgUserFace == null) {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getId()));
         }
-        if (param.getAuditState() != AuditState.WaitAudit) {
+        if (orgUserFace.getAuditState() != AuditState.WaitAudit) {
             return ResultContent.buildFail("数据已审核");
         }
         BeanUtils.copyProperties(param, orgUserFace, "id");
+
         if (orgUserFace.getAuditState() == AuditState.Audited) {
             // 通过
             ResultContent<String> content = syncFace(orgUserFace);