From a1188a66f0549522068adde2fee430015077410c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 15:48:14 +0800
Subject: [PATCH] 接口整理
---
server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java
index d05fba5..9033b0b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/HolidaysServiceImpl.java
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -10,11 +12,15 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.UUID;
/**
* 鑺傚亣鏃ラ厤缃〃Service瀹炵幇
@@ -28,9 +34,27 @@
private HolidaysMapper holidaysMapper;
@Override
- public String create(Holidays holidays) {
- holidaysMapper.insert(holidays);
- return holidays.getId();
+ public String create(Holidays model) {
+ Holidays param = isHolidayCreated(model.getHoliday());
+ if(param!=null){
+ return param.getId();
+ }
+ LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ model.setIsdeleted(Constants.ZERO);
+ model.setId(UUID.randomUUID().toString());
+ model.setCreateDate(new Date());
+ model.setCreator(user.getId());
+
+ holidaysMapper.insert(model);
+ return model.getId();
+ }
+ @Override
+ public Holidays isHolidayCreated(String date) {
+ Holidays d = new Holidays();
+ d.setIsdeleted(Constants.ZERO);
+ d.setHoliday(date);
+ return findOne(d) ;
}
@Override
@@ -54,6 +78,10 @@
@Override
public void updateById(Holidays holidays) {
+
+ LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ holidays.setEditDate(new Date());
+ holidays.setEditor(user.getId());
holidaysMapper.updateById(holidays);
}
@@ -75,11 +103,12 @@
@Override
public Holidays findOne(Holidays holidays) {
QueryWrapper<Holidays> wrapper = new QueryWrapper<>(holidays);
- return holidaysMapper.selectOne(wrapper);
+ return holidaysMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
public List<Holidays> findList(Holidays holidays) {
+ holidays.setIsdeleted(Constants.ZERO);
QueryWrapper<Holidays> wrapper = new QueryWrapper<>(holidays);
return holidaysMapper.selectList(wrapper);
}
@@ -89,6 +118,7 @@
IPage<Holidays> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Holidays> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(Holidays::getId, pageWrap.getModel().getId());
}
@@ -113,8 +143,7 @@
queryWrapper.lambda().eq(Holidays::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getHoliday() != null) {
- queryWrapper.lambda().ge(Holidays::getHoliday, Utils.Date.getStart(pageWrap.getModel().getHoliday()));
- queryWrapper.lambda().le(Holidays::getHoliday, Utils.Date.getEnd(pageWrap.getModel().getHoliday()));
+ queryWrapper.lambda().like(Holidays::getHoliday, pageWrap.getModel().getHoliday());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
--
Gitblit v1.9.3