From 0c4b37ef2de376e8d02fe81a6af384929579d662 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 11:30:37 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java | 4 +++-
ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java | 10 +++++++++-
ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java | 2 +-
ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java | 3 +++
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java | 10 +++++++++-
ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml | 3 +++
6 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index cfb16af..fa325a3 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -136,13 +136,21 @@
@ApiOperation("鐢ㄦ埛瀵煎嚭")
- @PostMapping("/import")
+ @PostMapping("/export")
public void exportUser(HttpServletResponse response) {
List<UmsUserDto> umsUserDtos = adminService.userExp();
String sheetName = "鐢ㄦ埛瀵煎嚭";
EasyExcelUtils.export(response, sheetName, UmsUserDto.class, umsUserDtos);
}
+ @ApiOperation("鐢ㄦ埛瀵煎叆")
+ @PostMapping("/import")
+ public CommonResult importUser(MultipartFile file) throws IOException {
+ EasyExcelUtils.importDepartFile(file);
+ return CommonResult.success(true, "瀵煎叆鎴愬姛");
+ }
+
+
@ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛淇℃伅")
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
diff --git a/ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java b/ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java
index 55c8098..ddcc447 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java
+++ b/ycl-common/src/main/java/com/ycl/dto/UmsDepartDto.java
@@ -19,7 +19,7 @@
private String departTypeName;
@ExcelProperty(value = "閮ㄩ棬绫诲瀷", index = 2)
- private Integer departType;
+ private String departType;
@ExcelProperty(value = "涓婄骇閮ㄩ棬", index = 3)
private String parentDepartName;
diff --git a/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java b/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java
index b327b6b..224a51d 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/depart/UmsDepartMapper.java
@@ -25,4 +25,7 @@
List<UmsAdmin> selectSurplusUser();
List<UmsAdmin> selectSurplusUserAndExistUser(@Param("id") Long id);
+
+ String getDepartType(Integer id);
+
}
diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
index a008173..837d69e 100644
--- a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
@@ -148,7 +148,9 @@
.map(item -> {
UmsDepartDto umsDepartDto = new UmsDepartDto();
umsDepartDto.setId(item.getId());
- umsDepartDto.setDepartType(item.getDepartType());
+ umsDepartDto.setParentDepartName(item.getDepartName());
+ String departType = sccgDepartMapper.getDepartType(item.getDepartType());
+ umsDepartDto.setDepartType(departType);
UmsDepart umsDepartFather = sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getDepartName, item.getId()));
if (Objects.isNull(umsDepartFather)){
umsDepartDto.setParentDepartName("");
diff --git a/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java b/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java
index 267d9a7..4a28b40 100644
--- a/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java
+++ b/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java
@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ycl.dto.UmsDepartDto;
import com.ycl.entity.depart.UmsDepart;
+import com.ycl.entity.dict.DataDictionary;
import com.ycl.mapper.depart.UmsDepartMapper;
+import com.ycl.mapper.dict.DataDictionaryMapper;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -16,6 +18,9 @@
@Resource
private UmsDepartMapper sccgDepartMapper;
+
+ @Resource
+ DataDictionaryMapper dataDictionaryMapper;
@Override
@@ -36,7 +41,10 @@
umsDepart.setDepartDes(umsDepartDto.getDepartDes());
// 璁剧疆閮ㄩ棬绫诲瀷
- umsDepart.setDepartType(umsDepartDto.getDepartType());
+// LambdaQueryWrapper<DataDictionary> dataDictionaryLambdaQueryWrapper = new LambdaQueryWrapper<DataDictionary>(DataDictionary::getName, umsDepartDto.getDepartTypeName());
+//// DataDictionary dataDictionary = dataDictionaryMapper.selectOne(new LambdaQueryWrapper(DataDictionary));
+//// sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>(UmsDepart::getDepartType))
+//// umsDepart.setDepartType(umsDepartDto.getDepartType());
// 璁剧疆鐖秈d
UmsDepart two = sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getDepartName, umsDepartDto.getParentDepartName()));
diff --git a/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
index dd6817e..de105cc 100644
--- a/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
+++ b/ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml
@@ -94,4 +94,7 @@
HAVING
count( * )= 1
</select>
+ <select id="getDepartType" resultType="java.lang.String">
+ select name from ums_data_dictionary where id = #{id}
+ </select>
</mapper>
--
Gitblit v1.8.0