试验管理修改
This commit is contained in:
parent
c2289cb65e
commit
facb9fa3e8
4
pom.xml
4
pom.xml
|
|
@ -134,7 +134,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.poi</groupId>
|
<groupId>org.apache.poi</groupId>
|
||||||
<artifactId>poi</artifactId>
|
<artifactId>poi</artifactId>
|
||||||
<version>3.17</version>
|
<version>4.1.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--mq-->
|
<!--mq-->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
@ -146,7 +146,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.poi</groupId>
|
<groupId>org.apache.poi</groupId>
|
||||||
<artifactId>poi-ooxml</artifactId>
|
<artifactId>poi-ooxml</artifactId>
|
||||||
<version>3.17</version>
|
<version>4.1.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.xml.bind</groupId>
|
<groupId>javax.xml.bind</groupId>
|
||||||
|
|
|
||||||
|
|
@ -17,10 +17,7 @@ import com.github.pagehelper.PageInfo;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.poi.ss.usermodel.Cell;
|
import org.apache.poi.ss.usermodel.*;
|
||||||
import org.apache.poi.ss.usermodel.CellStyle;
|
|
||||||
import org.apache.poi.ss.usermodel.Row;
|
|
||||||
import org.apache.poi.ss.usermodel.Sheet;
|
|
||||||
import org.apache.poi.ss.util.CellRangeAddress;
|
import org.apache.poi.ss.util.CellRangeAddress;
|
||||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
@ -681,7 +678,7 @@ public class PrimaryDataAppController {
|
||||||
*/
|
*/
|
||||||
public Row setCellValueAndStyle(Row row, int index, String value, CellStyle commonStyle) {
|
public Row setCellValueAndStyle(Row row, int index, String value, CellStyle commonStyle) {
|
||||||
Cell cell = row.createCell(index);
|
Cell cell = row.createCell(index);
|
||||||
cell.setCellType(Cell.CELL_TYPE_STRING);
|
cell.setCellType(CellType.STRING);
|
||||||
cell.setCellValue(value + "");
|
cell.setCellValue(value + "");
|
||||||
cell.setCellStyle(commonStyle);
|
cell.setCellStyle(commonStyle);
|
||||||
return row;
|
return row;
|
||||||
|
|
|
||||||
|
|
@ -714,7 +714,7 @@ public class DownLoadController {
|
||||||
*/
|
*/
|
||||||
public Row setCellValueAndStyle(Row row, int index, String value, CellStyle commonStyle) {
|
public Row setCellValueAndStyle(Row row, int index, String value, CellStyle commonStyle) {
|
||||||
Cell cell = row.createCell(index);
|
Cell cell = row.createCell(index);
|
||||||
cell.setCellType(Cell.CELL_TYPE_STRING);
|
cell.setCellType(CellType.STRING);
|
||||||
cell.setCellValue(value + "");
|
cell.setCellValue(value + "");
|
||||||
cell.setCellStyle(commonStyle);
|
cell.setCellStyle(commonStyle);
|
||||||
return row;
|
return row;
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ public class ExportUtils {
|
||||||
* 总列数
|
* 总列数
|
||||||
* @param row
|
* @param row
|
||||||
*/
|
*/
|
||||||
public void CreateWorkbook(int row){
|
/*public void CreateWorkbook(int row){
|
||||||
Workbook workbook=new HSSFWorkbook();
|
Workbook workbook=new HSSFWorkbook();
|
||||||
Sheet sheet = workbook.createSheet("检测报告");
|
Sheet sheet = workbook.createSheet("检测报告");
|
||||||
//第一行
|
//第一行
|
||||||
|
|
@ -46,7 +46,7 @@ public class ExportUtils {
|
||||||
// cell22.setCellValue("报告编号");
|
// cell22.setCellValue("报告编号");
|
||||||
|
|
||||||
|
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,9 @@ function setParams(params) {
|
||||||
form = layui.form;
|
form = layui.form;
|
||||||
layer = layui.layer;
|
layer = layui.layer;
|
||||||
table = layui.table;
|
table = layui.table;
|
||||||
})
|
|
||||||
getDataById();
|
getDataById();
|
||||||
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**详情*/
|
/**详情*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue