合并终结版

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

@@ -85,6 +85,8 @@ public class HelpActivityController extends BaseController {
     @Autowired
     private TaShareContentService taShareContentService;
 
+    @Autowired
+    private HelpInitiateRecordMapper helpInitiateRecordMapper;
     /**
      * 活动助力列表
      *
@@ -130,7 +132,8 @@ public class HelpActivityController extends BaseController {
         Integer cityId = iTaBuildingService.getCityById(helpActivity.getBuildingId());
         helpActivity.setCityId(cityId);
         // 活动暂且定位为未开始
-        helpActivity.setActivityStatus(0);
+        helpActivity.setActivityStatus(1);
+        helpActivity.setStatus(0);
         helpActivity.setWeight(0);
         helpActivity.setIsMain(false);
         taHelpActivityService.helpActivityAdd(helpActivity, orgId);
@@ -214,6 +217,13 @@ public class HelpActivityController extends BaseController {
         // 结束活动操作
         if (activityStatus.equals("2")) {
             helpActivity.setActivityStatus(2);
+            QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery= new QueryWrapper<>();
+            helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
+                List<HelpInitiateRecord> list= helpInitiateRecordMapper.selectList(helpInitiateRecordQuery);
+                for (HelpInitiateRecord helpInitiateRecord:list){
+                    helpInitiateRecord.setStatus(2);
+                    helpInitiateRecordMapper.updateById(helpInitiateRecord);
+                }
         }
         Boolean isA = taHelpActivityService.updateById(helpActivity);
         responseBean.addSuccess(isA);
@@ -331,7 +341,7 @@ public class HelpActivityController extends BaseController {
     }
 
     /**
-     * 导出数据 客户列表 公客/私客
+     * 助力活动发起人
      *
      * @param request
      * @param response

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

@@ -92,14 +92,14 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
                 }
             }
             // 助力进行中（活动进行中，未结束）
-            if ("helpUnderway".equals(status) && helpActivity.getStatus().equals(1)) {
+            if ("helpUnderway".equals(status) && helpInitiateRecord.getStatus().equals(1)) {
                 if (persionNumCount > helpRecordCount) {
                     helpInitiateRecord.setHelpCount(helpRecordCount);
                 }
             }
             // 活动助力失败
             // 活动进行中（活动已结束）
-            if ("helpUnfinished".equals(status) && helpActivity.getStatus().equals(2)) {
+            if ("helpUnfinished".equals(status) && helpInitiateRecord.getStatus().equals(2)) {
                 if (persionNumCount > helpRecordCount) {
                     helpInitiateRecord.setHelpCount(helpRecordCount);
                 }

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -15,12 +15,12 @@
         </if>
        <if test="status == 'helpUnderway'">
            and (hi.verification = 'null' OR hi.verification = '')
-           AND ha.`activity_status` = 1
+           AND hi.`status` = 1
        </if>
 
        <if test="status == 'helpUnfinished '">
            and (hi.verification = 'null' OR hi.verification = '')
-           AND ha.`activity_status` = 2
+           AND hi.`status` =  2
        </if>
        </where>
     </select>