Commit 0d1758a7 authored by wujipeng's avatar wujipeng
Browse files

资金流接口调整

parent 4cf4fdf2
...@@ -35,4 +35,5 @@ public interface ExcelDataMapper extends BaseMapper<ExcelDataEntity> { ...@@ -35,4 +35,5 @@ public interface ExcelDataMapper extends BaseMapper<ExcelDataEntity> {
List<ExcelDataEntity> queryInfoList(CaseDTO caseDTO); List<ExcelDataEntity> queryInfoList(CaseDTO caseDTO);
List<AssociationVO> queryAccountTemporary(@Param("userName") String userName, @Param("caseId") String caseId); List<AssociationVO> queryAccountTemporary(@Param("userName") String userName, @Param("caseId") String caseId);
List<ExcelDataEntity> accountCashFlow(UserDTO userDTO);
} }
...@@ -12,6 +12,9 @@ import java.util.List; ...@@ -12,6 +12,9 @@ import java.util.List;
@Data @Data
public class UserDTO extends UserEntity { public class UserDTO extends UserEntity {
@ApiModelProperty(value = "1、查人 2、查账号")
private String identifier;
private List<UserAccountEntity> userAccountList; private List<UserAccountEntity> userAccountList;
@ApiModelProperty(value = "对方用户名") @ApiModelProperty(value = "对方用户名")
...@@ -30,6 +33,7 @@ public class UserDTO extends UserEntity { ...@@ -30,6 +33,7 @@ public class UserDTO extends UserEntity {
private String otherName; private String otherName;
private String oldName; private String oldName;
private String newName; private String newName;
} }
...@@ -61,4 +61,6 @@ public interface ExcelDataService extends IService<ExcelDataEntity> { ...@@ -61,4 +61,6 @@ public interface ExcelDataService extends IService<ExcelDataEntity> {
List<ExcelDataEntity> queryListByPayeeName(String oldName, String caseId); List<ExcelDataEntity> queryListByPayeeName(String oldName, String caseId);
List<AssociationVO> queryAccountTemporary(String userName, String caseId); List<AssociationVO> queryAccountTemporary(String userName, String caseId);
List<ExcelDataEntity> accountCashFlow(UserDTO userDTO);
} }
...@@ -111,4 +111,9 @@ public class ExcelDataServiceImpl extends ServiceImpl<ExcelDataMapper, ExcelData ...@@ -111,4 +111,9 @@ public class ExcelDataServiceImpl extends ServiceImpl<ExcelDataMapper, ExcelData
public List<AssociationVO> queryAccountTemporary(String userName, String caseId) { public List<AssociationVO> queryAccountTemporary(String userName, String caseId) {
return baseMapper.queryAccountTemporary(userName,caseId); return baseMapper.queryAccountTemporary(userName,caseId);
} }
@Override
public List<ExcelDataEntity> accountCashFlow(UserDTO userDTO) {
return baseMapper.accountCashFlow(userDTO);
}
} }
...@@ -205,7 +205,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -205,7 +205,14 @@ 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 = excelDataService.cashFlow(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;
}
for (ExcelDataEntity excelDataEntity : excelDataList) { for (ExcelDataEntity excelDataEntity : excelDataList) {
if ("出账".equals(excelDataEntity.getDirection())) { if ("出账".equals(excelDataEntity.getDirection())) {
excelDataEntity.setSelfAccount(excelDataEntity.getPayAccount()); excelDataEntity.setSelfAccount(excelDataEntity.getPayAccount());
......
...@@ -199,4 +199,37 @@ ...@@ -199,4 +199,37 @@
payment_account, payment_account,
direction direction
</select> </select>
<select id="accountCashFlow" resultType="com.platform.model.entity.ExcelDataEntity">
select id,
directory_id,
type,
direction,
time,
amount,
serial,
payee_bank_card,
payee_account,
payee_merchant,
payee_name,
payment_bank_name,
payment_bank_card,
payment_account,
ip,
mac,
external_channel,
pay_account,
remark,
case_id,
pay_user_name,
use_flag,
file_id
from excel_data
where case_id = #{caseId}
and payee_name = #{userName}
and (
payee_account = #{otherUserName}
or
payment_account = #{otherUserName}
)
</select>
</mapper> </mapper>
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