From 1cbc3456ff88a4a2a3c41cdc969f8a2d738b654c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 14:03:12 +0800
Subject: [PATCH] 机构详情优化
---
drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java b/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java
index 69d36f5..e577702 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java
@@ -17,6 +17,8 @@
package org.sxkj.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
@@ -29,19 +31,24 @@
import org.springblade.core.tool.utils.CollectionUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.sxkj.common.constant.WordOrderConstant;
import org.sxkj.common.func.Streams;
-import org.sxkj.common.model.ResponseResult;
import org.sxkj.common.node.TreeStringNode;
import org.sxkj.common.utils.NodeTreeUtil;
+import org.sxkj.common.utils.OrderNumUtils;
import org.sxkj.system.cache.SysCache;
import org.sxkj.system.entity.Dept;
+import org.sxkj.system.excel.DeptExcel;
+import org.sxkj.system.excel.DeptImportExcel;
import org.sxkj.system.mapper.DeptMapper;
+import org.sxkj.system.param.DeptExportParam;
+import org.sxkj.system.param.DeptPageParam;
import org.sxkj.system.service.IDeptService;
import org.sxkj.system.vo.DeptVO;
import org.sxkj.system.wrapper.DeptWrapper;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -294,4 +301,51 @@
});
return list;
}
+
+ /**
+ * 分页查询
+ *
+ * @param page
+ * @param deptPageParam
+ * @return
+ */
+ @Override
+ public IPage<DeptVO> selectDeptPage(IPage<DeptVO> page, DeptPageParam deptPageParam) {
+ return baseMapper.selectDeptPage(page, deptPageParam);
+ }
+
+ /**
+ * 导入部门
+ *
+ * @param data
+ * @param isCovered
+ */
+ @Override
+ public void importDept(List<DeptImportExcel> data, Boolean isCovered) {
+ List<Dept> list = new ArrayList<>();
+ data.forEach(deptExcel -> {
+ Dept dept = BeanUtil.copy(deptExcel, Dept.class);
+ list.add(dept);
+ });
+ if (isCovered) {
+ this.saveOrUpdateBatch(list);
+ } else {
+ list.forEach(item -> {
+ String times = OrderNumUtils.initOrderNum2(WordOrderConstant.ORG_CODE);
+ String deptCode = WordOrderConstant.ORG_PREFIX + times;
+ item.setDeptCode(deptCode);
+ });
+ this.saveBatch(list);
+ }
+ }
+
+ @Override
+ public List<DeptExcel> exportDept(DeptExportParam dept) {
+ return baseMapper.exportDept(dept);
+ }
+
+ @Override
+ public DeptVO getDetailWithAreaName(Dept dept) {
+ return baseMapper.getDetailWithAreaName(dept);
+ }
}
--
Gitblit v1.9.3