Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -150,11 +150,11 @@ public class HelpActivityController extends BaseController {
         Integer cityId = iTaBuildingService.getCityById(helpActivity.getBuildingId());
         QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
         helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
-        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
-        if (heavyCount != 0){
-            responseBean.addError("权重已存在，请重新编辑");
-            return responseBean;
-        }
+//        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
+//        if (heavyCount != 0){
+//            responseBean.addError("权重已存在，请重新编辑");
+//            return responseBean;
+//        }
         helpActivity.setCityId(cityId);
         // 活动暂且定位为未开始
         helpActivity.setActivityStatus(1);
@@ -201,11 +201,11 @@ public class HelpActivityController extends BaseController {
         QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
         helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
         helpActivityQueryWrapper.ne("help_activity_id", helpActivity.getHelpActivityId());
-        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
-        if (heavyCount != 0){
-            responseBean.addError("权重已存在，请重新编辑");
-            return responseBean;
-        }
+//        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
+//        if (heavyCount != 0){
+//            responseBean.addError("权重已存在，请重新编辑");
+//            return responseBean;
+//        }
         Integer cityId = iTaBuildingService.getCityById( helpActivity.getBuildingId());
         helpActivity.setCityId(cityId);
         helpActivity.setHelpActivityId(helpActivity.getHelpActivityId());

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

@@ -456,11 +456,12 @@ public class TaBuildingDynamicController extends BaseController {
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
 
-        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy(), dynamic.getDynamicId());
-        if (heavyCount != 0){
-            responseBean.addError("权重已存在，请重新编辑");
-            return responseBean;
-        }
+        //3.5.2.2版本去除权重验重
+//        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy(), dynamic.getDynamicId());
+//        if (heavyCount != 0){
+//            responseBean.addError("权重已存在，请重新编辑");
+//            return responseBean;
+//        }
          // 根据ORGID查询当前小程序表的miniapp_id
         QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
         taMiniappQuery.eq("org_id",getOrgId(request));
@@ -492,11 +493,19 @@ public class TaBuildingDynamicController extends BaseController {
         if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
             dynamic.setActivityStatus(2);
         }
-        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy(), dynamic.getDynamicId());
-        if (heavyCount != 0){
-            responseBean.addError("权重已存在，请重新编辑");
+
+        //判断报名时间是否在活动时间之内
+        if (dynamic.getStartDate().isAfter(dynamic.getEnlistStart()) || dynamic.getEndDate().isBefore(dynamic.getEnlistEnd())){
+            responseBean.addError("报名时间应在活动时间之内");
             return responseBean;
         }
+
+        //3.5.2.2版本去除验重功能
+//        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy(), dynamic.getDynamicId());
+//        if (heavyCount != 0){
+//            responseBean.addError("权重已存在，请重新编辑");
+//            return responseBean;
+//        }
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
         return responseBean;

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

@@ -139,11 +139,11 @@ public class TaShareActivityController extends BaseController {
 
             QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
             taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
-            Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
-            if (heavyCount != 0){
-                responseBean.addError("权重已存在，请重新编辑");
-                return responseBean;
-            }
+//            Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
+//            if (heavyCount != 0){
+//                responseBean.addError("权重已存在，请重新编辑");
+//                return responseBean;
+//            }
 
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
             taShareActivity.setCityId(cityId);
@@ -204,11 +204,11 @@ public class TaShareActivityController extends BaseController {
             QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
             taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
             taShareActivityQueryWrapper.ne("group_activity_id", taShareActivity.getGroupActivityId());
-            Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
-            if (heavyCount != 0){
-                responseBean.addError("权重已存在，请重新编辑");
-                return responseBean;
-            }
+//            Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
+//            if (heavyCount != 0){
+//                responseBean.addError("权重已存在，请重新编辑");
+//                return responseBean;
+//            }
 
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);