From 8fdb40a481dc2e02a969284f69431563c783ce10 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 15 Sep 2025 18:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E4=B8=AA=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=9F=A5=E8=AF=A2=20=E8=B4=AD=E4=B9=B0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=92=8C=E5=BB=B6=E6=9C=9F=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/organ/OrganController.java          | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java
index fdf7cf46e..ad9bd0b2a 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java
@@ -1,5 +1,6 @@
 package com.cf.imes.module.system.controller.admin.organ;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.cf.imes.framework.common.pojo.CommonResult;
@@ -38,7 +39,6 @@ import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.e
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
 import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 import static com.cf.imes.module.system.enums.ErrorCodeConstants.ORGAN_NOT_EXISTS;
-import static com.cf.imes.module.system.enums.ErrorCodeConstants.TENANT_PACKAGE_NOT_EXISTS;
 
 @Tag(name = "管理后台 - 组织")
 @RestController
@@ -111,14 +111,23 @@ public class OrganController {
         if (ObjectUtil.isNull(organ)) {
             throw exception(ORGAN_NOT_EXISTS);
         }
-        TenantPackageDO tenantPackageDO = tenantPackageMapper.selectById(organ.getPackageId());
-        if (ObjectUtil.isNotNull(tenantPackageDO)) {
-            OrganRespVO bean = BeanUtils.toBean(organ, OrganRespVO.class);
-            bean.setPackageName(Objects.isNull(tenantPackageDO) ? "" : tenantPackageDO.getName());
-            return success(bean);
-        } else {
-            throw exception(TENANT_PACKAGE_NOT_EXISTS);
-        }
+        OrganRespVO bean = BeanUtils.toBean(organ, OrganRespVO.class);
+
+        Long organId = bean.getId();
+        // 查询当次列表组织下的所有购买记录
+        List<OrganPagePurchaseRespVO> orgPurchaseList = BeanUtil.copyToList(purchaseService.getOrgPurchaseList(Set.of(organId)), OrganPagePurchaseRespVO.class);
+        // 查询购买记录下的延期记录
+        orgPurchaseList.forEach(p -> {
+            List<ProductDelayRespVO> delayRecordsByPurchaseId = productDelayService.getRecordsByPurchaseId(p.getId(), organId);
+            if (CollUtil.isNotEmpty(delayRecordsByPurchaseId)) {
+                // 产品有效时间展示为第一项的计算延期时间
+                p.setEndTime(delayRecordsByPurchaseId.get(0).getDelayTime());
+                // 延期时长展示为延期记录的时长+单位，用顿号分隔
+                p.setDelayDuration(delayRecordsByPurchaseId.stream().map(m -> m.getDelayDuration() + DurationUnitEnum.getDesc(m.getDelayDurationUnit())).collect(Collectors.joining("、")));
+            }
+        });
+        bean.setOrganPurchaseList(orgPurchaseList);
+        return success(bean);
     }
 
     @GetMapping("/page")