Merge branch 'feat-oe' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeTenantController.java

@@ -306,7 +306,7 @@ public class OeTenantController {
      */
     @GetMapping("/page-terminal-for-dept")
     public R<IPage<OeTerminalVO>> pageTerminalForDept(Page<OeTerminalVO> page, String name, String code) {
-        int total = 20;
+        int total = 10;
         List<OeTerminalVO> list = new ArrayList<>();
         for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
             OeTerminalVO vo = new OeTerminalVO();
@@ -317,8 +317,8 @@ public class OeTenantController {
             vo.setServedCsoName("代理商123");
             vo.setServedDrugCompanyTenantId(23423L);
             vo.setServedDrugCompanyName("药企234");
-            vo.setDrugCompanyApprovalStatus("PASS");
-            vo.setDrugCompanyApprovalStatusName("审核通过");
+            vo.setDrugCompanyApprovalStatus(i/2==0 ? "REJECT" : "PASS");
+            vo.setDrugCompanyApprovalStatusName(i/2==0 ? "审核不通过" : "通过");
             vo.setCsoApprovalStatus("PASS");
             vo.setCsoApprovalStatusName("审核通过");
             list.add(vo);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/controller/OeUserController.java

@@ -1,12 +1,18 @@
 package com.qunzhixinxi.hnqz.admin.oe.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeUserRequest;
 import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeUserVO;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * oe用户管理控制器
  *
@@ -18,6 +24,30 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/oe/user")
 public class OeUserController {
 
-//    public R<IPage<OeUserVO>>
+    /**
+     * 分页查询
+     *
+     * @param page   分页参数
+     * @param toPage 查询参数
+     * @return {@link R}<{@link IPage}<{@link OeUserVO}>>
+     */
+    @GetMapping("/page")
+    public R<IPage<OeUserVO>> pageUser(Page<OeUserVO> page, OeUserRequest.ToPage toPage) {
+        int total = 20;
+        List<OeUserVO> list = new ArrayList<>();
+        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
+            OeUserVO vo = new OeUserVO();
+            vo.setUserId((long) i);
+            vo.setUsername("user"+i);
+        // TODO
+            list.add(vo);
+        }
+
+        page.setRecords(list);
+        page.setTotal(total);
+        page.setPages((total + page.getSize() - 1) / page.getSize());
+
+        return R.ok(page);
+    }
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/dto/OeTenantRequest.java

@@ -122,7 +122,7 @@ public class OeTenantRequest {
         private String name;
 
         /**
-         * 统一社会信用代码
+         * 统一社会信用代码/身份证号
          */
         private String code;
 
@@ -146,6 +146,16 @@ public class OeTenantRequest {
          */
         private String[] socialSecurityUrl;
 
+        /**
+         * 身份证正面url
+         */
+        private String idCardFrontUrl;
+
+        /**
+         * 身份证反面url
+         */
+        private String idCardBackUrl;
+
         /**
          * 锁定标记(OK-正常,LOC-已锁定)
          */
@@ -173,7 +183,7 @@ public class OeTenantRequest {
         private String name;
 
         /**
-         * 统一社会信用代码
+         * 统一社会信用代码/身份证号
          */
         private String code;
 
@@ -197,6 +207,16 @@ public class OeTenantRequest {
          */
         private String[] socialSecurityUrl;
 
+        /**
+         * 身份证正面url
+         */
+        private String idCardFrontUrl;
+
+        /**
+         * 身份证反面url
+         */
+        private String idCardBackUrl;
+
         /**
          * 锁定标记(OK-正常,LOC-已锁定)
          */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/dto/OeUserRequest.java

@@ -0,0 +1,45 @@
+package com.qunzhixinxi.hnqz.admin.oe.entity.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+public class OeUserRequest {
+
+    /**
+     * 分页参数
+     *
+     * @author lixuesong
+     * @date 2023/08/08
+     */
+    @Data
+    public static class ToPage implements Serializable {
+
+        private static final long serialVersionUID = -3670005114779918409L;
+
+        /**
+         * 承接方
+         */
+        private String realName;
+
+        /**
+         * 派工方
+         */
+        private String tenantName;
+
+        /**
+         * 手机号
+         */
+        private String phone;
+
+        /**
+         * 角色id
+         */
+        private Long roleId;
+
+        /**
+         * 启用状态
+         */
+        private String lockFlag;
+    }
+}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeTerminalVO.java

@@ -51,7 +51,7 @@ public class OeTerminalVO implements Serializable {
     private String servedCsoName;
 
     /**
-     * 药企审核状态
+     * 药企审核状态(PASS-通过,REJECT-拒绝,PENDING-未审核)
      */
     private String drugCompanyApprovalStatus;
 
@@ -61,7 +61,7 @@ public class OeTerminalVO implements Serializable {
     private String drugCompanyApprovalStatusName;
 
     /**
-     * 代理商审核状态
+     * 代理商审核状态(PASS-通过,REJECT-拒绝,PENDING-未审核)
      */
     private String csoApprovalStatus;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/entity/vo/OeUserVO.java

@@ -1,8 +1,11 @@
 package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
 
+import com.bribric.lettuce.sdk.constant.enums.flag.CommonFlag;
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * oe用户VO
@@ -14,5 +17,78 @@ import java.io.Serializable;
 public class OeUserVO implements Serializable {
     private static final long serialVersionUID = 1389173392702921120L;
 
+    /**
+     * 主键ID
+     */
+    private Long userId;
 
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 租户ID
+     */
+    private Long tenantId;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 删除标记(OK-正常,DEL-已删除)
+     */
+    private CommonFlag.DelFlag delFlag;
+
+    /**
+     * 锁定标记(OK-正常,LOC-已锁定)
+     */
+    private CommonFlag.LockFlag lockFlag;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 修改人
+     */
+    private String modifiedBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime modifiedTime;
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/OeUserService.java

@@ -0,0 +1,25 @@
+package com.qunzhixinxi.hnqz.admin.oe.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeUserRequest;
+import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeUserVO;
+import com.qunzhixinxi.hnqz.common.core.util.R;
+
+/**
+ * oe用户服务
+ *
+ * @author lixuesong
+ * @date 2023/08/08
+ */
+public interface OeUserService {
+
+    /**
+     * 分页查询
+     *
+     * @param page   分页参数
+     * @param toPage 查询参数
+     * @return {@link IPage}<{@link OeUserVO}>
+     */
+    IPage<OeUserVO> pageUser(Page<OeUserVO> page, OeUserRequest.ToPage toPage);
+}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/oe/service/impl/OeUserServiceImpl.java

@@ -0,0 +1,40 @@
+package com.qunzhixinxi.hnqz.admin.oe.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeUserRequest;
+import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeUserVO;
+import com.qunzhixinxi.hnqz.admin.oe.service.OeUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * oe用户服务
+ *
+ * @author lixuesong
+ * @date 2023/08/08
+ */
+@Slf4j
+@Service
+public class OeUserServiceImpl implements OeUserService {
+
+//    private UserService userService;
+//
+//    @PostConstruct
+//    public void init() {
+//        YaoyicloudConfig config = new YaoyicloudConfig.Builder().secretId("admin").secretKey("123456").terminalType(TerminalType.YYC_CSO).build();
+//        userService = new UserService.Builder().hostName(HostName.PROD).config(config).build();
+//    }
+
+    /**
+     * 分页查询
+     *
+     * @param page   分页参数
+     * @param toPage 查询参数
+     * @return {@link IPage}<{@link OeUserVO}>
+     */
+    @Override
+    public IPage<OeUserVO> pageUser(Page<OeUserVO> page, OeUserRequest.ToPage toPage) {
+        return null;
+    }
+}