From 1466ee58f3893b631a0d6711ede0320f252b2657 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 22 二月 2021 01:36:25 +0800
Subject: [PATCH] 增加接口
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccessoryService.java | 3 +++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java | 3 ++-
febs-server/febs-server-hr/src/main/resources/bootstrap.yml | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java | 12 +++++++++++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 9 +++++++++
5 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
index a144f95..3775104 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
@@ -16,7 +16,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Map;
@@ -119,4 +118,15 @@
throw new FebsException(message);
}
}
+ @GetMapping("{labelid}")
+ @PreAuthorize("hasAuthority('empAccessory:delete')")
+ public FebsResponse getLabelCount(@PathVariable(value = "labelid") String labelid) throws FebsException {
+ try {
+ return new FebsResponse().data(empAccessoryService.getLabelCount(Long.valueOf(labelid)));
+ } catch (Exception e) {
+ String message = "修改Label失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccessoryService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccessoryService.java
index b6a5da9..0a7c6b3 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccessoryService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccessoryService.java
@@ -63,4 +63,7 @@
void mvFiles(String accessoryids,Long labelid,Long empId);
void singledownload(String empIds, Long labelid, HttpServletRequest request, HttpServletResponse response) throws Exception;
+
+
+ Integer getLabelCount(Long labelId);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
index df38b2c..c5da938 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -253,4 +253,13 @@
FileUtil.del(new StringBuilder().append(mianFileStr, 0, mianFileStr.length() - 1).append(".zip").toString());
FileUtil.del(mianFileStr);
}
+
+
+ @Override
+ public Integer getLabelCount(Long labelId) {
+ LambdaQueryWrapper<EmpAccessory> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(EmpAccessory::getDelFlag,0);
+ wrapper.eq(EmpAccessory::getLabelid,labelId);
+ return this.count(wrapper);
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java
index eeef584..a06ba80 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java
@@ -61,7 +61,7 @@
@Transactional(rollbackFor = Exception.class)
public void createLabel(Label label) throws FebsException {
LambdaQueryWrapper<Label> queryWrapper = new LambdaQueryWrapper();
- queryWrapper.eq(Label::getLabelname, label.getLabelname()).or().eq(Label::getLabelcode, label.getLabelcode());
+ queryWrapper.eq(Label::getDelFlag,0).and(i->i.eq(Label::getLabelname, label.getLabelname()).or().eq(Label::getLabelcode, label.getLabelcode()));
Label l = this.getOne(queryWrapper);
if (null != l && StrUtil.equals(label.getLabelname(), l.getLabelname())) {
throw new FebsException("标签名字重复");
@@ -94,4 +94,5 @@
wapper.set(Label::getModifytime,new Date());
this.update(wapper);
}
+
}
diff --git a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
index 621e447..052ea73 100644
--- a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
+++ b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@
config:
server-addr: ${nacos.url}:8848
group: DEFAULT_GROUP
- prefix: febs-server-Hr
+ prefix: febs-server-hr
file-extension: yaml
discovery:
server-addr: ${nacos.url}:8848
--
Gitblit v1.8.0