From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDepartmentServiceImpl.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDepartmentServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDepartmentServiceImpl.java
index 215534d..e804af7 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDepartmentServiceImpl.java
+++ b/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;
@@ -17,10 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -62,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));
}
@@ -91,4 +94,29 @@
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);
+ }
+ }
+ }
}
--
Gitblit v1.8.0