bug fix

src/main/java/com/huiju/estateagents/entity/TaShareActivity.java

@@ -127,4 +127,10 @@ public class TaShareActivity implements Serializable {
      */
     @TableField(exist = false)
     private Integer successNum;
+
+    /**
+     * 参加拼团人数
+     */
+    @TableField(exist = false)
+    private Integer participateNum;
 }

src/main/java/com/huiju/estateagents/mapper/TaShareActivityMapper.java

@@ -25,4 +25,6 @@ public interface TaShareActivityMapper extends BaseMapper<TaShareActivity> {
     void updateUnStartGroupActivity(@Param("list") List<Integer> startGroupActivityId);
 
     void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityId);
+
+    Integer calParticipateNum(@Param("groupActivityId") Integer groupActivityId);
 }

src/main/java/com/huiju/estateagents/mapper/TaShareRecordMapper.java

@@ -27,7 +27,6 @@ public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
     IPage<TaShareRecordPO> recordFailAndProcessingList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
     List<ShareRecordSuccessExport> getShareRecordSuccessExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
     List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
-    List<TaShareRecordPO> recordFailAndProcessingList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
     void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityIds);
 }

src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.service.ITaShareActivityService;
 import org.apache.commons.collections.CollectionUtils;
@@ -48,6 +49,12 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.orderByAsc("start_time");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
 
+        List<TaShareActivity> taShareActivities = taNewsIPage.getRecords();
+        for (TaShareActivity taShareActivity : taShareActivities){
+            Integer participateNum = taShareActivityMapper.calParticipateNum(taShareActivity.getGroupActivityId());
+            taShareActivity.setParticipateNum(participateNum);
+        }
+        taNewsIPage.setRecords(taShareActivities);
         responseBean.addSuccess(taNewsIPage);
         return responseBean;
     }

src/main/resources/mapper/TaShareActivityMapper.xml

@@ -31,4 +31,8 @@
         </foreach>
     </update>
 
+    <select id="calParticipateNum" resultType="java.lang.Integer">
+        select sum(t.join_people) as num from ta_share_record t where t.group_activity_id = #{groupActivityId} group by t.group_activity_id
+    </select>
+
 </mapper>

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -20,7 +20,7 @@
         t.verification_status,
         t.verification_code
         from ta_share_record t where 1=1
-        <if test="status !=null and status != ''">
+        <if test="status != null">
             and t.status = #{status}
         </if>
         <if test="groupActivityId != null and groupActivityId != ''">
@@ -42,7 +42,7 @@
         a.verification_status as joinVerificationStatus,
         a.verification_code as joinVerificationCode
         from ta_share_child_record a where 1=1
-        <if test="status !=null and status != ''">
+        <if test="status !=null">
             and a.status = #{status}
         </if>
         <if test="groupActivityId != null and groupActivityId != ''">