Pārlūkot izejas kodu

机构列表增加学院现有人数

hgw 3 gadi atpakaļ
vecāks
revīzija
4d46ca7ade

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/vo/TenantInfoInfoPageVo.java

@@ -38,6 +38,9 @@ public class TenantInfoInfoPageVo implements Serializable {
     @ApiModelProperty(value = "创建人名称")
     private String createdName;
 
+    @ApiModelProperty(value = "学员人数")
+    private Integer studentCount;
+
     //机构产品信息
     @ApiModelProperty(value = "服务名称")
     private String serveName;
@@ -136,4 +139,12 @@ public class TenantInfoInfoPageVo implements Serializable {
     public void setCreatedName(String createdName) {
         this.createdName = createdName;
     }
+
+    public Integer getStudentCount() {
+        return studentCount;
+    }
+
+    public void setStudentCount(Integer studentCount) {
+        this.studentCount = studentCount;
+    }
 }

+ 0 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/TenantInfoService.java

@@ -37,8 +37,6 @@ public interface TenantInfoService extends IService<TenantInfo> {
 
     Map<String, Object> tenantRenewPay(Integer tenantId, Integer val) throws Exception;
 
-    RBucket<Map<String, Object>> cacheOrder(String key);
-
     RBucket<Integer> opsRenewInfo(Integer tenantId);
 
     void renewSuccess(Integer val, TenantProductInfo productInfo, BigDecimal amount);

+ 0 - 9
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -526,15 +526,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         return result;
     }
 
-    /**
-     * 缓存订单数据
-     *
-     * @param key TenantOrderRecordEnum+机构id+其他
-     */
-    public RBucket<Map<String, Object>> cacheOrder(String key) {
-        return redissonClient.getBucket(key);
-    }
-
     //操作续费信息
     public RBucket<Integer> opsRenewInfo(Integer key) {
         return redissonClient.getBucket(TenantOrderRecordEnum.TENANT_RENEW.getCode() + ":" + key);

+ 5 - 1
mec-biz/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -46,6 +46,7 @@
         <result column="state_" jdbcType="INTEGER" property="state"/>
         <result column="logo_" jdbcType="VARCHAR" property="logo"/>
         <result column="real_name_" jdbcType="VARCHAR" property="createdName"/>
+        <result column="studentCount" jdbcType="INTEGER" property="studentCount"/>
         <!-- 机构产品信息-->
         <result column="serve_name_" jdbcType="VARCHAR" property="serveName"/>
         <result column="student_up_limit_" jdbcType="INTEGER" property="studentUpLimit"/>
@@ -63,12 +64,15 @@
         u.`real_name_`,
         c.`name_` AS serve_name_,
         d.`student_up_limit_`,
-        b.`expiry_date_`
+        b.`expiry_date_`,
+        ifnull(st.studentCount, 0) as studentCount
         FROM tenant_info AS a
         LEFT JOIN tenant_product_info AS b ON a.`id_` = b.`tenant_id_` and b.using_ = 0
         LEFT JOIN platform_serve AS c ON b.`serve_id_` = c.`id_`
         LEFT JOIN platform_serve_detail AS d ON b.`serve_detail_id_` = d.`id_` AND c.`id_` = d.`serve_id_`
         LEFT JOIN sys_user AS u ON a.`created_by_` = u.`id_`
+        LEFT JOIN (select tenant_id_, count(tenant_id_) as studentCount from student group by tenant_id_) as st
+        on a.id_ = st.tenant_id_
         <where>
             <if test="param.search != null ">
                 AND (