提交 3adb7570 作者: 925993793@qq.com

导入导出逻辑优化调整-遗漏提交

上级 74dfeb42
......@@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
......@@ -216,20 +215,6 @@ public class ThinktankBasicInfoController {
return bytes;
}
/* @PostMapping("/batchExport")
public byte[] batchExport(@RequestBody ThinktankBasicInfoListVo thinktankBasicInfoListVo,HttpServletRequest request, HttpServletResponse response){
log.info("导出:{}", thinktankBasicInfoListVo);
// Integer pageNo = thinktankBasicInfoListVo.getPageNo();
// Integer pageSize= thinktankBasicInfoListVo.getPageSize();
// if(pageNo < 1)
// pageNo = 1;
// if(pageSize < 0)
// pageSize = 10;
// Integer office = pageSize * (pageNo - 1);
// thinktankBasicInfoListVo.setOffset(office);
return thinktankBasicInfoService.batchExport(thinktankBasicInfoListVo,request,response);
}*/
@GetMapping("/listBaseData")
public Result<?> getListBaseData(@RequestParam(name = "id", required = true) String id,
@RequestParam(name = "pageNo", required = true) Integer pageNo,
......
......@@ -3,9 +3,7 @@ package com.zzsn.thinktank.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zzsn.thinktank.entity.ThinktankBasicInfo;
import com.zzsn.thinktank.vo.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
......@@ -29,10 +27,6 @@ public interface ThinktankBasicInfoService extends IService<ThinktankBasicInfo>
void downloadTemplate(HttpServletResponse response);
Result batchImport(MultipartFile multipartFile);
byte[] batchExport(ThinktankBasicInfoListVo thinktankBasicInfoListVo, HttpServletRequest request, HttpServletResponse response);
Result<?> getListBaseData(String id, Integer pageNo, Integer pageSize, Integer office);
/**
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论