魏超 5 years ago
parent
commit
9167579909

+ 14
- 6
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java View File

@@ -404,12 +404,18 @@ public class TaBuildingDynamicController extends BaseController {
404 404
         dynamic.setStatus(1);
405 405
         //活动状态,如果不需要报名则直接置为进行中
406 406
         dynamic.setActivityStatus(1);
407
-        if (dynamic.getIsEnlist() == 0){
408
-            dynamic.setActivityStatus(0);
409
-        }
407
+        //3.5.1版本去除是否需要报名
408
+//        if (dynamic.getIsEnlist() == 0){
409
+//            dynamic.setActivityStatus(0);
410
+//        }
410 411
         dynamic.setPublishDate(LocalDateTime.now());
411 412
         dynamic.setCreateDate(LocalDateTime.now());
412 413
 
414
+        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy());
415
+        if (heavyCount != 0){
416
+            responseBean.addError("权重已存在,请重新编辑");
417
+            return responseBean;
418
+        }
413 419
          // 根据ORGID查询当前小程序表的miniapp_id
414 420
         QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
415 421
         taMiniappQuery.eq("org_id",getOrgId(request));
@@ -435,15 +441,17 @@ public class TaBuildingDynamicController extends BaseController {
435 441
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
436 442
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
437 443
         dynamic.setCityId(cityId);
438
-        if (dynamic.getIsEnlist() == 0 || (LocalDateTime.now().isAfter(dynamic.getEnlistStart()) && LocalDateTime.now().isBefore(dynamic.getEnlistEnd()))){
439
-            dynamic.setActivityStatus(0);
440
-        }
441 444
         if (dynamic.getEnlistStart() != null && LocalDateTime.now().isBefore(dynamic.getEnlistStart())){
442 445
             dynamic.setActivityStatus(1);
443 446
         }
444 447
         if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
445 448
             dynamic.setActivityStatus(2);
446 449
         }
450
+        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy());
451
+        if (heavyCount != 0){
452
+            responseBean.addError("权重已存在,请重新编辑");
453
+            return responseBean;
454
+        }
447 455
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
448 456
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
449 457
         return responseBean;

+ 6
- 1
src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java View File

@@ -40,10 +40,15 @@ public class TaBuildingDynamic implements Serializable {
40 40
     private String buildingId;
41 41
 
42 42
     /**
43
-     * 首页图片URL
43
+     * 首页列表图片URL
44 44
      */
45 45
     private String imgUrl;
46 46
 
47
+    /**
48
+     * 首页详情图片URL
49
+     */
50
+    private String detailImgUrl;
51
+
47 52
     /**
48 53
      * 标题
49 54
      */

+ 5
- 0
src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java View File

@@ -86,4 +86,9 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
86 86
      */
87 87
     List<TaBuilding> selectBuildingByBuildingTypeId(Integer buildingTypeId);
88 88
 
89
+    /**
90
+     * 根据权重统计该权重是否存在
91
+     * @return
92
+     */
93
+    int countNumByHeavy(@Param("heavy") Integer heavy);
89 94
 }

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

@@ -159,4 +159,11 @@ public interface ITaBuildingService extends IService<TaBuilding> {
159 159
     Integer getCityById(String buildingId);
160 160
 
161 161
     ResponseBean getBuildingListById(Integer orgId,Integer cityId);
162
+
163
+    /**
164
+     * 根据权重判断是否存在
165
+     * @param heavy
166
+     * @return
167
+     */
168
+    int countNumByHeavy(Integer heavy);
162 169
 }

+ 5
- 0
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java View File

@@ -677,6 +677,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
677 677
         return ResponseBean.success(buildings);
678 678
     }
679 679
 
680
+    @Override
681
+    public int countNumByHeavy(Integer heavy) {
682
+        return taBuildingMapper.countNumByHeavy(heavy);
683
+    }
684
+
680 685
 
681 686
     private List<TaBuildingImg> insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
682 687
         return imgs.stream().map(img -> {

+ 1
- 1
src/main/resources/mapper/TaBuildingDynamicMapper.xml View File

@@ -42,7 +42,7 @@
42 42
         <if test="time != null">
43 43
             and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
44 44
         </if>
45
-        ORDER BY tbd.activity_status asc, tbd.create_date DESC
45
+        ORDER BY tbd.heavy DESC
46 46
   </select>
47 47
 
48 48
     <select id="iBuildingDynamicSelectId" parameterType="string" resultType="com.huiju.estateagents.entity.TaBuildingDynamic">

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

@@ -200,4 +200,8 @@
200 200
       )
201 201
     </select>
202 202
 
203
+    <select id="countNumByHeavy" resultType="java.lang.Integer">
204
+      select COUNT(1) from ta_building_dynamic t where t.heavy = #{heavy}
205
+    </select>
206
+
203 207
 </mapper>