Commit 505e0332e10f4cb4ca6a347118c12224555d96f4

Authored by 胡翰林
1 parent a7e83b3e

bug修复

... ... @@ -130,7 +130,7 @@ public class CaseService {
130 130 public List<Case> list(Case params) {
131 131 QueryWrapper<Case> queryWrapper = getCondition(params);
132 132 List<Case> dataList = caseMapper.selectList(queryWrapper);
133   - if(!CollectionUtils.isEmpty(dataList)){
  133 + if (!CollectionUtils.isEmpty(dataList)) {
134 134 List<String> caseIds = dataList
135 135 .stream().map(Case::getId).collect(Collectors.toList());
136 136 Map<String, CaseAnalysis> caseAnalysisMap = caseAnalysisService.listByCaseId(caseIds);
... ... @@ -645,7 +645,7 @@ public class CaseService {
645 645 }
646 646 }
647 647
648   - lambda.orderByDesc(BaseModel::getCreateTime);
  648 + lambda.orderByDesc(BaseModel::getCreateTime, Case::getCode);
649 649
650 650 return queryWrapper;
651 651 }
... ... @@ -658,14 +658,14 @@ public class CaseService {
658 658 } catch (ExcelAnalysisException e) {
659 659 return listener.getErrorList();
660 660 } catch (ExcelDataConvertException e) {
661   - List<ExcelErrorMessage> errorList=new ArrayList<>();
  661 + List<ExcelErrorMessage> errorList = new ArrayList<>();
662 662 ExcelErrorMessage eem = new ExcelErrorMessage().setMessage("模板错误");
663 663 errorList.add(eem);
664 664 return errorList;
665 665 } catch (Exception ex) {
666 666 ex.printStackTrace();
667 667 log.info("导入失败,异常,", ex);
668   - List<ExcelErrorMessage> errorList=new ArrayList<>();
  668 + List<ExcelErrorMessage> errorList = new ArrayList<>();
669 669 ExcelErrorMessage eem = new ExcelErrorMessage().setMessage("系统异常");
670 670 errorList.add(eem);
671 671 return errorList;
... ... @@ -691,7 +691,7 @@ public class CaseService {
691 691 if (analysisResult == null) {
692 692 cd.setAnalysisStatus(AnalysisStatusEnum.fail);
693 693 update(cd);
694   - } else{
  694 + } else {
695 695 // JSONObject analysisData = analysisResult.getJSONObject("data");
696 696 CaseAnalysis wa = new CaseAnalysis();
697 697 wa.setCaseId(cd.getId());
... ...