需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserVO.java

@@ -3,8 +3,10 @@ package com.gree.mall.manager.bean.listvo;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.ExamineWorkerStatusEnum;
+import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.UserTypeEnum;
 import com.gree.mall.manager.plus.entity.User;
+import com.gree.mall.manager.plus.entity.WebsitUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +16,7 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 @ApiModel
 @Data
-public class UserVO   {
+public class UserVO     {
 
     @ZfireField(hide = true, tbName = "b")
     private String id;
@@ -83,6 +85,10 @@ public class UserVO   {
     @ApiModelProperty("银行卡")
     private String bankAccount;
 
+    @ZfireField(tbName = "b")
+    @ApiModelProperty("审批时间")
+    private IsYesNoEnum isOverdue;
+
 //    @ApiModelProperty("是否允许二手商城发布")
 //    private IsEnum isEs;
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -845,6 +845,11 @@ public class AgreementLogic {
             WebsitUser websitUser1 = new WebsitUser();
             websitUser1.setId(websitUser.getId());
             websitUser1.setOverdueRemark(remark);
+            if (!StringUtil.isEmpty(remark)){
+                websitUser1.setIsOverdue(IsYesNoEnum.YES.getKey());
+            }else {
+                websitUser1.setIsOverdue(IsYesNoEnum.NO.getKey());
+            }
             websitUser1.updateById();
 
         }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -854,7 +854,9 @@ public class WorkerManagerLogic {
         workerUserCount.setBxsp(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.POLICY_WAIT.getKey())).count());
         workerUserCount.setZtzc(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.OK.getKey())).count());
         workerUserCount.setYbh(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.FAIL.getKey())).count());
-        workerUserCount.setZjkgq(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.EXPIRED.getKey())).count());
+
+        workerUserCount.setZjkgq(websitUsers.stream().filter(item -> item.getIsOverdue().equals(IsYesNoEnum.YES.getKey())).count());
+
         workerUserCount.setZjygq(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.OVERDUE.getKey())).count());
         workerUserCount.setYzt(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.STOP.getKey())).count());
         workerUserCount.setYlz(websitUsers.stream().filter(item -> item.getExamineStatus().equals(ExamineWorkerStatusEnum.QUIT.getKey())).count());