TRX 1 anno fa
parent
commit
40f27c9b03

+ 51 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/base/OutNumberModel.java

@@ -0,0 +1,51 @@
+package com.zhongshu.card.client.model.base;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author TRX
+ * @date 2025/3/3
+ */
+@Data
+public class OutNumberModel {
+
+    @Schema(description = "成功数量")
+    private Long success = 0L;
+
+    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++;
+    }
+
+    @Schema(description = "失败数量")
+    private Long fail = 0L;
+
+    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));
+    }
+
+    @Data
+    @Builder
+    public static class OutMessage {
+        String key;
+        String msg;
+    }
+}

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

@@ -7,6 +7,7 @@ import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.google.common.collect.Lists;
+import com.zhongshu.card.client.model.base.OutNumberModel;
 import com.zhongshu.card.client.model.projectAbout.orgFace.*;
 import com.zhongshu.card.client.model.projectAbout.projectCommon.ProjectCommonConfigModel;
 import com.zhongshu.card.client.type.common.AuditState;
@@ -225,6 +226,12 @@ public class OrgUserFaceService extends SuperService {
         return ResultContent.buildSuccess(toModel(orgUserFace));
     }
 
+    /**
+     * 审核批量
+     *
+     * @param param
+     * @return
+     */
     public ResultContent auditsFace(OrgUserFaceAuditsParam param) {
         List<String> ids = param.getIds();
         if (ObjectUtils.isEmpty(ids)) {
@@ -235,14 +242,20 @@ public class OrgUserFaceService extends SuperService {
         if (auditState == null) {
             return ResultContent.buildFail("审核状态不能为空");
         }
+        OutNumberModel numberModel = new OutNumberModel();
         for (String id : ids) {
             OrgUserFaceAuditParam param1 = new OrgUserFaceAuditParam();
             param1.setId(id);
             param1.setAuditRemark(auditRemark);
             param1.setAuditState(auditState);
-            auditFace(param1);
+            ResultContent _temp = auditFace(param1);
+            if (_temp.isSuccess()) {
+                numberModel.addSuccess(id, "成功");
+            } else {
+                numberModel.addFail(id, _temp.getMsg());
+            }
         }
-        return ResultContent.buildSuccess();
+        return ResultContent.buildSuccess(numberModel);
     }
 
     /**