魏超 5 年之前
父節點
當前提交
9167579909

+ 14
- 6
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java 查看文件

404
         dynamic.setStatus(1);
404
         dynamic.setStatus(1);
405
         //活动状态,如果不需要报名则直接置为进行中
405
         //活动状态,如果不需要报名则直接置为进行中
406
         dynamic.setActivityStatus(1);
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
         dynamic.setPublishDate(LocalDateTime.now());
411
         dynamic.setPublishDate(LocalDateTime.now());
411
         dynamic.setCreateDate(LocalDateTime.now());
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
          // 根据ORGID查询当前小程序表的miniapp_id
419
          // 根据ORGID查询当前小程序表的miniapp_id
414
         QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
420
         QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
415
         taMiniappQuery.eq("org_id",getOrgId(request));
421
         taMiniappQuery.eq("org_id",getOrgId(request));
435
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
441
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
436
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
442
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
437
         dynamic.setCityId(cityId);
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
         if (dynamic.getEnlistStart() != null && LocalDateTime.now().isBefore(dynamic.getEnlistStart())){
444
         if (dynamic.getEnlistStart() != null && LocalDateTime.now().isBefore(dynamic.getEnlistStart())){
442
             dynamic.setActivityStatus(1);
445
             dynamic.setActivityStatus(1);
443
         }
446
         }
444
         if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
447
         if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
445
             dynamic.setActivityStatus(2);
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
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
455
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
448
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
456
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
449
         return responseBean;
457
         return responseBean;

+ 6
- 1
src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java 查看文件

40
     private String buildingId;
40
     private String buildingId;
41
 
41
 
42
     /**
42
     /**
43
-     * 首页图片URL
43
+     * 首页列表图片URL
44
      */
44
      */
45
     private String imgUrl;
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 查看文件

86
      */
86
      */
87
     List<TaBuilding> selectBuildingByBuildingTypeId(Integer buildingTypeId);
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 查看文件

159
     Integer getCityById(String buildingId);
159
     Integer getCityById(String buildingId);
160
 
160
 
161
     ResponseBean getBuildingListById(Integer orgId,Integer cityId);
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 查看文件

677
         return ResponseBean.success(buildings);
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
     private List<TaBuildingImg> insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
686
     private List<TaBuildingImg> insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
682
         return imgs.stream().map(img -> {
687
         return imgs.stream().map(img -> {

+ 1
- 1
src/main/resources/mapper/TaBuildingDynamicMapper.xml 查看文件

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

+ 4
- 0
src/main/resources/mapper/TaBuildingMapper.xml 查看文件

200
       )
200
       )
201
     </select>
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
 </mapper>
207
 </mapper>