修改时间的bug

zhaoxiaohao

2020-11-16 f30a977b18541d2f1b9a7863b1377e5f366df9dc

修改时间的bug

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java

@@ -1,6 +1,7 @@
package com.kidgrow.usercenter.model;

import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.kidgrow.common.model.SuperModel;
@@ -94,9 +95,11 @@
    /**
     * 运动处方服务生效时间
     */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    private Date healthBeginTime;
    /**
     * 运动处方服务结束时间
     */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    private Date healthEndTime;
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDepartmentServiceImpl.java

@@ -6,6 +6,7 @@
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.DateUtils;
import com.kidgrow.usercenter.mapper.SysDepartmentMapper;
import com.kidgrow.usercenter.model.SysDepartment;
import com.kidgrow.usercenter.model.SysHospital;
@@ -102,12 +103,13 @@
        }else {
            if(department.getIsHealth()){
                Date now= new Date();
                Date endDate = DateUtils.addDays(department.getHealthEndTime(), 1);
                if(now.getTime()<department.getHealthBeginTime().getTime()){
                    department.setIsHealth(false);
                    return ResultBody.ok().data(department);
                }else if(department.getHealthBeginTime().getTime()<=now.getTime()&&now.getTime()<=department.getHealthEndTime().getTime()){
                }else if(department.getHealthBeginTime().getTime()<=now.getTime()&&now.getTime()<=endDate.getTime()){
                    return ResultBody.ok().data(department);
                }else if(department.getHealthEndTime().getTime()<now.getTime()) {
                }else if(endDate.getTime()<now.getTime()) {
                    department.setIsHealth(false);
                    return ResultBody.ok().data(department);
                }