bug

src/main/java/com/huiju/estateagents/controller/HelpActivityController.java

@@ -131,9 +131,10 @@ public class HelpActivityController extends BaseController {
                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
                                          @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "status", required = false) Integer status,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId,status);
         return helpActivityList;
     }
 

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

@@ -152,4 +152,10 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private LocalDateTime createDate;
+
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarurl;
 }

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

@@ -54,5 +54,5 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId);
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId,Integer status);
 }

src/main/java/com/huiju/estateagents/service/IHelpActivityService.java

@@ -145,5 +145,5 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId);
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status);
 }

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

@@ -222,10 +222,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId) {
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId,status);
         responseBean.addSuccess(result);
         return responseBean;
     }

src/main/resources/mapper/HelpActivityMapper.xml

@@ -113,6 +113,9 @@
             <if test="buildingId != null">
                 and building_id = #{buildingId}
             </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
             and ha.org_id=#{orgId}
             and ha.activity_status in (0, 1)
         </where>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -94,6 +94,7 @@
         SELECT
             t.* ,
 	        p.`name` as user_name,
+	        p.avatarurl,
 	        d.name as activity_name,
 	        d.create_date
         FROM