魏超 5 年前
父节点
当前提交
4e3a8cb28b

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/HelpActivityController.java 查看文件

202
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
202
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
203
         QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
203
         QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
204
         helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
204
         helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
205
+        helpActivityQueryWrapper.ne("help_activity_id", helpActivity.getHelpActivityId());
205
         Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
206
         Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
206
         if (heavyCount != 0){
207
         if (heavyCount != 0){
207
             responseBean.addError("权重已存在,请重新编辑");
208
             responseBean.addError("权重已存在,请重新编辑");

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

423
         dynamic.setPublishDate(LocalDateTime.now());
423
         dynamic.setPublishDate(LocalDateTime.now());
424
         dynamic.setCreateDate(LocalDateTime.now());
424
         dynamic.setCreateDate(LocalDateTime.now());
425
 
425
 
426
-        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy());
426
+        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy(), dynamic.getDynamicId());
427
         if (heavyCount != 0){
427
         if (heavyCount != 0){
428
             responseBean.addError("权重已存在,请重新编辑");
428
             responseBean.addError("权重已存在,请重新编辑");
429
             return responseBean;
429
             return responseBean;
459
         if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
459
         if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
460
             dynamic.setActivityStatus(2);
460
             dynamic.setActivityStatus(2);
461
         }
461
         }
462
-        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy());
462
+        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy(), dynamic.getDynamicId());
463
         if (heavyCount != 0){
463
         if (heavyCount != 0){
464
             responseBean.addError("权重已存在,请重新编辑");
464
             responseBean.addError("权重已存在,请重新编辑");
465
             return responseBean;
465
             return responseBean;

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java 查看文件

198
 
198
 
199
             QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
199
             QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
200
             taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
200
             taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
201
+            taShareActivityQueryWrapper.ne("group_activity_id", taShareActivity.getGroupActivityId());
201
             Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
202
             Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
202
             if (heavyCount != 0){
203
             if (heavyCount != 0){
203
                 responseBean.addError("权重已存在,请重新编辑");
204
                 responseBean.addError("权重已存在,请重新编辑");

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java 查看文件

90
      * 根据权重统计该权重是否存在
90
      * 根据权重统计该权重是否存在
91
      * @return
91
      * @return
92
      */
92
      */
93
-    int countNumByHeavy(@Param("heavy") Integer heavy);
93
+    int countNumByHeavy(@Param("heavy") Integer heavy, @Param("dynamicId") String dynamicId);
94
 }
94
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingService.java 查看文件

165
      * @param heavy
165
      * @param heavy
166
      * @return
166
      * @return
167
      */
167
      */
168
-    int countNumByHeavy(Integer heavy);
168
+    int countNumByHeavy(Integer heavy, String dynamicId);
169
 }
169
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java 查看文件

786
     }
786
     }
787
 
787
 
788
     @Override
788
     @Override
789
-    public int countNumByHeavy(Integer heavy) {
790
-        return taBuildingMapper.countNumByHeavy(heavy);
789
+    public int countNumByHeavy(Integer heavy, String dynamicId) {
790
+        return taBuildingMapper.countNumByHeavy(heavy, dynamicId);
791
     }
791
     }
792
 
792
 
793
 
793
 

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

201
     </select>
201
     </select>
202
 
202
 
203
     <select id="countNumByHeavy" resultType="java.lang.Integer">
203
     <select id="countNumByHeavy" resultType="java.lang.Integer">
204
-      select COUNT(1) from ta_building_dynamic t where t.heavy = #{heavy}
204
+      select COUNT(1) from ta_building_dynamic t where t.heavy = #{heavy} and t.dynamic_id != #{dynamicId}
205
     </select>
205
     </select>
206
 
206
 
207
 </mapper>
207
 </mapper>