Commit a0107fcd authored by wujipeng's avatar wujipeng
Browse files

Merge remote-tracking branch 'origin/dev' into dev

parents 545a6cc7 a7ae1554
...@@ -125,7 +125,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -125,7 +125,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
if (caseEntity == null) { if (caseEntity == null) {
return graph; return graph;
} }
if (caseEntity.getDrawFlag()) { if (Boolean.TRUE.equals(caseEntity.getDrawFlag())) {
//查询数据库数据 //查询数据库数据
List<NodeVO> nodeVOList = nodeService.queryByCaseId(caseDTO.getId()); List<NodeVO> nodeVOList = nodeService.queryByCaseId(caseDTO.getId());
List<EdgeVO> edgeVOList = edgeService.queryByCaseId(caseDTO.getId()); List<EdgeVO> edgeVOList = edgeService.queryByCaseId(caseDTO.getId());
...@@ -181,15 +181,31 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -181,15 +181,31 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
iterator.remove(); iterator.remove();
continue; continue;
} }
} else if (caseDTO.getMinAmount() != null) {
if (excelDataEntity.getAmount() < caseDTO.getMinAmount()) {
iterator.remove();
continue;
}
} else if (caseDTO.getMaxAmount() != null && excelDataEntity.getAmount() > caseDTO.getMaxAmount()) {
iterator.remove();
continue;
} }
// 检查交易次数过滤条件 // 检查交易次数过滤条件
if (caseDTO.getMinTransaction() != null && caseDTO.getMaxTransaction() != null) { if (caseDTO.getMinTransaction() != null && caseDTO.getMaxTransaction() != null) {
if (excelDataEntity.getTransactionCount() < caseDTO.getMinTransaction() || if (excelDataEntity.getTransactionCount() < caseDTO.getMinTransaction() ||
excelDataEntity.getTransactionCount() > caseDTO.getMaxTransaction()) { excelDataEntity.getTransactionCount() > caseDTO.getMaxTransaction()) {
iterator.remove(); iterator.remove();
} }
} } else if (caseDTO.getMinTransaction() != null) {
if (excelDataEntity.getTransactionCount() < caseDTO.getMinTransaction()) {
iterator.remove();
}
} else if (caseDTO.getMaxTransaction() != null && excelDataEntity.getTransactionCount() > caseDTO.getMaxTransaction()) {
iterator.remove();
}
} }
if (caseDTO.getWhiteFlag() != null && caseDTO.getWhiteFlag()) { if (caseDTO.getWhiteFlag() != null && caseDTO.getWhiteFlag()) {
...@@ -212,7 +228,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -212,7 +228,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
String payee = excelDataEntity.getPayeeName(); String payee = excelDataEntity.getPayeeName();
double amount = excelDataEntity.getAmount(); double amount = excelDataEntity.getAmount();
BigDecimal bd = new BigDecimal(amount); BigDecimal bd = BigDecimal.valueOf(amount);
bd = bd.setScale(2, RoundingMode.HALF_UP); // 保留两位小数,四舍五入 bd = bd.setScale(2, RoundingMode.HALF_UP); // 保留两位小数,四舍五入
double formattedAmount = bd.doubleValue(); double formattedAmount = bd.doubleValue();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment