From a25b1558429d96c03587a4260a5f44ec4d1ddba1 Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Tue, 26 May 2020 18:02:50 +0800
Subject: [PATCH] swagger mysql

---
 .../ic/activity/bean/ActivityInstanceVO.java  |  3 +-
 .../mapper/PmnActivityInstanceDOMapper.java   |  3 ++
 .../impl/PmnActivityInstanceServiceImpl.java  |  4 ++-
 .../activity/PmnActivityInstanceDOMapper.xml  | 34 ++++++++++++++++---
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java b/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java
index 6f48edc..d284e96 100644
--- a/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java
+++ b/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java
@@ -11,12 +11,13 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
 @Data
 @ApiModel("活动实例")
-public class ActivityInstanceVO {
+public class ActivityInstanceVO implements Serializable {
 
     @ApiModelProperty(value = "活动实例ID,有就编辑无则新增")
     private Long id;
diff --git a/src/main/java/com/kiisoo/ic/activity/mapper/PmnActivityInstanceDOMapper.java b/src/main/java/com/kiisoo/ic/activity/mapper/PmnActivityInstanceDOMapper.java
index 4e109fc..fb7c25b 100644
--- a/src/main/java/com/kiisoo/ic/activity/mapper/PmnActivityInstanceDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/activity/mapper/PmnActivityInstanceDOMapper.java
@@ -1,9 +1,11 @@
 package com.kiisoo.ic.activity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kiisoo.ic.activity.bean.ActivityScheduleVO;
 import com.kiisoo.ic.activity.entity.PmnActivityInstance;
 import com.kiisoo.ic.activity.entity.PmnActivityPromotionParam;
 import com.kiisoo.ic.activity.bean.ActivityInstanceVO;
+import com.kiisoo.ic.generalize.entity.PrivilageOrganizational;
 import com.kiisoo.ic.store.entity.PoiStore;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -17,6 +19,7 @@ public interface PmnActivityInstanceDOMapper extends BaseMapper<PmnActivityInsta
     List<PmnActivityPromotionParam> selectParamsByInstanceId(Long instanceId);
 
     List<PoiStore> selectStoresByInstanceId(Long instanceId);
+    List<PrivilageOrganizational> selectOrgByInstanceId(Long instanceId);
 
     List<ActivityInstanceVO> pageVO(Date startDate, Date endDate, Long organizationId, Long storeId, Integer status, @Param("storeIds") Long[] storeIds, @Param("beginTime") Date beginTime, @Param("endTime") Date endTime);
 
diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java
index c7af4b9..39c303d 100644
--- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java
@@ -149,7 +149,9 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
 
     @Override
     public ActivityInstanceVO getVO(Long id) {
-        return pmnActivityInstanceDOMapper.getVO(id);
+        ActivityInstanceVO vo = pmnActivityInstanceDOMapper.getVO(id);
+        vo.setScheduleVO(pmnActivityScheduleService.getVO(vo.getScheduleId()));
+        return vo;
     }
 
     @Override
diff --git a/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml b/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml
index 5cf21ae..45f2581 100644
--- a/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml
+++ b/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml
@@ -17,16 +17,40 @@
                     column="id" ofType="com.kiisoo.ic.activity.entity.PmnActivityPromotionParam"
                     select="selectParamsByInstanceId">
         </collection>
-<!--        <collection property="stores" javaType="ArrayList"-->
-<!--                    column="id" ofType="com.kiisoo.ic.store.entity.PoiStore"-->
-<!--                    select="selectStoresByInstanceId" fetchType="lazy">-->
-<!--        </collection>-->
+    </resultMap>
+    <resultMap type="com.kiisoo.ic.activity.bean.ActivityInstanceVO"
+               id="activityInstanceVOMapStores">
+        <result column="schedule_id" property="scheduleId"/>
+        <result column="name" property="name"/>
+        <result column="begin_time" property="beginTime"/>
+        <result column="end_time" property="endTime"/>
+        <result column="status" property="status"/>
+        <result column="id" property="id"/>
+        <collection property="params" javaType="ArrayList"
+                    column="id" ofType="com.kiisoo.ic.activity.entity.PmnActivityPromotionParam"
+                    select="selectParamsByInstanceId">
+        </collection>
+        <collection property="stores" javaType="ArrayList"
+                    column="id" ofType="com.kiisoo.ic.store.entity.PoiStore"
+                    select="selectStoresByInstanceId">
+        </collection>
+        <collection property="organizations" javaType="ArrayList"
+                    column="id" ofType="com.kiisoo.ic.generalize.entity.PrivilageOrganizational"
+                    select="selectOrgByInstanceId">
+        </collection>
     </resultMap>
     <select id="selectParamsByInstanceId" parameterType="int"
             resultType="com.kiisoo.ic.activity.entity.PmnActivityPromotionParam">
 select * from pmn_activity_promotion_param where id in(select param_id from pmn_activity_instance_config where instance_id=#{instanceId})
     </select>
 
+    <select id="selectOrgByInstanceId" parameterType="int"
+            resultType="com.kiisoo.ic.generalize.entity.PrivilageOrganizational">
+        select * from privilage_organizational
+         where
+         id in(select org_id from pmn_activity_store_relation where instance_id=#{instanceId})
+    </select>
+
     <select id="selectStoresByInstanceId" parameterType="int"
             resultType="com.kiisoo.ic.store.bean.PoiStoreDTO">
         select t.*,
@@ -84,7 +108,7 @@ select * from pmn_activity_promotion_param where id in(select param_id from pmn_
         order by create_time desc
     </select>
 
-    <select id="getVO" resultMap="activityInstanceVOMap">
+    <select id="getVO" resultMap="activityInstanceVOMapStores">
         select t.* from pmn_activity_instance t where id = #{instanceId} limit 0,1
     </select>
 </mapper>