|
@@ -402,9 +402,11 @@ public class TaBuildingDynamicController extends BaseController {
|
402
|
402
|
dynamic.setCityId(cityId);
|
403
|
403
|
//发布状态
|
404
|
404
|
dynamic.setStatus(0);
|
405
|
|
- //活动状态
|
|
405
|
+ //活动状态,如果不需要报名则直接置为进行中
|
406
|
406
|
dynamic.setActivityStatus(1);
|
407
|
|
-// dynamic.setDynamicId(idGen.nextId()+"");
|
|
407
|
+ if (dynamic.getIsEnlist() == 0){
|
|
408
|
+ dynamic.setActivityStatus(0);
|
|
409
|
+ }
|
408
|
410
|
dynamic.setPublishDate(LocalDateTime.now());
|
409
|
411
|
dynamic.setCreateDate(LocalDateTime.now());
|
410
|
412
|
|
|
@@ -433,6 +435,15 @@ public class TaBuildingDynamicController extends BaseController {
|
433
|
435
|
QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
|
434
|
436
|
Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
|
435
|
437
|
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())){
|
|
442
|
+ dynamic.setActivityStatus(1);
|
|
443
|
+ }
|
|
444
|
+ if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
|
|
445
|
+ dynamic.setActivityStatus(2);
|
|
446
|
+ }
|
436
|
447
|
buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
|
437
|
448
|
iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
|
438
|
449
|
return responseBean;
|