Merge branch 'feat-oe' into temp-pre

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

@@ -0,0 +1,108 @@
+package com.qunzhixinxi.hnqz.admin.oe.controller;
+
+import cn.hutool.core.map.MapUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.beust.jcommander.internal.Maps;
+import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeTeamRequest;
+import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeTenantRequest;
+import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeTeamVO;
+import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeTenantVO;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * oe团队管理控制器
+ *
+ * @author lixuesong
+ * @date 2023/08/08
+ */
+@Slf4j
+@RestController
+@RequestMapping("/oe/team")
+public class OeTeamController {
+
+    /**
+     * 分页查询团队
+     *
+     * @param page 分页参数
+     * @return {@link R}<{@link IPage}<{@link OeTeamVO}>>
+     */
+    @GetMapping("/page")
+    public R<IPage<OeTeamVO>> pageTeam(Page<OeTeamVO> page) {
+        int total = 20;
+        List<OeTeamVO> list = new ArrayList<>();
+        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
+            OeTeamVO vo = new OeTeamVO();
+            vo.setId((long) i);
+            vo.setName("测试团队"+i);
+            vo.setLeaderName(new String[]{"负责人1", "负责人2"});
+            vo.setLeader(new Long[]{1L, 2L});
+            vo.setMemberName(new String[]{"成员1", "成员2"});
+            vo.setMember(new Long[]{1L, 2L});
+            list.add(vo);
+        }
+
+        page.setRecords(list);
+        page.setTotal(total);
+        page.setPages((total + page.getSize() - 1) / page.getSize());
+
+        return R.ok(page);
+    }
+
+    /**
+     * 查询团队列表
+     *
+     * @return {@link R}<{@link List}<{@link OeTeamVO}>>
+     */
+    @GetMapping("/list")
+    public R<List<Map<String, Object>>> listTeam() {
+        int total = 5;
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (int i = 0; i < total; i++) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("name", "测试团队"+i);
+            map.put("id", (long) i);
+            list.add(map);
+        }
+
+        return R.ok(list);
+    }
+
+    /**
+     * 保存团队
+     *
+     * @param toSave 保存参数
+     * @return {@link R}<{@link Boolean}>
+     */
+    @PostMapping("/save")
+    public R<Boolean> saveTeam(@RequestBody OeTeamRequest.ToSave toSave) {
+        log.info("oe保存团队参数：{}", toSave);
+
+        return R.ok(Boolean.TRUE);
+    }
+
+    /**
+     * 更新团队
+     *
+     * @param toUpdate 更新
+     * @return {@link R}<{@link Boolean}>
+     */
+    @PostMapping("/update")
+    public R<Boolean> updateTeam(@RequestBody OeTeamRequest.ToUpdate toUpdate) {
+        log.info("更新团队参数：{}", toUpdate);
+
+        return R.ok(Boolean.TRUE);
+    }
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeTenantVO;
 import com.qunzhixinxi.hnqz.admin.oe.entity.dto.OeTenantRequest;
+import com.qunzhixinxi.hnqz.admin.oe.entity.vo.OeTerminalVO;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import lombok.extern.slf4j.Slf4j;
@@ -149,6 +150,10 @@ public class OeTenantController {
             oeTenantVO.setDelFlagName("启用");
             oeTenantVO.setCreatedTime(LocalDateTime.now());
             oeTenantVO.setModifiedTime(LocalDateTime.now());
+            oeTenantVO.setDelFlag("OK");
+            oeTenantVO.setDelFlagName("正常");
+            oeTenantVO.setLocFlag("OK");
+            oeTenantVO.setLocFlagName("正常");
             list.add(oeTenantVO);
         }
 
@@ -201,6 +206,10 @@ public class OeTenantController {
             oeTenantVO.setDelFlagName("启用");
             oeTenantVO.setCreatedTime(LocalDateTime.now());
             oeTenantVO.setModifiedTime(LocalDateTime.now());
+            oeTenantVO.setDelFlag("OK");
+            oeTenantVO.setDelFlagName("正常");
+            oeTenantVO.setLocFlag("OK");
+            oeTenantVO.setLocFlagName("正常");
             list.add(oeTenantVO);
         }
 
@@ -236,6 +245,10 @@ public class OeTenantController {
             oeTenantVO.setDelFlagName("启用");
             oeTenantVO.setCreatedTime(LocalDateTime.now());
             oeTenantVO.setModifiedTime(LocalDateTime.now());
+            oeTenantVO.setDelFlag("OK");
+            oeTenantVO.setDelFlagName("正常");
+            oeTenantVO.setLocFlag("OK");
+            oeTenantVO.setLocFlagName("正常");
             list.add(oeTenantVO);
         }
 
