Commit 54753f64 authored by jay's avatar jay

营销活动保护期临时调整为20天

parent e3b16c76
...@@ -279,11 +279,11 @@ public class MarketingActivityController extends BaseController { ...@@ -279,11 +279,11 @@ public class MarketingActivityController extends BaseController {
MarketingActivityEntity marketingactivityentity = new MarketingActivityEntity(); MarketingActivityEntity marketingactivityentity = new MarketingActivityEntity();
marketingactivityentity.setMobileType(0); marketingactivityentity.setMobileType(0);
marketingactivityentity.setCycle(10); marketingactivityentity.setCycle(20);
MarketingActivityRequest addRequest = new MarketingActivityRequest(); MarketingActivityRequest addRequest = new MarketingActivityRequest();
Date currentDate = new Date(); Date currentDate = new Date();
marketingactivityentity.setStatus(HGSConstant.ActivityStatus.DRAFT.getStatus()); marketingactivityentity.setStatus(HGSConstant.ActivityStatus.DRAFT.getStatus());
marketingactivityentity.setFinishTime(DateTimeUtils.getTimeAfterDays(currentDate, 10)); marketingactivityentity.setFinishTime(DateTimeUtils.getTimeAfterDays(currentDate, 20));
marketingactivityentity.setCreateBy(userEntity.getId()); marketingactivityentity.setCreateBy(userEntity.getId());
marketingactivityentity.setCreateTime(new Date()); marketingactivityentity.setCreateTime(new Date());
marketingactivityentity.setCreateName(userEntity.getRealName()); marketingactivityentity.setCreateName(userEntity.getRealName());
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
</div> </div>
</div> </div>
<input type="hidden" id="cycle" name="entity.cycle" value="10"/> <input type="hidden" id="cycle" name="entity.cycle" value="20"/>
<input type="hidden" id="expectExtractCount" name="entity.expectExtractCount" value="999"/> <input type="hidden" id="expectExtractCount" name="entity.expectExtractCount" value="999"/>
<div class="row-fluid"> <div class="row-fluid">
......
...@@ -1170,7 +1170,7 @@ public class StaffDuty implements IStaffDuty { ...@@ -1170,7 +1170,7 @@ public class StaffDuty implements IStaffDuty {
entity.setActiveTypeName(null); entity.setActiveTypeName(null);
entity.setReturnVisitStatusName(""); entity.setReturnVisitStatusName("");
entity.setStatus(1); entity.setStatus(1);
entity.setFinishTime(DateTimeUtils.getTimeAfterDays(now, 10)); entity.setFinishTime(DateTimeUtils.getTimeAfterDays(now, 20));
entity.setCity("nj"); entity.setCity("nj");
entity.setBlock(""); entity.setBlock("");
entity.setBlockName(""); entity.setBlockName("");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment