Commit 34bea269 authored by wujipeng's avatar wujipeng
Browse files

优化

parent 66820605
...@@ -30,15 +30,19 @@ public class AssociationVO { ...@@ -30,15 +30,19 @@ public class AssociationVO {
@ApiModelProperty("总金额") @ApiModelProperty("总金额")
private String totalAmount; private String totalAmount;
@ApiModelProperty("收款方") // @ApiModelProperty("收款方")
private String payee; // private String payee;
//
@ApiModelProperty("付款方") // @ApiModelProperty("付款方")
private String payment; // private String payment;
@ApiModelProperty("数量") @ApiModelProperty("数量")
private Integer num; private Integer num;
@ApiModelProperty("方向") @ApiModelProperty("方向")
private String direction; private String direction;
private String payeeName;
private String payUserName;
} }
...@@ -64,33 +64,33 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -64,33 +64,33 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
List<AssociationVO> financialTransactions = excelDataService.queryAccountTemporary(userDTO); List<AssociationVO> financialTransactions = excelDataService.queryAccountTemporary(userDTO);
Map<String, List<AssociationVO>> detailsFunds = Maps.newHashMap(); Map<String, List<AssociationVO>> detailsFunds = Maps.newHashMap();
for (AssociationVO financialTransaction : financialTransactions) { for (AssociationVO financialTransaction : financialTransactions) {
if (financialTransaction.getDirection().equals("出账")) { if ("出账".equals(financialTransaction.getDirection())) {
if (detailsFunds.containsKey(financialTransaction.getPayee())) { if (detailsFunds.containsKey(financialTransaction.getPayeeName())) {
financialTransaction.setRelationDesc(detailsFunds.get(financialTransaction.getPayee()).size() + "、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime() financialTransaction.setRelationDesc(detailsFunds.get(financialTransaction.getPayeeName()).size() + "、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次"); + financialTransaction.getPayeeName() + "->" + financialTransaction.getPayUserName() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
detailsFunds.get(financialTransaction.getPayee()).add(financialTransaction); detailsFunds.get(financialTransaction.getPayeeName()).add(financialTransaction);
account.add(financialTransaction.getPayment()); account.add(financialTransaction.getPayUserName());
} else { } else {
List<AssociationVO> list = new ArrayList<>(); List<AssociationVO> list = new ArrayList<>();
financialTransaction.setRelationDesc("1、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime() financialTransaction.setRelationDesc("1、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次"); + financialTransaction.getPayeeName() + "->" + financialTransaction.getPayUserName() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
list.add(financialTransaction); list.add(financialTransaction);
detailsFunds.put(financialTransaction.getPayee(), list); detailsFunds.put(financialTransaction.getPayeeName(), list);
account.add(financialTransaction.getPayment()); account.add(financialTransaction.getPayUserName());
} }
} else if (financialTransaction.getDirection().equals("入账")) { } else if ("入账".equals(financialTransaction.getDirection())) {
if (detailsFunds.containsKey(financialTransaction.getPayment())) { if (detailsFunds.containsKey(financialTransaction.getPayUserName())) {
financialTransaction.setRelationDesc(detailsFunds.get(financialTransaction.getPayment()).size() + "、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime() financialTransaction.setRelationDesc(detailsFunds.get(financialTransaction.getPayUserName()).size() + "、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次"); + financialTransaction.getPayeeName() + "->" + financialTransaction.getPayUserName() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
detailsFunds.get(financialTransaction.getPayment()).add(financialTransaction); detailsFunds.get(financialTransaction.getPayUserName()).add(financialTransaction);
account.add(financialTransaction.getPayee()); account.add(financialTransaction.getPayeeName());
} else { } else {
List<AssociationVO> list = new ArrayList<>(); List<AssociationVO> list = new ArrayList<>();
financialTransaction.setRelationDesc("1、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime() financialTransaction.setRelationDesc("1、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次"); + financialTransaction.getPayeeName() + "->" + financialTransaction.getPayUserName() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
list.add(financialTransaction); list.add(financialTransaction);
detailsFunds.put(financialTransaction.getPayment(), list); detailsFunds.put(financialTransaction.getPayeeName(), list);
account.add(financialTransaction.getPayee()); account.add(financialTransaction.getPayeeName());
} }
} }
} }
...@@ -128,33 +128,33 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -128,33 +128,33 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
List<AssociationVO> financialTransactions = excelDataService.selectFinancialTransactions(userDTO); List<AssociationVO> financialTransactions = excelDataService.selectFinancialTransactions(userDTO);
Map<String, List<AssociationVO>> detailsFunds = Maps.newHashMap(); Map<String, List<AssociationVO>> detailsFunds = Maps.newHashMap();
for (AssociationVO financialTransaction : financialTransactions) { for (AssociationVO financialTransaction : financialTransactions) {
if (financialTransaction.getDirection().equals("出账")) { if ("出账".equals(financialTransaction.getDirection())) {
if (detailsFunds.containsKey(financialTransaction.getPayee())) { if (detailsFunds.containsKey(financialTransaction.getPayeeName())) {
financialTransaction.setRelationDesc(detailsFunds.get(financialTransaction.getPayee()).size() + "、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime() financialTransaction.setRelationDesc(detailsFunds.get(financialTransaction.getPayeeName()).size() + "、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次"); + financialTransaction.getPayeeName() + "->" + financialTransaction.getPayUserName() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
detailsFunds.get(financialTransaction.getPayee()).add(financialTransaction); detailsFunds.get(financialTransaction.getPayeeName()).add(financialTransaction);
account.add(financialTransaction.getPayment()); account.add(financialTransaction.getPayUserName());
} else { } else {
List<AssociationVO> list = new ArrayList<>(); List<AssociationVO> list = new ArrayList<>();
financialTransaction.setRelationDesc("1、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime() financialTransaction.setRelationDesc("1、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次"); + financialTransaction.getPayeeName() + "->" + financialTransaction.getPayUserName() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
list.add(financialTransaction); list.add(financialTransaction);
detailsFunds.put(financialTransaction.getPayee(), list); detailsFunds.put(financialTransaction.getPayeeName(), list);
account.add(financialTransaction.getPayment()); account.add(financialTransaction.getPayUserName());
} }
} else if (financialTransaction.getDirection().equals("入账")) { } else if ("入账".equals(financialTransaction.getDirection())) {
if (detailsFunds.containsKey(financialTransaction.getPayment())) { if (detailsFunds.containsKey(financialTransaction.getPayUserName())) {
financialTransaction.setRelationDesc(detailsFunds.get(financialTransaction.getPayment()).size() + "、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime() financialTransaction.setRelationDesc(detailsFunds.get(financialTransaction.getPayUserName()).size() + "、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次"); + financialTransaction.getPayeeName() + "->" + financialTransaction.getPayUserName() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
detailsFunds.get(financialTransaction.getPayment()).add(financialTransaction); detailsFunds.get(financialTransaction.getPayUserName()).add(financialTransaction);
account.add(financialTransaction.getPayee()); account.add(financialTransaction.getPayeeName());
} else { } else {
List<AssociationVO> list = new ArrayList<>(); List<AssociationVO> list = new ArrayList<>();
financialTransaction.setRelationDesc("1、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime() financialTransaction.setRelationDesc("1、" + financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次"); + financialTransaction.getPayeeName() + "->" + financialTransaction.getPayUserName() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
list.add(financialTransaction); list.add(financialTransaction);
detailsFunds.put(financialTransaction.getPayment(), list); detailsFunds.put(financialTransaction.getPayeeName(), list);
account.add(financialTransaction.getPayee()); account.add(financialTransaction.getPayeeName());
} }
} }
} }
...@@ -204,7 +204,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -204,7 +204,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
userDTO.setUserName(userDTO.getUserName() + idCardInfo.get("idCard")); userDTO.setUserName(userDTO.getUserName() + idCardInfo.get("idCard"));
userDTO.setIdType("身份证"); userDTO.setIdType("身份证");
excelDataEntity.setPayUserName(userDTO.getUserName() + idCardInfo.get("idCard")); excelDataEntity.setPayUserName(userDTO.getUserName() + idCardInfo.get("idCard"));
}else { } else {
excelDataEntity.setPayUserName(userDTO.getUserName()); excelDataEntity.setPayUserName(userDTO.getUserName());
} }
excelDataEntity.setCaseId(userDTO.getCaseId()); excelDataEntity.setCaseId(userDTO.getCaseId());
...@@ -216,14 +216,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -216,14 +216,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
@Override @Override
public List<ExcelDataEntity> cashFlow(UserDTO userDTO) { public List<ExcelDataEntity> cashFlow(UserDTO userDTO) {
// List<ExcelDataEntity> excelDataList = null;
// if ("1".equals(userDTO.getIdentifier())) {
// excelDataList = excelDataService.cashFlow(userDTO);
// } else if ("2".equals(userDTO.getIdentifier())) {
// excelDataList = excelDataService.accountCashFlow(userDTO);
// } else {
// return null;
// }
List<ExcelDataEntity> excelDataList = excelDataService.cashFlow(userDTO); List<ExcelDataEntity> excelDataList = excelDataService.cashFlow(userDTO);
for (ExcelDataEntity excelDataEntity : excelDataList) { for (ExcelDataEntity excelDataEntity : excelDataList) {
if ("出账".equals(excelDataEntity.getDirection())) { if ("出账".equals(excelDataEntity.getDirection())) {
...@@ -242,13 +234,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -242,13 +234,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
EveryoneVO everyoneVO = new EveryoneVO(); EveryoneVO everyoneVO = new EveryoneVO();
UserEntity oneself = getOne(new LambdaQueryWrapper<UserEntity>() UserEntity oneself = getOne(new LambdaQueryWrapper<UserEntity>()
.eq(UserEntity::getUserName, userDTO.getUserName()).eq(UserEntity::getCaseId, userDTO.getCaseId()), false); .eq(UserEntity::getUserName, userDTO.getUserName()).eq(UserEntity::getCaseId, userDTO.getCaseId()), false);
UserEntity other = getOne(new LambdaQueryWrapper<UserEntity>() // UserEntity other = getOne(new LambdaQueryWrapper<UserEntity>()
.eq(UserEntity::getUserName, userDTO.getOtherName()).eq(UserEntity::getCaseId, userDTO.getCaseId()), false); // .eq(UserEntity::getUserName, userDTO.getOtherName()).eq(UserEntity::getCaseId, userDTO.getCaseId()), false);
if (ObjectUtils.isEmpty(oneself) || ObjectUtils.isEmpty(other)) { // if (ObjectUtils.isEmpty(oneself) || ObjectUtils.isEmpty(other)) {
throw new BusinessException("用户不存在"); // throw new BusinessException("用户不存在");
} // }
//标题 //标题
everyoneVO.setTitle(oneself.getUserName() + "," + other.getUserName()); everyoneVO.setTitle(userDTO.getUserName() + "," + userDTO.getOtherName());
//查询关系 //查询关系
List<UserRelationEntity> userRelation = userRelationService.bothSides(userDTO.getUserName(), userDTO.getOtherName()); List<UserRelationEntity> userRelation = userRelationService.bothSides(userDTO.getUserName(), userDTO.getOtherName());
//指认关系 //指认关系
......
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
min(time) as startTime, min(time) as startTime,
max(time) as endTime, max(time) as endTime,
sum(amount) as totalAmount, sum(amount) as totalAmount,
payee_account as payee,
payment_account as payment,
count(*) as num, count(*) as num,
payee_name as payeeName,
pay_user_name as payUserName,
direction direction
from excel_data from excel_data
where case_id = #{caseId} where case_id = #{caseId}
...@@ -71,9 +71,7 @@ ...@@ -71,9 +71,7 @@
and time &lt;= #{endTime} and time &lt;= #{endTime}
</if> </if>
group by group by
payee_account, direction,payee_name,pay_user_name
payment_account,
direction
HAVING 1=1 HAVING 1=1
<if test="minAmount != null"> <if test="minAmount != null">
and sum(amount) >= #{minAmount} and sum(amount) >= #{minAmount}
...@@ -140,8 +138,20 @@ ...@@ -140,8 +138,20 @@
file_id file_id
from excel_data from excel_data
where case_id = #{caseId} where case_id = #{caseId}
and (pay_user_name = #{userName} or payee_name = #{userName}) and pay_user_name = #{userName}
and (payee_account = #{otherUserName} or payment_account = #{otherUserName}) and payee_name = #{otherUserName}
<if test="startTime != null">
and time >= #{startTime}
</if>
<if test="endTime != null">
and time &lt;= #{endTime}
</if>
<if test="minAmount != null">
and amount >= #{minAmount}
</if>
<if test="maxAmount != null">
and amount &lt;= #{maxAmount}
</if>
</select> </select>
<select id="relationPage" resultType="com.platform.model.entity.ExcelDataEntity"> <select id="relationPage" resultType="com.platform.model.entity.ExcelDataEntity">
SELECT amount, time, payee_account, payment_account SELECT amount, time, payee_account, payment_account
...@@ -205,8 +215,8 @@ ...@@ -205,8 +215,8 @@
min(time) as startTime, min(time) as startTime,
max(time) as endTime, max(time) as endTime,
sum(amount) as totalAmount, sum(amount) as totalAmount,
payee_account as payee, payee_name as payeeName,
payment_account as payment, pay_user_name as payUserName,
count(*) as num, count(*) as num,
direction direction
from excel_data from excel_data
...@@ -219,8 +229,8 @@ ...@@ -219,8 +229,8 @@
and time &lt;= #{endTime} and time &lt;= #{endTime}
</if> </if>
group by group by
payee_account, payee_name,
payment_account, pay_user_name,
direction direction
HAVING 1=1 HAVING 1=1
<if test="minAmount != null"> <if test="minAmount != null">
......
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