公会-结算-按周期时间内查询有效公会成员-sql

accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FamilyGiftRecordMapper.xml

@@ -187,7 +187,7 @@
         </where>
         GROUP BY
         gm.family_id,
-        gm.uid
+        gm.id
         order by goldIncome desc, gm.enable desc
     </select>
 

accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FamilyMemberMapper.xml

@@ -19,14 +19,19 @@
     </select>
 
     <select id="listValidFamilyMemberByTime" resultType="com.accompany.business.model.family.FamilyMember">
-        select max(id) `id`, family_id, uid, role_type, create_time, update_time, enable
+        select fm.`id`, family_id, uid, role_type, create_time, update_time, enable
+        from family_member fm
+        inner join (
+        select max(id) `id`
         from family_member fm
         where 1=1
         <if test="familyId != null">
             and fm.family_id = #{familyId}
         </if>
-        and (fm.enable = 1 or (fm.update_time between #{startTime} and #{endTime}))
-        group by uid, family_id
+        and fm.family_id = 11
+        and (fm.enable = 1 or (fm.update_time between '2025-10-01 00:00:00' and '2025-10-15 23:59:59'))
+        group by family_id, uid
+        ) fmm on fm.id = fmm.id
         order by role_type asc , enable desc, create_time asc
     </select>