|
@@ -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;
|