更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/orgFace/OrgUserFaceSimpleModel.java

@@ -0,0 +1,96 @@
+package com.zhongshu.card.client.model.projectAbout.orgFace;
+
+import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.model.org.UserCountSimpleModel;
+import com.zhongshu.card.client.model.org.orgUser.OrganizationUserSimpleModel;
+import com.zhongshu.card.client.type.Sex;
+import com.zhongshu.card.client.type.common.AuditState;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+
+/**
+ * @author TRX
+ * @date 2024/10/12
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrgUserFaceSimpleModel extends SuperModel {
+
+    @Schema(description = "审核状态")
+    private AuditState auditState;
+
+    private String auditStateStr;
+
+    public String getAuditStateStr() {
+        if (auditState != null) {
+            return auditState.getRemark();
+        }
+        return "";
+    }
+
+    public String passRate;
+
+    public String getPassRate() {
+        if (auditState == AuditState.Audited) {
+            return "合格";
+        }
+        return "";
+    }
+
+    //-----------------用户信息 start -----------------
+    @Schema(description = "用户ID")
+    private String userId;
+
+    @Schema(description = "用户名称")
+    private String userName;
+
+    @Schema(description = "用户电话")
+    private String phone;
+
+    @Schema(description = "性别")
+    private Sex sex;
+
+    private String sexStr;
+
+    public String getSexStr() {
+        if (sex != null) {
+            return sex.getRemark();
+        }
+        return "";
+    }
+
+    @Schema(description = "人员编码")
+    private String code;
+
+    @Schema(description = "用户信息")
+    private UserCountSimpleModel userAccount;
+
+    @Schema(description = "图片名称")
+    private String name;
+
+    @Schema(description = "人脸图片地址")
+    private String img;
+
+    @Schema(description = "是否可使用")
+    private Boolean isCanUsed;
+
+    //------------------------审核信息 start ---------------
+
+    @Schema(description = "审核用户userId")
+    private String auditUserId;
+
+    private String auditUserName;
+
+    @Schema(description = "审核备注")
+    private String auditRemark;
+
+    @Schema(description = "审核时间")
+    private Long auditTime;
+
+    @Schema(description = "权限中心的人脸id")
+    private String updateFaceFileId;
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/projectAbout/OrgUserFaceController.java

@@ -117,7 +117,7 @@ public class OrgUserFaceController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到指定用户人脸信息列表(已审核通过的)", description = "得到指定用户人脸信息列表")
     @RequestMapping(value = "getUserAllFacePass", method = {RequestMethod.POST})
-    public ResultContent<List<OrgUserFaceModel>> getUserAllFacePass(@RequestBody @Valid UserIdAndOidModel param) {
+    public ResultContent getUserAllFacePass(@RequestBody @Valid UserIdAndOidModel param) {
         return orgUserFaceService.getUserAllFacePass(param.getUserId(), param.getProjectOid());
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/OrgUserFace.java

@@ -100,5 +100,4 @@ public class OrgUserFace extends SuperMain {
     @Schema(description = "权限中心的人脸id")
     private String updateFaceFileId;
 
-
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/OrgUserFaceService.java

@@ -416,12 +416,12 @@ public class OrgUserFaceService extends SuperService {
         return ResultContent.buildSuccess(models);
     }
 
-    public ResultContent<List<OrgUserFaceModel>> getUserAllFacePass(String userId, String projectOid) {
+    public ResultContent<List<OrgUserFaceSimpleModel>> getUserAllFacePass(String userId, String projectOid) {
         List<OrgUserFace> list = orgUserFaceDao.findByProjectOidAndUserIdInAndAuditState(
                 projectOid, List.of(userId), AuditState.Audited);
-        List<OrgUserFaceModel> models = new ArrayList<>();
+        List<OrgUserFaceSimpleModel> models = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(list)) {
-            models = list.stream().map(this::toModel).collect(Collectors.toList());
+            models = list.stream().map(this::toSimpleModel).collect(Collectors.toList());
         }
         return ResultContent.buildSuccess(models);
     }
@@ -551,4 +551,14 @@ public class OrgUserFaceService extends SuperService {
         return model;
     }
 
+    public OrgUserFaceSimpleModel toSimpleModel(OrgUserFace entity) {
+        OrgUserFaceSimpleModel model = null;
+        if (ObjectUtils.isNotEmpty(entity)) {
+            model = new OrgUserFaceSimpleModel();
+            BeanUtils.copyProperties(entity, model);
+            model.setUserAccount(userAccountService.toSimpleDesenModel(entity.getUserAccount()));
+        }
+        return model;
+    }
+
 }