TRX 1 年間 前
コミット
f939334e64

+ 6 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/service/OrganizationFeignService.java

@@ -30,4 +30,10 @@ public interface OrganizationFeignService {
     @RequestMapping(value = "getBusinessMainDetail", method = RequestMethod.GET)
     ResultContent<OrganizationModel> getBusinessMainDetail(@Parameter(name = "businessMainOid", description = "oid", required = false) @RequestParam(name = "businessMainOid") String businessMainOid);
 
+
+    @Operation(summary = "得到学校所在的项目详情", description = "得到学校所在的项目详情")
+    @RequestMapping(value = "getSchoolProjectDetail", method = RequestMethod.GET)
+    ResultContent<OrganizationModel> getSchoolProjectDetail(@Parameter(name = "schoolOid", description = "oid", required = false) @RequestParam(name = "schoolOid") String schoolOid);
+
+
 }

+ 3 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/service/org/OrganizationService.java

@@ -59,6 +59,9 @@ public interface OrganizationService {
     // 得到学校详情
     ResultContent<OrganizationModel> getSchoolDetail(String schoolOid);
 
+    // 得到学校所在的项目信息
+    ResultContent<ProjectOrgModel> getSchoolProjectDetail(String schoolOid);
+
     // 得到商户详情
     ResultContent<OrganizationModel> getBusinessMainDetail(String businessMainOid);
 

+ 8 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/feign/OrganizationFeignController.java

@@ -56,5 +56,13 @@ public class OrganizationFeignController {
         return organizationService.getBusinessMainDetail(businessMainOid);
     }
 
+    @Operation(summary = "得到学校所在的项目详情", description = "得到学校所在的项目详情")
+    @RequestMapping(value = "manager/getSchoolProjectDetail", method = {RequestMethod.GET})
+    public ResultContent<ProjectOrgModel> getSchoolProjectDetail(
+            @Parameter(name = "schoolOid", description = "oid", required = false)
+            @RequestParam(name = "schoolOid")
+            String schoolOid) {
+        return organizationService.getSchoolProjectDetail(schoolOid);
+    }
 
 }

+ 2 - 2
FullCardServer/src/main/java/com/zhongshu/card/server/core/dataConfig/CardSystemDefault.java

@@ -8,10 +8,10 @@ package com.zhongshu.card.server.core.dataConfig;
  */
 public class CardSystemDefault {
 
-    // 平台名称
+    // 超管平台名称
     public static final String DEFAULT_PLATFORM_NAME = "全卡项目平台";
 
-    // 平台初始用户登录名
+    // 超管平台初始用户登录名
     public static final String SUPER_ADMIN_NAME = "18723497166";
 
     // 默认密码

+ 20 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -432,6 +432,26 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
         return ResultContent.buildSuccess(model);
     }
 
+    /**
+     * 得到学校所在的项目信息
+     *
+     * @param schoolOid 学校oid
+     * @return
+     */
+    @Override
+    public ResultContent<ProjectOrgModel> getSchoolProjectDetail(String schoolOid) {
+        Organization schoolOrg = organizationDao.findTopByOid(schoolOid);
+        if (ObjectUtils.isEmpty(schoolOrg)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, schoolOid));
+        }
+        ProjectOrgModel model = null;
+        OrganizationRelation relation = organizationRelationDao.findTopByMainOrganizationAndRelationType(schoolOrg, OrganizationRelationType.SchoolToProject);
+        if (ObjectUtils.isNotEmpty(relation)) {
+            model = toProjectModel(relation.getRelOrganization());
+        }
+        return ResultContent.buildSuccess(model);
+    }
+
     /**
      * 分页数据
      *