魏超 5 years ago
parent
commit
89e230c8e6

+ 6
- 0
src/main/java/com/huiju/estateagents/entity/TaShareActivity.java View File

127
      */
127
      */
128
     @TableField(exist = false)
128
     @TableField(exist = false)
129
     private Integer successNum;
129
     private Integer successNum;
130
+
131
+    /**
132
+     * 参加拼团人数
133
+     */
134
+    @TableField(exist = false)
135
+    private Integer participateNum;
130
 }
136
 }

+ 2
- 0
src/main/java/com/huiju/estateagents/mapper/TaShareActivityMapper.java View File

25
     void updateUnStartGroupActivity(@Param("list") List<Integer> startGroupActivityId);
25
     void updateUnStartGroupActivity(@Param("list") List<Integer> startGroupActivityId);
26
 
26
 
27
     void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityId);
27
     void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityId);
28
+
29
+    Integer calParticipateNum(@Param("groupActivityId") Integer groupActivityId);
28
 }
30
 }

+ 0
- 1
src/main/java/com/huiju/estateagents/mapper/TaShareRecordMapper.java View File

27
     IPage<TaShareRecordPO> recordFailAndProcessingList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
27
     IPage<TaShareRecordPO> recordFailAndProcessingList(IPage<TaShareRecord> page, @Param("phone") String phone, @Param("status") Integer status, @Param("groupActivityId") Integer groupActivityId, @Param("orgId") Integer orgId);
28
     List<ShareRecordSuccessExport> getShareRecordSuccessExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
28
     List<ShareRecordSuccessExport> getShareRecordSuccessExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
29
     List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
29
     List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
30
-    List<TaShareRecordPO> recordFailAndProcessingList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
31
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
30
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
32
     void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityIds);
31
     void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityIds);
33
 }
32
 }

+ 7
- 0
src/main/java/com/huiju/estateagents/service/impl/TaShareActivityServiceImpl.java View File

6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.entity.TaShareActivity;
8
 import com.huiju.estateagents.entity.TaShareActivity;
9
+import com.huiju.estateagents.entity.TaShareRecord;
9
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
10
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
10
 import com.huiju.estateagents.service.ITaShareActivityService;
11
 import com.huiju.estateagents.service.ITaShareActivityService;
11
 import org.apache.commons.collections.CollectionUtils;
12
 import org.apache.commons.collections.CollectionUtils;
48
         queryWrapper.orderByAsc("start_time");
49
         queryWrapper.orderByAsc("start_time");
49
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
50
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
50
 
51
 
52
+        List<TaShareActivity> taShareActivities = taNewsIPage.getRecords();
53
+        for (TaShareActivity taShareActivity : taShareActivities){
54
+            Integer participateNum = taShareActivityMapper.calParticipateNum(taShareActivity.getGroupActivityId());
55
+            taShareActivity.setParticipateNum(participateNum);
56
+        }
57
+        taNewsIPage.setRecords(taShareActivities);
51
         responseBean.addSuccess(taNewsIPage);
58
         responseBean.addSuccess(taNewsIPage);
52
         return responseBean;
59
         return responseBean;
53
     }
60
     }

+ 4
- 0
src/main/resources/mapper/TaShareActivityMapper.xml View File

31
         </foreach>
31
         </foreach>
32
     </update>
32
     </update>
33
 
33
 
34
+    <select id="calParticipateNum" resultType="java.lang.Integer">
35
+        select sum(t.join_people) as num from ta_share_record t where t.group_activity_id = #{groupActivityId} group by t.group_activity_id
36
+    </select>
37
+
34
 </mapper>
38
 </mapper>

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

20
         t.verification_status,
20
         t.verification_status,
21
         t.verification_code
21
         t.verification_code
22
         from ta_share_record t where 1=1
22
         from ta_share_record t where 1=1
23
-        <if test="status !=null and status != ''">
23
+        <if test="status != null">
24
             and t.status = #{status}
24
             and t.status = #{status}
25
         </if>
25
         </if>
26
         <if test="groupActivityId != null and groupActivityId != ''">
26
         <if test="groupActivityId != null and groupActivityId != ''">
42
         a.verification_status as joinVerificationStatus,
42
         a.verification_status as joinVerificationStatus,
43
         a.verification_code as joinVerificationCode
43
         a.verification_code as joinVerificationCode
44
         from ta_share_child_record a where 1=1
44
         from ta_share_child_record a where 1=1
45
-        <if test="status !=null and status != ''">
45
+        <if test="status !=null">
46
             and a.status = #{status}
46
             and a.status = #{status}
47
         </if>
47
         </if>
48
         <if test="groupActivityId != null and groupActivityId != ''">
48
         <if test="groupActivityId != null and groupActivityId != ''">