activity

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

@@ -400,30 +400,50 @@ public class HelpActivityController extends BaseController {
                                           @RequestParam(value = "initiateId",required = false) Integer initiateId,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
-        
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
         Map<String,Object> map = new HashMap<>();
         try {
             //活动信息
             HelpActivity helpActivity = taHelpActivityService.getById(helpActivityId);
+            QueryWrapper<HelpInitiateRecord> helpInitiateRecordQueryWrapper = new QueryWrapper<>();
+            helpInitiateRecordQueryWrapper.eq("org_id",orgId);
+            helpInitiateRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+            helpInitiateRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+            List<HelpInitiateRecord> helpInitiateRecordList = helpInitiateRecordMapper.selectList(helpInitiateRecordQueryWrapper);
+            helpActivity.setSuccessNum(helpInitiateRecordList.size());
             map.put("helpActivity",helpActivity);
             
             //发起者信息
+            HelpInitiateRecord helpInitiateRecord = null;
              if (null != initiateId){
-                 HelpInitiateRecord helpInitiateRecord = helpInitiateRecordService.getById(initiateId);
-                 if (null != helpInitiateRecord){
-                     helpActivity.setHelpStatus(CommConstant.HELP_STATUS_INITIATE);
+                 helpInitiateRecord = helpInitiateRecordService.getById(initiateId);
+             }else {
+                 QueryWrapper<HelpInitiateRecord> initiateRecordQueryWrapper = new QueryWrapper<>();
+                 initiateRecordQueryWrapper.eq("org_id",orgId);
+                 initiateRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+                 initiateRecordQueryWrapper.eq("person_id",person.getPersonId());
+                 helpInitiateRecord = helpInitiateRecordService.getOne(initiateRecordQueryWrapper);
+             }
+             
+             //判断是否发起者
+            if (null != helpInitiateRecord){
+                helpActivity.setHelpStatus(CommConstant.HELP_STATUS_INITIATE);
         
-                     //助力者信息
-                     QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
-                     helpRecordQueryWrapper.eq("org_id",orgId);
-                     helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
-                     helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
-                     List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
+                //助力者信息
+                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+                helpRecordQueryWrapper.eq("org_id",orgId);
+                helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+                helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
+                List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
         
-                     map.put("helpInitiateRecord",helpInitiateRecord);
-                     map.put("helpRecordList",helpRecordList);
-                 }
-             }
+                map.put("helpInitiateRecord",helpInitiateRecord);
+                map.put("helpRecordList",helpRecordList);
+            }
     
             //获取海报信息
             QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();

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

@@ -287,6 +287,13 @@ public class TaShareActivityController extends BaseController {
         try {
             //活动详情
             TaShareActivity taShareActivity = iTaShareActivityService.getById(groupActicityId);
+            //查看此活动已经完成的数量
+            QueryWrapper<TaShareRecord> shareRecordQueryWrapper = new QueryWrapper<>();
+            shareRecordQueryWrapper.eq("org_id",orgId);
+            shareRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+            shareRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+            List<TaShareRecord> taShareRecordsList = taShareRecordService.list(shareRecordQueryWrapper);
+            taShareActivity.setSuccessNum(taShareRecordsList.size());
             map.put("taShareActivity",taShareActivity);
             
             //发起者团长信息

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

@@ -125,4 +125,10 @@ public class HelpActivity implements Serializable {
      */
     @TableField(exist = false)
     private String succeedCount;
+    
+    /**
+     * 助力成功次数
+     */
+    @TableField(exist = false)
+    private Integer successNum;
 }

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

@@ -126,4 +126,10 @@ public class TaShareActivity implements Serializable {
      */
     @TableField(exist = false)
     private Integer averageScore;
+    
+    /**
+     * 助力成功次数
+     */
+    @TableField(exist = false)
+    private Integer successNum;
 }