Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

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

@@ -1,30 +1,25 @@
package com.kidgrow.usercenter.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.model.PageResult;
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;
import com.kidgrow.usercenter.service.ISysDepartmentService;
import com.kidgrow.usercenter.service.ISysHospitalService;
import com.kidgrow.usercenter.service.ISysOrganizationService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.kidgrow.common.model.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.service.impl.SuperServiceImpl;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

import org.apache.commons.collections4.MapUtils;
import lombok.extern.slf4j.Slf4j;

import com.kidgrow.usercenter.model.SysDepartment;
import com.kidgrow.usercenter.mapper.SysDepartmentMapper;
import com.kidgrow.usercenter.service.ISysDepartmentService;

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -65,6 +60,11 @@
    }

    @Override
    public boolean updatePay(Long departmentId, boolean isPay) {
        return baseMapper.updatePay(departmentId,isPay);
    }

    @Override
    public ResultBody findAll(Map<String, Object> params) {
        return  ResultBody.ok().data(baseMapper.selectByMap(params));
    }
@@ -88,4 +88,35 @@
        }
        return ResultBody.ok().data(sysDepartments);
    }

    @Override
    public String checkDepartmentName(Long hosId, String departmentName) {
        String departName=baseMapper.checkDepartmentName(hosId,departmentName);
        return departName;
    }

    @Override
    public ResultBody getHealth(SysDepartment sysDepartment) {
        SysDepartment department = baseMapper.selectById(sysDepartment.getId());
        if(department==null){
            return ResultBody.failed("该数据为空");
        }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()<=endDate.getTime()){
                    return ResultBody.ok().data(department);
                }else if(endDate.getTime()<now.getTime()) {
                    department.setIsHealth(false);
                    return ResultBody.ok().data(department);
                }
                return ResultBody.ok();
            }else {
                return ResultBody.ok().data(false);
            }
        }
    }
}