待办相关功能的提交

commons/src/main/java/com/jzg/commons/entity/dto/SysUserInfoParam.java

@@ -0,0 +1,17 @@
+package com.jzg.commons.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "平台用户dto")
+@Data
+public class SysUserInfoParam {
+
+    // 归属机构id
+    @Schema(description = "归属机构id")
+    private String deptId;
+
+    // 类型
+    @Schema(description = "用户类型")
+    private String typeAttr;
+}

tenant/organization/src/main/java/com/jzg/organization/controller/UserController.java

@@ -3,6 +3,7 @@ package com.jzg.organization.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysUserInfoParam;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.request.RequestSingleParam;
 import com.jzg.organization.service.SysDeptService;
@@ -34,6 +35,12 @@ public class UserController extends BaseController {
         return HttpResult.ok(sysUserService.getUserInfoList(page,sysUserInfoListVo));
     }
 
+    @Operation(summary = "获取待办数量接口", description = "获取待办数量接口")
+    @PostMapping(value = "/getAuditCount")
+    public HttpResult getAuditCount(@RequestBody SysUserInfoParam sysUserInfoParam) {
+        return HttpResult.ok(sysUserService.getAuditCount(sysUserInfoParam));
+    }
+
     @Operation(summary = "获取人员列表接口", description = "获取人员列表接口")
     @PostMapping(value = "/getUser")
     public HttpResult getUser(@RequestBody SysUserInfoListVo sysUserInfoListVo) {

tenant/organization/src/main/java/com/jzg/organization/service/SysUserService.java

@@ -1,14 +1,12 @@
 package com.jzg.organization.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysUserInfoParam;
 import com.jzg.commons.entity.dto.SysUserJzgInfoDto;
 import com.jzg.commons.entity.po.SysUser;
-import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.vo.*;
-import com.jzg.commons.request.RequestSingleParam;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -101,8 +99,14 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 业务员审核失败
-     * @param userInfoId
+     * @param auditSalesmanVo
      * @return
      */
     boolean salesmanAuthFailed(AuditSalesmanVo auditSalesmanVo);
+
+    /**
+     * @param sysUserInfoParam
+     * @return
+     */
+    AuditCountVo getAuditCount(SysUserInfoParam sysUserInfoParam);
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoServiceImpl.java

@@ -25,7 +25,7 @@ public class SysUserJzgInfoServiceImpl extends ServiceImpl<SysUserJzgInfoMapper,
     @Override
     public SysUserJzgInfo getUserByUserId(String userId) {
         return baseMapper.selectOne(new LambdaQueryWrapper<SysUserJzgInfo>()
-                .eq(SysUserJzgInfo::getUserId, userId));
+                .eq(SysUserJzgInfo::getId, userId));
     }
 
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -3,26 +3,23 @@ package com.jzg.organization.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.core.base.BaseController;
-import com.jzg.commons.core.base.PageRequest;
 import com.jzg.commons.core.base.StateResult;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysUserInfoParam;
 import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.dto.SysUserJzgInfoDto;
 import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.MinioUtils;
-import com.jzg.commons.util.PasswordUtils;
+import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserJzgInfoMapper;
 import com.jzg.organization.mapper.SysUserMapper;
 import com.jzg.organization.service.*;
-import com.jzg.organization.service.*;
 import com.jzg.organization.state.UserState;
 import com.jzg.organization.state.listener.UserStateListener;
-import io.micrometer.core.instrument.Meter;
 import jakarta.annotation.Resource;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,8 +32,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static com.jzg.commons.constants.Constants.DEFAULT_PASSWORD;
