活动搜索bug

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ActivityDO.java

@@ -91,8 +91,8 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
    /**
     * 活动发布、上线时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date releaseTime;
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
//    private Date releaseTime;
    /**
     * 实用范围名称
     */
@@ -398,13 +398,13 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
        this.globelTemplate = globelTemplate;
    }
    public Date getReleaseTime() {
        return releaseTime;
    }
    public void setReleaseTime(Date releaseTime) {
        this.releaseTime = releaseTime;
    }
//    public Date getReleaseTime() {
//        return releaseTime;
//    }
//
//    public void setReleaseTime(Date releaseTime) {
//        this.releaseTime = releaseTime;
//    }
    public String getAreaName() {
        return areaName;

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/ActivityController.java

@@ -11,6 +11,7 @@ import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.health.bank.HealthBankMapping;
import com.yihu.jw.service.ActivityService;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -19,7 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@@ -222,9 +225,9 @@ public class ActivityController extends EnvelopRestEndpoint {
                                               @RequestParam(value = "status", required = false) String status,
                                               @ApiParam(name = "crowdType", value = "人群类型：1:签约居民、2平台用户")
                                               @RequestParam(value = "crowdType", required = false) String crowdType,
                                               @ApiParam(name = "releaseTime", value = "上线时间")
                                               @ApiParam(name = "releaseTime", value = "下线开始时间")
                                               @RequestParam(value = "releaseTime", required = false) String releaseTime,
                                               @ApiParam(name = "activityOfflineTime", value = "下线时间")
                                               @ApiParam(name = "activityOfflineTime", value = "下线结束时间")
                                               @RequestParam(value = "activityOfflineTime", required = false) String activityOfflineTime,
                                               @ApiParam(name = "filter", value = "活动名、发布机构、面向范围名称")
                                               @RequestParam(value = "filter", required = false) String filter,
@@ -248,10 +251,10 @@ public class ActivityController extends EnvelopRestEndpoint {
                stringBuffer.append("crowdType="+crowdType+";");
            }
            if(StringUtils.isNotBlank(releaseTime)){
                stringBuffer.append("releaseTime?"+releaseTime+";");
                stringBuffer.append("activityOfflineTime>="+releaseTime+" 00:00:00;");
            }
            if(StringUtils.isNotBlank(activityOfflineTime)){
                stringBuffer.append("activityOfflineTime?"+activityOfflineTime+";");
                stringBuffer.append("activityOfflineTime<="+ activityOfflineTime+" 59:59:59;");
            }
            String sorts="-createTime";
            List<ActivityDO> activityDOList = service.search("", stringBuffer.toString(), sorts, page, size);

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

@@ -67,9 +67,9 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
        }
        activityDO.setCreateTime(new Date());
        activityDO.setUpdateTime(new Date());
        if (1 == activityDO.getStatus()) {
            activityDO.setReleaseTime(new Date());
        }
//        if (1 == activityDO.getStatus()) {
//            activityDO.setReleaseTime(new Date());
//        }
        activityDO.setDelFlag(1);
        activityDO= activityDao.save(activityDO);
        ActivityRuleDO activityRuleDO = new ActivityRuleDO();
@@ -148,9 +148,9 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
        ActivityRuleDO activityRuleDO = activityRuleDao.selectByActivityId(activityDO.getId());
        activityRuleDO.setUpdateTime(new Date());
        activityRuleDO.setSaasId("dev");
        if (1 == activityDO.getStatus()) {
            activityDO.setReleaseTime(new Date());
        }
//        if (1 == activityDO.getStatus()) {
//            activityDO.setReleaseTime(new Date());
//        }
        activityRuleDO.setValue1(value1);
        activityRuleDO.setValue2(value2);
        activityRuleDO.setValue3(value3);
@@ -346,7 +346,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                activityDO.setStatus(1);
            }
        }
        activityDO.setReleaseTime(new Date());
//        activityDO.setReleaseTime(new Date());
        activityDO=  activityDao.save(activityDO);
        return activityDO;
    }