"...platform/git@gitlab.ruzhoukj.com:wujipeng/relation.git" did not exist on "50b142a8b0953e8764428497408d2c5d5c93b10b"
Commit 62df0303 authored by zhuxiang's avatar zhuxiang
Browse files

连线改为双向

parent 7d929c28
...@@ -337,8 +337,10 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -337,8 +337,10 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
} }
private void updateEdgeMap(Map<String, EdgeVO> edgeMap, private void updateEdgeMap(Map<String, EdgeVO> edgeMap,
String payer, String payee, String payer,
double amount, ExcelDataEntity entity, String payee,
double amount,
ExcelDataEntity entity,
UnionFindVO uf) { UnionFindVO uf) {
String edgeKey = payer + "-" + payee; String edgeKey = payer + "-" + payee;
EdgeVO existingEdge = edgeMap.get(edgeKey); EdgeVO existingEdge = edgeMap.get(edgeKey);
...@@ -350,11 +352,19 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -350,11 +352,19 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
existingEdge.setTotalTransactions(existingEdge.getTotalTransactions() + 1); existingEdge.setTotalTransactions(existingEdge.getTotalTransactions() + 1);
existingEdge.setTotalAmount(existingEdge.getTotalAmount() + amount); existingEdge.setTotalAmount(existingEdge.getTotalAmount() + amount);
} else { } else {
if (entity.getDirection().equals("出账")) {
EdgeVO newEdge = new EdgeVO( EdgeVO newEdge = new EdgeVO(
payer, payee, 1, amount, root, payer, payee, 1, amount, root,
entity.getIp(), entity.getMac(), entity.getPaymentBankName() entity.getIp(), entity.getMac(), entity.getPaymentBankName()
); );
edgeMap.put(edgeKey, newEdge); edgeMap.put(edgeKey, newEdge);
} else {
EdgeVO newEdge = new EdgeVO(
payee, payer, 1, amount, root,
entity.getIp(), entity.getMac(), entity.getPaymentBankName()
);
edgeMap.put(edgeKey, newEdge);
}
} }
} }
......
...@@ -133,9 +133,15 @@ public class GroupDetailServiceImpl extends ServiceImpl<GroupDetailMapper, Group ...@@ -133,9 +133,15 @@ public class GroupDetailServiceImpl extends ServiceImpl<GroupDetailMapper, Group
existingEdge.setTotalAmount(existingEdge.getTotalAmount() + amount); existingEdge.setTotalAmount(existingEdge.getTotalAmount() + amount);
} else { } else {
// 如果不存在,创建新的边 // 如果不存在,创建新的边
if (excelDataVO.getDirection().equals("出账")) {
String edgeId = "line-" + payer + "-" + payee; String edgeId = "line-" + payer + "-" + payee;
EdgeVO newEdge = new EdgeVO(edgeId, payer, payee, 1, amount); EdgeVO newEdge = new EdgeVO(edgeId, payer, payee, 1, amount);
edgeMap.put(edgeKey, newEdge); edgeMap.put(edgeKey, newEdge);
} else {
String edgeId = "line-" + payee + "-" + payer;
EdgeVO newEdge = new EdgeVO(edgeId, payee, payer, 1, amount);
edgeMap.put(edgeKey, newEdge);
}
} }
} }
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
select select
pay_user_name payUserName, pay_user_name payUserName,
payee_name payeeName, payee_name payeeName,
direction,
SUM(amount) amount, SUM(amount) amount,
COUNT(*) AS transactionCount, COUNT(*) AS transactionCount,
max(ip) ip, max(ip) ip,
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
<if test="endTime != null"> <if test="endTime != null">
and time &lt;= #{endTime} and time &lt;= #{endTime}
</if> </if>
group by pay_user_name,payee_name group by pay_user_name,payee_name,direction
</select> </select>
<select id="selectFinancialTransactions" resultType="com.platform.model.vo.AssociationVO"> <select id="selectFinancialTransactions" resultType="com.platform.model.vo.AssociationVO">
select select
...@@ -326,6 +327,7 @@ ...@@ -326,6 +327,7 @@
select select
ed.pay_user_name payUserName, ed.pay_user_name payUserName,
ed.payee_name payeeName, ed.payee_name payeeName,
ed.direction,
SUM(ed.amount) amount, SUM(ed.amount) amount,
COUNT(*) AS transactionCount, COUNT(*) AS transactionCount,
Max(u.label) label Max(u.label) label
......
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