From c9424db1c23fcddd6f4eabdb5e3ef51d2c208613 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 24 Aug 2021 16:09:49 +0800
Subject: [PATCH] 派遣记录，单位数据内网推送
---
src/main/java/org/springblade/modules/equipage/controller/EquipageController.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
index e6eb213..028ce1e 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/EquipageController.java
@@ -5,15 +5,25 @@
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
+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.equipage.entity.Equipage;
+import org.springblade.modules.equipage.excel.EquipageExcel;
+import org.springblade.modules.equipage.excel.EquipageImporter;
import org.springblade.modules.equipage.service.EquipageService;
import org.springblade.modules.equipage.vo.EquipageVo;
+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 java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* @author zhongrj
@@ -63,10 +73,10 @@
*/
@PostMapping("/submit")
public R submit(@RequestBody Equipage equipage) throws Exception {
- if (equipage.getId()==null){
- arg arg = new arg();
- arg.test01(arg.url+"/equipage/save",equipage);
- }
+// if (equipage.getId()==null){
+// arg arg = new arg();
+// arg.test01(arg.url+"/equipage/save",equipage);
+// }
return R.status(equipageService.saveOrUpdate(equipage));
}
@@ -76,7 +86,7 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
- arg.sendPostRemoveByIds(arg.url+"/equipage/remove",ids);
+ //arg.sendPostRemoveByIds(arg.url+"/equipage/remove",ids);
return R.status(equipageService.removeByIds(Func.toLongList(ids)));
}
@@ -91,4 +101,27 @@
return R.data(detail);
}
+ /**
+ * 导入装备数据
+ * @param isCovered 1 覆盖 0不覆盖
+ * @return
+ */
+ @PostMapping("import-equipage")
+ @ApiOperation(value = "导入装备数据", notes = "传入excel")
+ public R importExamScore(MultipartFile file, Integer isCovered) {
+ EquipageImporter equipageImporter = new EquipageImporter(equipageService, false);
+ ExcelUtil.save(file, equipageImporter, EquipageExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperation(value = "导出模板")
+ public void exportUser(HttpServletResponse response) {
+ List<EquipageExcel> list = new ArrayList<>();
+ ExcelUtil.export(response, "装备导入数据模板", "装备导入数据表", list, EquipageExcel.class);
+ }
+
}
--
Gitblit v1.9.3