-
 /**
  * @author Administrator
  * @description 针对表【sys_area(省市县代码)】的数据库操作Service实现
@@ -212,6 +207,25 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return stateResult.isResult();
     }
 
+    @Override
+    public AuditCountVo getAuditCount(SysUserInfoParam sysUserInfoParam) {
+        AuditCountVo auditCountVo = new AuditCountVo();
+        LambdaQueryWrapper<SysUserJzgInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(sysUserInfoParam.getTypeAttr()), SysUserJzgInfo::getTypeAttr, sysUserInfoParam.getTypeAttr())
+                .eq(StringUtils.isNotEmpty(sysUserInfoParam.getDeptId()),SysUserJzgInfo::getDeptId, sysUserInfoParam.getDeptId())
+                .eq(SysUserJzgInfo::getIsDelete,0)
+                .eq(SysUserJzgInfo::getIsEnable,0)
+        ;
+
+        queryWrapper.eq(SysUserJzgInfo::getStatus,4); // 未审核
+        Long noCount = sysUserJzgInfoService.count(queryWrapper);
+        queryWrapper.eq(SysUserJzgInfo::getStatus,6); // 审核失败
+        Long failCount = sysUserJzgInfoService.count(queryWrapper);
+        auditCountVo.setNoAuditCount(noCount);
+        auditCountVo.setFailAuditCount(failCount);
+        return auditCountVo;
+    }
+
 
     @Override
     public boolean realNameAuthFailed(String userId){

tenant/organization/src/main/java/com/jzg/organization/state/UserState.java

@@ -51,11 +51,7 @@ public class UserState {
         EMPLOYEE, // 入职
         RESIGN_ING, // 待离职
         RESIGN_FAILED, // 离职失败事件
-        RESIGN, // 离职
-        SALESMAN_AUTH_SUCCESS, //业务员审核成功事件
-        SALESMAN_AUTH_FAILED, // 业务员审核失败事件
-        SALESMAN_AUTH_ING // 业务员审核中
-
+        RESIGN // 离职
     }
 
 

tenant/organization/src/main/java/com/jzg/organization/state/config/UserStateConfig.java

@@ -68,18 +68,6 @@ public class UserStateConfig extends StateMachineConfigurerAdapter<UserState.Use
                 .withExternal()
                 //已入职 -> 离职中
                 .source(UserState.UserStateEnum.ALREADY_EMPLOYEE).target(UserState.UserStateEnum.RESIGN_ING).event(UserState.UserStateEvent.RESIGN_ING)
-                .and()
-                .withExternal()
-                //业务员审核成功 -> 已入职
-                .source(UserState.UserStateEnum.NOT_CERT).target(UserState.UserStateEnum.ALREADY_EMPLOYEE).event(UserState.UserStateEvent.SALESMAN_AUTH_SUCCESS)
-                .and()
-                .withExternal()
-                //业务员审核失败 -> 业务员入司审核失败
-                .source(UserState.UserStateEnum.NOT_CERT).target(UserState.UserStateEnum.COMPANY_REVIEW_FAILED).event(UserState.UserStateEvent.SALESMAN_AUTH_FAILED)
-                .and()
-                .withExternal()
-                //业务员入司审核失败 -> 业务员审核中
-                .source(UserState.UserStateEnum.COMPANY_REVIEW_FAILED).target(UserState.UserStateEnum.COMPANY_REVIEW_ING).event(UserState.UserStateEvent.SALESMAN_AUTH_ING)
         ;
     }
 }

tenant/organization/src/main/java/com/jzg/organization/state/listener/UserStateListener.java

@@ -105,7 +105,7 @@ public class UserStateListener {
      * @return
      */
     public StateResult salesmanAuthSuccess(SysUserJzgInfo sysUserJzgInfo){
-        StateResult stateResult = callEvent(sysUserJzgInfo, UserState.UserStateEvent.SALESMAN_AUTH_SUCCESS);
+        StateResult stateResult = callEvent(sysUserJzgInfo, UserState.UserStateEvent.COMPANY_REVIEW_SUCCESS);
         return stateResult;
     }
 
@@ -116,12 +116,12 @@ public class UserStateListener {
      * @return
      */
     public StateResult salesmanAuthFailed(SysUserJzgInfo sysUserJzgInfo){
-        StateResult stateResult = callEvent(sysUserJzgInfo, UserState.UserStateEvent.SALESMAN_AUTH_FAILED);
+        StateResult stateResult = callEvent(sysUserJzgInfo, UserState.UserStateEvent.COMPANY_REVIEW_FAILED);
         return stateResult;
     }
 
     public StateResult salesmanAuthIng(SysUserJzgInfo sysUserJzgInfo){
-        StateResult stateResult = callEvent(sysUserJzgInfo, UserState.UserStateEvent.SALESMAN_AUTH_ING);
+        StateResult stateResult = callEvent(sysUserJzgInfo, UserState.UserStateEvent.COMPANY_REVIEW);
         return stateResult;
     }
 }