Commit 81020ede authored by zhuxiang's avatar zhuxiang
Browse files

优化

parent f8174dee
......@@ -342,7 +342,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
.doubleValue();
}
private void updateEdgeMap(Map<String, EdgeVO> edgeMap,
private void updateEdgeMap(Map<String, EdgeVO> edgeMap,
String payer,
String payee,
double amount,
......
......@@ -21,6 +21,8 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.util.*;
......@@ -108,7 +110,6 @@ public class GroupDetailServiceImpl extends ServiceImpl<GroupDetailMapper, Group
}
List<ExcelDataVO> excelDataEntityList = filterExcelData(caseDTO, personMap);
// 遍历结果集
for (ExcelDataVO excelDataVO : excelDataEntityList) {
String payer = excelDataVO.getPayUserName();
......@@ -126,20 +127,15 @@ public class GroupDetailServiceImpl extends ServiceImpl<GroupDetailMapper, Group
String edgeKey = payer + "-" + payee;
// 检查是否已经存在这条边
if (edgeMap.containsKey(edgeKey)) {
// 如果存在,更新总笔数和总金额
EdgeVO existingEdge = edgeMap.get(edgeKey);
existingEdge.setTotalTransactions(existingEdge.getTotalTransactions() + 1);
existingEdge.setTotalAmount(existingEdge.getTotalAmount() + amount);
} else {
if (!edgeMap.containsKey(edgeKey)) {
// 如果不存在,创建新的边
if (excelDataVO.getDirection().equals("出账")) {
String edgeId = "line-" + payer + "-" + payee;
EdgeVO newEdge = new EdgeVO(edgeId, payer, payee, 1, amount);
EdgeVO newEdge = new EdgeVO(edgeId, payer, payee, excelDataVO.getTransactionCount(), excelDataVO.getAmount());
edgeMap.put(edgeKey, newEdge);
} else {
String edgeId = "line-" + payee + "-" + payer;
EdgeVO newEdge = new EdgeVO(edgeId, payee, payer, 1, amount);
EdgeVO newEdge = new EdgeVO(edgeId, payee, payer, excelDataVO.getTransactionCount(), excelDataVO.getAmount());
edgeMap.put(edgeKey, newEdge);
}
}
......@@ -163,6 +159,12 @@ public class GroupDetailServiceImpl extends ServiceImpl<GroupDetailMapper, Group
return null;
}
private double formatAmount(double amount) {
return BigDecimal.valueOf(amount)
.setScale(2, RoundingMode.HALF_UP)
.doubleValue();
}
private List<ExcelDataVO> filterExcelData(CaseDTO caseDTO, Map<String, String> personMap) {
List<ExcelDataVO> excelDataEntityList = excelDataService.queryListByGroupId(caseDTO);
if (CollUtil.isEmpty(excelDataEntityList)) {
......@@ -204,6 +206,7 @@ public class GroupDetailServiceImpl extends ServiceImpl<GroupDetailMapper, Group
if (!isWithinTransactionRange(excelDataEntity, caseDTO.getMinTransaction(), caseDTO.getMaxTransaction())) {
iterator.remove();
}
excelDataEntity.setAmount(formatAmount(excelDataEntity.getAmount()));
}
// 白名单过滤
......
......@@ -367,7 +367,7 @@
<if test="endTime != null">
and time &lt;= #{endTime}
</if>
group by ed.pay_user_name,ed.payee_name
group by ed.pay_user_name,ed.payee_name,ed.direction
</select>
<select id="queryOtherAccountList" resultType="com.platform.model.vo.ExcelDataVO">
SELECT
......
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