Commit 4a0790bf authored by zhuxiang's avatar zhuxiang
Browse files

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

# Conflicts:
#	src/main/java/com/platform/mapper/ExcelDataMapper.java
#	src/main/java/com/platform/service/ExcelDataService.java
#	src/main/java/com/platform/service/impl/ExcelDataServiceImpl.java
#	src/main/resources/com/platform/mapper/ExcelDataMapper.xml
parents e59d956f 5a5eecc8
......@@ -18,8 +18,8 @@ public class UserController extends BaseController {
@ApiOperation(value = "用户详情")
@GetMapping("/detail")
public Result detail(@RequestParam String userName) {
return Result.data(userService.getDetail(userName));
public Result detail(@RequestParam String userName,@RequestParam String caseId) {
return Result.data(userService.getDetail(userName,caseId));
}
@ApiOperation(value = "编辑用户信息")
......
......@@ -3,6 +3,7 @@ package com.platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.platform.model.dto.CaseDTO;
import com.platform.model.entity.ExcelDataEntity;
import com.platform.model.vo.AssociationVO;
import com.platform.model.vo.ExcelDataVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -21,6 +22,8 @@ public interface ExcelDataMapper extends BaseMapper<ExcelDataEntity> {
List<ExcelDataEntity> queryList(CaseDTO caseDTO);
List<AssociationVO> selectFinancialTransactions(@Param("userName") String userName, @Param("caseId") String caseId);
List<ExcelDataEntity> queryListByPayUserList(@Param("userList") List<String> userList,
@Param("caseId") int caseId);
}
......@@ -38,6 +38,9 @@ public class UserEntity {
private String basicInfo;
@ApiModelProperty("标签")
private String label;
@ApiModelProperty("关系,方便解析和会回显")
@TableField(exist = false)
private List<UserRelationEntity> relationShipList;
......
......@@ -31,7 +31,7 @@ public class WhiteEntity {
@ApiModelProperty("账号")
@ExcelProperty(value = "账号")
private String amount;
private String account;
@ApiModelProperty("加入时间")
@ExcelProperty(value = "加入时间")
......
package com.platform.model.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author : wujipeng
* @date : 2025/8/1 16:31
* @Version: 1.0
* @Desc : 描述信息
*/
@Data
public class AssociationVO {
// @ApiModelProperty("关联类型")
// private String relationType;
//
// @ApiModelProperty("关联人员名称")
// private String relationName;
@ApiModelProperty("关联描述")
private String relationDesc;
@ApiModelProperty("开始时间")
private String startTime;
@ApiModelProperty("结束时间")
private String endTime;
@ApiModelProperty("总金额")
private String totalAmount;
@ApiModelProperty("收款方")
private String payee;
@ApiModelProperty("付款方")
private String payment;
@ApiModelProperty("数量")
private Integer num;
@ApiModelProperty("方向")
private String direction;
}
......@@ -2,12 +2,26 @@ package com.platform.model.vo;
import com.platform.model.entity.UserAccountEntity;
import com.platform.model.entity.UserEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
public class UserVO extends UserEntity {
private List<UserAccountEntity> userAccountList;
@ApiModelProperty("本人账户数量")
private Integer accountNum;
@ApiModelProperty("关联人员数量")
private Integer headcount;
@ApiModelProperty("关联交易数量")
private Integer quantity;
@ApiModelProperty("资金类型,关联交易明细")
private Map<String,List<AssociationVO>> detailsFunds;
}
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.model.dto.CaseDTO;
import com.platform.model.dto.ExcelDataDTO;
import com.platform.model.entity.ExcelDataEntity;
import com.platform.model.vo.AssociationVO;
import com.platform.model.vo.ExcelDataVO;
import java.util.List;
......@@ -48,4 +49,6 @@ public interface ExcelDataService extends IService<ExcelDataEntity> {
List<ExcelDataEntity> queryList(CaseDTO caseDTO);
List<ExcelDataEntity> queryListByPayUserList(List<String> userList,int caseId);
List<AssociationVO> selectFinancialTransactions(String userName, String caseId);
}
......@@ -6,7 +6,7 @@ import com.platform.model.entity.UserEntity;
import com.platform.model.vo.UserVO;
public interface UserService extends IService<UserEntity> {
UserVO getDetail(String userName);
UserVO getDetail(String userName,String caseId);
boolean updateUser(UserDTO userDTO);
......
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.mapper.ExcelDataMapper;
import com.platform.model.dto.CaseDTO;
import com.platform.model.entity.ExcelDataEntity;
import com.platform.model.vo.AssociationVO;
import com.platform.model.vo.ExcelDataVO;
import com.platform.service.ExcelDataService;
import org.springframework.stereotype.Service;
......@@ -64,4 +65,9 @@ public class ExcelDataServiceImpl extends ServiceImpl<ExcelDataMapper, ExcelData
public List<ExcelDataEntity> queryListByPayUserList(List<String> userList, int caseId) {
return baseMapper.queryListByPayUserList(userList, caseId);
}
@Override
public List<AssociationVO> selectFinancialTransactions(String userName, String caseId) {
return baseMapper.selectFinancialTransactions(userName,caseId);
}
}
......@@ -4,22 +4,29 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.platform.mapper.UserMapper;
import com.platform.model.dto.UserDTO;
import com.platform.model.entity.UserAccountEntity;
import com.platform.model.entity.UserEntity;
import com.platform.model.entity.UserRelationEntity;
import com.platform.model.vo.AssociationVO;
import com.platform.model.vo.UserVO;
import com.platform.service.ExcelDataService;
import com.platform.service.UserAccountService;
import com.platform.service.UserRelationService;
import com.platform.service.UserService;
import com.platform.utils.DozerUtils;
import com.platform.utils.IdCardUtils;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
......@@ -30,9 +37,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
private UserAccountService userAccountService;
@Resource
private UserRelationService userRelationService;
@Resource
private ExcelDataService excelDataService;
@Override
public UserVO getDetail(String userName) {
public UserVO getDetail(String userName,String caseId) {
UserEntity userEntity = baseMapper.selectOne(new LambdaQueryWrapper<UserEntity>()
.eq(UserEntity::getUserName, userName));
UserVO userVO = DozerUtils.convertBean(userEntity, UserVO.class);
......@@ -45,6 +54,52 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
if(!ObjectUtils.isEmpty(relationShipList)){
userVO.setRelationShipList(relationShipList);
}
//本人账号数量
HashSet<String> account = Sets.newHashSet();
//查询关联资金
List<AssociationVO> financialTransactions = excelDataService.selectFinancialTransactions(userName, caseId);
Map<String,List<AssociationVO>> detailsFunds = Maps.newHashMap();
for (AssociationVO financialTransaction : financialTransactions) {
if(financialTransaction.getDirection().equals("出账")){
if(detailsFunds.containsKey(financialTransaction.getPayee())){
financialTransaction.setRelationDesc(detailsFunds.get(financialTransaction.getPayee()).size() + "、"+ financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
detailsFunds.get(financialTransaction.getPayee()).add(financialTransaction);
account.add(financialTransaction.getPayment());
}else {
List<AssociationVO> list = new ArrayList<>();
financialTransaction.setRelationDesc("1、"+ financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
list.add(financialTransaction);
detailsFunds.put(financialTransaction.getPayee(),list);
account.add(financialTransaction.getPayment());
}
}else if(financialTransaction.getDirection().equals("入账")){
if(detailsFunds.containsKey(financialTransaction.getPayment())){
financialTransaction.setRelationDesc(detailsFunds.get(financialTransaction.getPayment()).size() + "、"+ financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
detailsFunds.get(financialTransaction.getPayment()).add(financialTransaction);
account.add(financialTransaction.getPayee());
}else {
List<AssociationVO> list = new ArrayList<>();
financialTransaction.setRelationDesc("1、"+ financialTransaction.getStartTime() + "-" + financialTransaction.getEndTime()
+ financialTransaction.getPayee() + "->" + financialTransaction.getPayment() + "," + financialTransaction.getTotalAmount() + ",交易" + financialTransaction.getNum() + "次");
list.add(financialTransaction);
detailsFunds.put(financialTransaction.getPayment(),list);
account.add(financialTransaction.getPayee());
}
}
}
//关联人员数量
userVO.setHeadcount(detailsFunds.size());
//关联交易次数
int quantity = 0;
for (AssociationVO financialTransaction : financialTransactions) {
quantity += financialTransaction.getNum();
}
userVO.setQuantity(quantity);
//本人账户数量
userVO.setAccountNum(account.size());
return userVO;
}
......
......@@ -38,6 +38,23 @@
and time betwenn #{startTime} and #{endTime}
</if>
</select>
<select id="selectFinancialTransactions" resultType="com.platform.model.vo.AssociationVO">
select
min(time) as startTime,
max(time) as endTime,
sum(amount) as totalAmount,
payee_account as payee,
payment_account as payment,
count(*) as num,
direction
from excel_data
where case_id = #{caseId}
and pay_user_name = #{userName}
group by
payee_account,
payment_account,
direction
</select>
<select id="queryListByPayUserList" resultType="com.platform.model.entity.ExcelDataEntity">
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