|
@@ -6,6 +6,7 @@ import com.alibaba.excel.exception.ExcelDataConvertException; |
|
@@ -6,6 +6,7 @@ import com.alibaba.excel.exception.ExcelDataConvertException; |
6
|
import com.alibaba.fastjson.JSONObject;
|
6
|
import com.alibaba.fastjson.JSONObject;
|
7
|
import com.ash.base.*;
|
7
|
import com.ash.base.*;
|
8
|
import com.ash.base.excelOpt.ExcelErrorMessage;
|
8
|
import com.ash.base.excelOpt.ExcelErrorMessage;
|
|
|
9
|
+import com.ash.entity.Case;
|
9
|
import com.ash.entity.WarningInstance;
|
10
|
import com.ash.entity.WarningInstance;
|
10
|
import com.ash.entity.WarningInstanceAnalysis;
|
11
|
import com.ash.entity.WarningInstanceAnalysis;
|
11
|
import com.ash.entity.dao.WarningInstanceMapper;
|
12
|
import com.ash.entity.dao.WarningInstanceMapper;
|
|
@@ -367,7 +368,7 @@ public class WarningInstanceService { |
|
@@ -367,7 +368,7 @@ public class WarningInstanceService { |
367
|
}
|
368
|
}
|
368
|
}
|
369
|
}
|
369
|
|
370
|
|
370
|
- lambda.orderByDesc(BaseModel::getCreateTime, WarningInstance::getCode);
|
371
|
+ lambda.orderByDesc(BaseModel::getCreateTime, WarningInstance::getCode, WarningInstance::getId);
|
371
|
return queryWrapper;
|
372
|
return queryWrapper;
|
372
|
}
|
373
|
}
|
373
|
|
374
|
|