Merge branch 'feat-oe' into temp-pre

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

@@ -86,7 +86,7 @@ public class OeMedicineController {
     public R<IPage<OeMedicineVO>> pageMedicine(Page<OeMedicineVO> page, String name, String commonName, String productionEnterprise) {
         int total = 20;
         List<OeMedicineVO> list = new ArrayList<>();
-        for (int i = Math.toIntExact(page.getCurrent()); i < page.getSize(); i++) {
+        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
             OeMedicineVO vo = new OeMedicineVO();
             vo.setId((long) i);
             vo.setName("商品名"+i);

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

@@ -15,7 +15,9 @@ 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;
 
 /**
  * 租户管理
@@ -25,7 +27,6 @@ import java.util.List;
 @RequestMapping("/oe/tenant")
 public class OeTenantController {
 
-
     /**
      * 保存药企信息
      *
@@ -54,6 +55,20 @@ public class OeTenantController {
         return R.ok();
     }
 
+    /**
+     * 启用/停用药企/代理商/终端
+     *
+     * @param toLockUnlock 参数
+     * @return {@link R}<{@link ?}>
+     */
+    @SysLog("OE启用/停用药企/代理商/终端")
+    @PostMapping("/lock-unlock")
+    public R<?> updateLockUnlock(@RequestBody OeTenantRequest.ToLockUnlock toLockUnlock) {
+        log.info("OE启用/停用tenant参数:{}", toLockUnlock);
+        // TODO
+        return R.ok();
+    }
+
     /**
      * 保存代理商信息
      *
@@ -123,7 +138,7 @@ public class OeTenantController {
     public R<IPage<OeTenantVO>> pageDrugCompany(Page<OeTenantVO> page, String name, String code) {
         int total = 20;
         List<OeTenantVO> list = new ArrayList<>();
-        for (int i = Math.toIntExact(page.getCurrent()); i < page.getSize(); i++) {
+        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
             OeTenantVO oeTenantVO = new OeTenantVO();
             oeTenantVO.setTenantId((long) i);
             oeTenantVO.setCode("123456789123456");
@@ -144,6 +159,25 @@ public class OeTenantController {
         return R.ok(page);
     }
 
+    /**
+     * 药企查询
+     *
+     * @return {@link R}<{@link List}<{@link Map}<{@link String}, {@link String}>>>
+     */
+    @GetMapping("/list-drug-company")
+    public R<List<Map<String, Object>>> listDrugCompany() {
+        int total = 20;
+        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("tenantId", (long) i);
+            list.add(map);
+        }
+
+        return R.ok(list);
+    }
+
     /**
      * CSO分页查询
      *
@@ -156,7 +190,42 @@ public class OeTenantController {
     public R<IPage<OeTenantVO>> pageCso(Page<OeTenantVO> page, String name, String code) {
         int total = 20;
         List<OeTenantVO> list = new ArrayList<>();
-        for (int i = Math.toIntExact(page.getCurrent()); i < page.getSize(); i++) {
+        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
+            OeTenantVO oeTenantVO = new OeTenantVO();
+            oeTenantVO.setTenantId((long) i);
+            oeTenantVO.setCode("123456789123456");
+            oeTenantVO.setName("测试代理商" + (i));
+            oeTenantVO.setLevelName("CSO");
+            oeTenantVO.setPermissions(new String[]{"导出"});
+            oeTenantVO.setSettleChannels(new String[]{"中智","正启之星"});
+            oeTenantVO.setDelFlagName("启用");
+            oeTenantVO.setCreatedTime(LocalDateTime.now());
+            oeTenantVO.setModifiedTime(LocalDateTime.now());
+            list.add(oeTenantVO);
+        }
+
+        page.setRecords(list);
+        page.setTotal(total);
+        page.setPages((total + page.getSize() - 1) / page.getSize());
+
+        return R.ok(page);
+    }
+
+    /**
+     * CSO分页查询-用于药企
+     *
+     * @param page 分页参数
+     * @param name 药企名称
+     * @param code 统一社会信用代码
+     * @return 分页结果
+     */
+    @GetMapping("/page-cso-for-dept")
+    public R<IPage<OeTenantVO>> pageCsoForDept(Page<OeTenantVO> page, String name, String code, String drugCompanyName) {
+        // 企业的权限 TODO
+
+        int total = 10;
+        List<OeTenantVO> list = new ArrayList<>();
+        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
             OeTenantVO oeTenantVO = new OeTenantVO();
             oeTenantVO.setTenantId((long) i);
             oeTenantVO.setCode("123456789123456");
@@ -189,7 +258,7 @@ public class OeTenantController {
     public R<IPage<OeTenantVO>> pageTerminal(Page<OeTenantVO> page, String name, String code) {
         int total = 20;
         List<OeTenantVO> list = new ArrayList<>();
-        for (int i = Math.toIntExact(page.getCurrent()); i < page.getSize(); i++) {
+        for (int i = Math.toIntExact(page.getCurrent()); i <= page.getSize() && i <= total; i++) {
             OeTenantVO oeTenantVO = new OeTenantVO();
             oeTenantVO.setTenantId((long) i);
             oeTenantVO.setCode("123456789123456");

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

@@ -3,6 +3,7 @@ package com.qunzhixinxi.hnqz.admin.oe.entity.dto;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 
@@ -81,6 +82,30 @@ public class OeTenantRequest {
         private String locFlag;
     }
 
+    /**
+     * 启用/停用药企
+     *
+     * @author lixuesong
+     * @date 2023/08/04
+     */
+    @Data
+    public static class ToLockUnlock implements Serializable {
+
+        private static final long serialVersionUID = -5033454666284018069L;
+
+        /**
+         * 租户id
+         */
+        @NotNull(message = "主键ID必填")
+        private Long tenantId;
+
+        /**
+         * 锁定标记(OK-正常,LOC-已锁定)
+         */
+        @NotBlank(message = "锁定标记必填")
+        private String locFlag;
+    }
+
     /**
      * 保存代理商
      *