Browse Source

我的拼团

傅行帆 5 years ago
parent
commit
cc0631a113

+ 9
- 0
src/main/java/com/huiju/estateagents/entity/TaShareRecord.java View File

102
     
102
     
103
     @TableField(exist = false)
103
     @TableField(exist = false)
104
     private LocalDateTime endDate;
104
     private LocalDateTime endDate;
105
+    
106
+    @TableField(exist = false)
107
+    private Integer id;
108
+    
109
+    /**
110
+     * 是否发起者
111
+     */
112
+    @TableField(exist = false)
113
+    private boolean groupStatus;
105
 }
114
 }

+ 35
- 2
src/main/resources/mapper/TaShareRecordMapper.xml View File

113
     </select>
113
     </select>
114
     <select id="getShareRecordList" resultType="com.huiju.estateagents.entity.TaShareRecord">
114
     <select id="getShareRecordList" resultType="com.huiju.estateagents.entity.TaShareRecord">
115
         SELECT
115
         SELECT
116
-            t.*,
116
+            t.record_id AS id,
117
+            t.group_activity_id,
118
+            t.nickname,
119
+            t.phone,
120
+            t.avatarurl,
121
+            t.create_time,
122
+            t.end_time,
123
+            t.STATUS,
124
+            t.verification_status,
125
+            t.verification_code,
117
             a.activity_name,
126
             a.activity_name,
118
             a.main_img,
127
             a.main_img,
119
             a.activity_status,
128
             a.activity_status,
120
-            a.end_time AS end_date
129
+            a.end_time AS end_date,
130
+            1 as groupStatus
121
         FROM
131
         FROM
122
             ta_share_record t
132
             ta_share_record t
123
             LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_activity_id
133
             LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_activity_id
124
         WHERE
134
         WHERE
125
             t.org_id = #{orgId}
135
             t.org_id = #{orgId}
126
             AND t.person_id = #{personId}
136
             AND t.person_id = #{personId}
137
+	UNION ALL
138
+        SELECT
139
+            t.child_record_id AS id,
140
+            t.group_activity_id,
141
+            t.nickname,
142
+            t.phone,
143
+            t.avatarurl,
144
+            t.create_time,
145
+            t.end_time,
146
+            t.STATUS,
147
+            t.verification_status,
148
+            t.verification_code,
149
+            a.activity_name,
150
+            a.main_img,
151
+            a.activity_status,
152
+            a.end_time AS end_date,
153
+            0 as groupStatus
154
+        FROM
155
+            ta_share_child_record t
156
+            LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_activity_id
157
+        WHERE
158
+            t.org_id = #{orgId}
159
+            AND t.person_id = #{personId}
127
     </select>
160
     </select>
128
 </mapper>
161
 </mapper>