p96170835
/
diboot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新单元测试

This commit is contained in:
mazhicheng 2020-07-05 12:15:11 +08:00
parent 3dfddd290e
commit 512d4503d7
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diboot-core/src/main/java/com/diboot/core/binding/QueryBuilder.java
View File

@ -161,7 +161,7 @@ public class QueryBuilder {
// 对比类型 // 对比类型
Comparison comparison = Comparison.EQ; Comparison comparison = Comparison.EQ;
// 转换条件 // 转换条件
String columnName = getColumnName(field);; String columnName = getColumnName(field);
if(query != null){ if(query != null){
comparison = query.comparison(); comparison = query.comparison();
AnnoJoiner annoJoiner = ParserCache.getAnnoJoiner(dto.getClass(), entry.getKey()); AnnoJoiner annoJoiner = ParserCache.getAnnoJoiner(dto.getClass(), entry.getKey());

2
diboot-file-starter/pom.xml
View File

@ -51,12 +51,14 @@
<groupId>net.coobird</groupId> <groupId>net.coobird</groupId>
<artifactId>thumbnailator</artifactId> <artifactId>thumbnailator</artifactId>
<version>0.4.11</version> <version>0.4.11</version>
<optional>true</optional>
</dependency> </dependency>
<!-- 验证码示例 --> <!-- 验证码示例 -->
<dependency> <dependency>
<groupId>com.github.whvcse</groupId> <groupId>com.github.whvcse</groupId>
<artifactId>easy-captcha</artifactId> <artifactId>easy-captcha</artifactId>
<version>1.6.2</version> <version>1.6.2</version>
<optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>

8
diboot-file-starter/src/test/java/com/diboot/file/example/custom/DepartmentExcelModel.java
View File

@ -61,12 +61,4 @@ public class DepartmentExcelModel extends BaseExcelModel {
@ExcelBindDict(type = "USER_STATUS") @ExcelBindDict(type = "USER_STATUS")
@ExcelProperty(value = "状态", index = 4) @ExcelProperty(value = "状态", index = 4)
private String userStatus; private String userStatus;
@ExcelBindField(entity = UploadFile.class, field = "fileName", setIdField = "fileUid",
duplicate = DuplicateStrategy.WARN, empty = EmptyStrategy.SET_0)
@ExcelProperty(value = "文件", index = 5)
private String fileName;
private String fileUid;
} }

8
diboot-file-starter/src/test/java/com/diboot/file/example/test/ExcelWriteTest.java
View File

@ -40,11 +40,11 @@ public class ExcelWriteTest extends ApplicationTest {
*/ */
public List<List<String>> buildNormalData(){ public List<List<String>> buildNormalData(){
List<List<String>> dataList = new ArrayList<>(); List<List<String>> dataList = new ArrayList<>();
dataList.add(Arrays.asList("上级部门", "单位", "名称", "数量", "状态", "文件")); dataList.add(Arrays.asList("上级部门", "单位", "名称", "数量", "状态"));
dataList.add(Arrays.asList("产品部", "dibo", "研发中心", "10", "在职", "department.xlsx")); dataList.add(Arrays.asList("产品部", "dibo", "研发中心", "10", "在职"));
dataList.add(Arrays.asList("", "dibo", "营销中心", "10", "在职", "")); dataList.add(Arrays.asList("", "dibo", "营销中心", "10", "在职"));
dataList.add(Arrays.asList("产品部", "dibo", "财务部", "10", "离职", null)); dataList.add(Arrays.asList("产品部", "dibo", "财务部", "10", "离职"));
return dataList; return dataList;
} }