@@ -247,7 +260,7 @@ public class OeTenantController {
     }
 
     /**
-     * 终端分页查询
+     * 终端分页查询(平台)
      *
      * @param page 分页参数
      * @param name 药企名称
@@ -269,6 +282,10 @@ public class OeTenantController {
             oeTenantVO.setDelFlagName("启用");
             oeTenantVO.setCreatedTime(LocalDateTime.now());
             oeTenantVO.setModifiedTime(LocalDateTime.now());
+            oeTenantVO.setDelFlag("OK");
+            oeTenantVO.setDelFlagName("正常");
+            oeTenantVO.setLocFlag("OK");
+            oeTenantVO.setLocFlagName("正常");
             list.add(oeTenantVO);
         }
 
@@ -278,4 +295,39 @@ public class OeTenantController {
 
         return R.ok(page);
     }
+
+    /**
+     * 终端分页查询(药企)
+     *
+     * @param page 分页参数
+     * @param name 药企名称
+     * @param code 统一社会信用代码
+     * @return 分页结果
+     */
+    @GetMapping("/page-terminal-for-dept")
+    public R<IPage<OeTerminalVO>> pageTerminalForDept(Page<OeTerminalVO> page, String name, String code) {
+        int total = 20;
+        List<OeTerminalVO> list = new ArrayList<>();
+        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
+            OeTerminalVO vo = new OeTerminalVO();
+            vo.setName(name);
+            vo.setCode("123456789123456");
+            vo.setTenantId((long) i);
+            vo.setServedCsoTenantId(12312L);
+            vo.setServedCsoName("代理商123");
+            vo.setServedDrugCompanyTenantId(23423L);
+            vo.setServedDrugCompanyName("药企234");
+            vo.setDrugCompanyApprovalStatus("PASS");
+            vo.setDrugCompanyApprovalStatusName("审核通过");
+            vo.setCsoApprovalStatus("PASS");
+            vo.setCsoApprovalStatusName("审核通过");
+            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/OeTeamRequest.java

@@ -0,0 +1,73 @@
+package com.qunzhixinxi.hnqz.admin.oe.entity.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * oe团队请求
+ *
+ * @author lixuesong
+ * @date 2023/08/08
+ */
+public class OeTeamRequest {
+
+    /**
+     * 保存团队参数
+     *
+     * @author lixuesong
+     * @date 2023/08/08
+     */
+    @Data
+    public static class ToSave implements Serializable {
+
+        private static final long serialVersionUID = 8449495175671168735L;
+
+        /**
+         * 团队名称
+         */
+        private String name;
+
+        /**
+         * 团队负责人
+         */
+        private Long[] leader;
+
+        /**
+         * 团队成员
+         */
+        private Long[] member;
+    }
+
+    /**
+     * 更新团队参数
+     *
+     * @author lixuesong
+     * @date 2023/08/08
+     */
+    @Data
+    public static class ToUpdate implements Serializable {
+
+        private static final long serialVersionUID = 6010813670149051628L;
+
+        /**
+         * 主键id
+         */
+        private Long id;
+
+        /**
+         * 团队名称
+         */
+        private String name;
+
+        /**
+         * 团队负责人
+         */
+        private Long[] leader;
+
+        /**
+         * 团队成员
+         */
+        private Long[] member;
+    }
+}

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

@@ -0,0 +1,47 @@
+package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * oe团队管理VO
+ *
+ * @author lixuesong
+ * @date 2023/08/08
+ */
+@Data
+public class OeTeamVO implements Serializable {
+
+    private static final long serialVersionUID = -8166723468956394406L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 团队名称
+     */
+    private String name;
+
+    /**
+     * 团队负责人
+     */
+    private Long[] leader;
+
+    /**
+     * 团队负责人名称
+     */
+    private String[] leaderName;
+
+    /**
+     * 团队成员
+     */
+    private Long[] member;
+
+    /**
+     * 团队成员名称
+     */
+    private String[] memberName;
+}

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

@@ -0,0 +1,72 @@
+package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * oe终端VO
+ *
+ * @author lixuesong
+ * @date 2023/08/08
+ */
+@Data
+public class OeTerminalVO implements Serializable {
+
+    private static final long serialVersionUID = 7128806313743294064L;
+
+    /**
+     * 租户id
+     */
+    private Long tenantId;
+
+    /**
+     * 企业名称
+     */
+    private String name;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String code;
+
+    /**
+     * 服务药企tenantId
+     */
+    private Long servedDrugCompanyTenantId;
+
+    /**
+     * 服务药企名称
+     */
+    private String servedDrugCompanyName;
+
+    /**
+     * 服务代理商tenantId
+     */
+    private Long servedCsoTenantId;
+
+    /**
+     * 服务代理商名称
+     */
+    private String servedCsoName;
+
+    /**
+     * 药企审核状态
+     */
+    private String drugCompanyApprovalStatus;
+
+    /**
+     * 药企审核状态名称
+     */
+    private String drugCompanyApprovalStatusName;
+
+    /**
+     * 代理商审核状态
+     */
+    private String csoApprovalStatus;
+
+    /**
+     * 代理商审核状态名称
+     */
+    private String csoApprovalStatusName;
+}