From 98b253d649a8c41c43ed0317923ed50392bbd0a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 Aug 2021 15:16:17 +0800
Subject: [PATCH] 1.新增派遣单位导入 2.部门查询接口修改
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
index c39ac60..1cbb51d 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -22,21 +22,31 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.entity.DispatcherUnit;
+import org.springblade.modules.dispatcher.excel.DispatcherUnitExcel;
+import org.springblade.modules.dispatcher.excel.DispatcherUnitImporter;
import org.springblade.modules.dispatcher.service.IDispatcherService;
import org.springblade.modules.dispatcher.service.IDispatcherUnitService;
import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springblade.modules.exam.excel.ExamScoreExcel;
+import org.springblade.modules.exam.excel.ExamScoreImporter;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* 控制器
@@ -80,6 +90,18 @@
return R.data(pages);
}
+
+ /**
+ * 自定义树
+ * @param dispatcher
+ * @return
+ */
+ @GetMapping("/page-tree")
+ public R pageTree(DispatcherUnitVO dispatcher) {
+ List<DispatcherUnitVO> pages = dispatcherUnitService.selectDispatcherUnitPageTree(dispatcher);
+ return R.data(pages);
+ }
+
/**
* 新增
*/
@@ -100,8 +122,8 @@
* 新增或修改
*/
@PostMapping("/submit")
- public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) {
- if (null==dispatcherUnit.getId()){
+ public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) throws Exception {
+ if (null==dispatcherUnit.getId()) {
dispatcherUnit.setCreateTime(new Date());
}
return R.status(dispatcherUnitService.saveOrUpdate(dispatcherUnit));
@@ -113,9 +135,31 @@
*/
@PostMapping("/remove")
@ApiOperation(value = "删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) throws Exception {
return R.status(dispatcherUnitService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 导入派遣单位数据
+ * @param isCovered 1 覆盖 0不覆盖
+ * @return
+ */
+ @PostMapping("import-dispatcherUnit")
+ public R importDispatcherUnit(MultipartFile file, Integer isCovered) {
+ DispatcherUnitImporter dispatcherImporter = new DispatcherUnitImporter(dispatcherUnitService, false);
+ ExcelUtil.save(file, dispatcherImporter, DispatcherUnitExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperation(value = "导出模板")
+ public void exportUser(HttpServletResponse response) {
+ List<DispatcherUnitExcel> list = new ArrayList<>();
+ ExcelUtil.export(response, "派遣单位数据导入模板", "派遣单位数据表", list, DispatcherUnitExcel.class);
+ }
+
}
--
Gitblit v1.9.3