优化及注释
This commit is contained in:
parent
64411c927e
commit
7240434fc3
|
|
@ -118,6 +118,9 @@ public class TestReportManageController {
|
||||||
return testReportManageService.viewTestData(data.getData());
|
return testReportManageService.viewTestData(data.getData());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下载合格证--word
|
||||||
|
*/
|
||||||
@GetMapping("/downloadReport")
|
@GetMapping("/downloadReport")
|
||||||
public void downloadReport(HttpServletRequest request, HttpServletResponse response){
|
public void downloadReport(HttpServletRequest request, HttpServletResponse response){
|
||||||
// 处理请求参数
|
// 处理请求参数
|
||||||
|
|
@ -214,6 +217,9 @@ public class TestReportManageController {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 一级页面--检测报告打包下载
|
||||||
|
*/
|
||||||
@GetMapping("/download")
|
@GetMapping("/download")
|
||||||
public ResponseEntity<FileSystemResource> downloadFile(HttpServletRequest request) {
|
public ResponseEntity<FileSystemResource> downloadFile(HttpServletRequest request) {
|
||||||
File tempZipFile = null;
|
File tempZipFile = null;
|
||||||
|
|
|
||||||
|
|
@ -220,6 +220,7 @@ public class TestReportManageServiceImpl implements TestReportManageService {
|
||||||
if (serverResponse.isSuccess()) {
|
if (serverResponse.isSuccess()) {
|
||||||
TestReportManageDto testVo = (TestReportManageDto) serverResponse.getData();
|
TestReportManageDto testVo = (TestReportManageDto) serverResponse.getData();
|
||||||
log.info("sj--->{}", testVo);
|
log.info("sj--->{}", testVo);
|
||||||
|
//生成检测报告
|
||||||
generateReport(testVo, zos);
|
generateReport(testVo, zos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -237,7 +238,6 @@ public class TestReportManageServiceImpl implements TestReportManageService {
|
||||||
* 生成检测报告
|
* 生成检测报告
|
||||||
*/
|
*/
|
||||||
public void generateReport(TestReportManageDto bean,ZipOutputStream zos) throws IOException {
|
public void generateReport(TestReportManageDto bean,ZipOutputStream zos) throws IOException {
|
||||||
String path = "D:\\poi\\";
|
|
||||||
//先计算出总共有多少列和动态生成的有多少列
|
//先计算出总共有多少列和动态生成的有多少列
|
||||||
//总列数
|
//总列数
|
||||||
int totalNum = 0;
|
int totalNum = 0;
|
||||||
|
|
|
||||||
|
|
@ -321,7 +321,7 @@ function dispatch() {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="layui-form-item" style="margin-top: 45%;margin-left: 46%">
|
<div class="layui-form-item" style="margin-top: 45%;margin-left: 46%">
|
||||||
<button class="layui-btn" lay-filter="demo-login">取消</button>
|
<button id="cancel-btn" class="layui-btn">取消</button>
|
||||||
<button class="layui-btn" lay-submit lay-filter="upload">确认派工</button>
|
<button class="layui-btn" lay-submit lay-filter="upload">确认派工</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -357,6 +357,10 @@ function dispatch() {
|
||||||
error(xhr)
|
error(xhr)
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
// 取消按钮点击事件
|
||||||
|
$('#cancel-btn').on('click', function () {
|
||||||
|
layer.closeAll(); // 关闭所有弹层
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="layui-inline btns" style="width: 67%">
|
<div class="layui-inline btns" style="width: 65%">
|
||||||
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="query(1)">查询
|
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="query(1)">查询
|
||||||
</button>
|
</button>
|
||||||
<button type="button" style="margin-left: 85%" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="batchDownload()"><i class="layui-icon layui-icon-download-circle" style="font-size: 24px;"></i></button>
|
<button type="button" style="margin-left: 85%" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="batchDownload()"><i class="layui-icon layui-icon-download-circle" style="font-size: 24px;"></i></button>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue