From d3386ce4a4439ee740ca79d33ac7040963a18948 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 24 Apr 2020 11:31:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
index 5ec8aaf..19f9335 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
@@ -3,8 +3,10 @@
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.utils.ExcelUtil;
import com.kidgrow.oprationcenter.model.DataNeed;
import com.kidgrow.oprationcenter.service.IDataNeedService;
+import com.kidgrow.oprationcenter.vo.DataNeedExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -14,7 +16,10 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
import java.util.Map;
@@ -60,6 +65,14 @@
DataNeed model = dataNeedService.getById(id);
return ResultBody.ok().data(model).msg("查询成功");
}
+ /**
+ *更新状态和文件地址
+ */
+ @ApiOperation(value = "查询")
+ @GetMapping("updateEnabled")
+ public ResultBody updateEnabled(@RequestParam Map<String,Object> map) {
+ return dataNeedService.updateEnabled(map);
+ }
/**
* 根据DataNeed当做查询条件进行查询
@@ -94,4 +107,16 @@
dataNeedService.removeById(id);
return ResultBody.ok().msg("删除成功");
}
+ /**
+ * 导出excel
+ *
+ * @return
+ */
+ @PostMapping("/export")
+ public ResultBody exportUser(@RequestParam Map<String, Object> params, HttpServletResponse response) throws IOException {
+ List<DataNeedExcel> result = dataNeedService.findListExportByParam(params);
+ //导出操作
+ ExcelUtil.exportExcel(result, null, "数据需求", DataNeedExcel.class, "DataNeed", response);
+ return ResultBody.ok().msg("导出数据成功");
+ }
}
--
Gitblit v1.8.0