Ver Fonte

feat: oe查询终端(药企)

lixuesong há 1 ano atrás
pai
commit
7e15254820

+ 53 - 1
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);
+    }
 }

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

@@ -1,6 +1,19 @@
 package com.qunzhixinxi.hnqz.admin.oe.entity.vo;
 
-public class OeTerminalVO {
+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
@@ -8,12 +21,52 @@ public class OeTerminalVO {
     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;
 }