|
|
@@ -11,13 +11,16 @@ import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
|
|
|
import com.jzg.commons.entity.po.SysUploadFiles;
|
|
|
import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
|
|
|
import com.jzg.commons.entity.po.SysUserJzgInfoBankCardRecord;
|
|
|
+import com.jzg.commons.entity.po.SysUserJzgInfoSalesmanBO;
|
|
|
import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
|
|
|
import com.jzg.commons.exception.SystemException;
|
|
|
import com.jzg.commons.util.MinioUtils;
|
|
|
import com.jzg.organization.mapper.SysUploadFilesMapper;
|
|
|
import com.jzg.organization.mapper.SysUserJzgInfoBankCardMapper;
|
|
|
import com.jzg.organization.mapper.SysUserJzgInfoBankCardRecordMapper;
|
|
|
+import com.jzg.organization.mapper.SysUserJzgInfoSalesmanMapper;
|
|
|
import com.jzg.organization.service.SysUserJzgInfoBankCardService;
|
|
|
+import com.jzg.organization.service.SysUserJzgInfoSalesmanService;
|
|
|
import jakarta.annotation.Resource;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.slf4j.Logger;
|
|
|
@@ -27,7 +30,10 @@ import java.time.LocalDateTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.util.Comparator;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.Objects;
|
|
|
+import java.util.function.Function;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @author quchen
|
|
|
@@ -46,6 +52,9 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
|
|
|
@Resource
|
|
|
private SysUserJzgInfoBankCardRecordMapper sysUserJzgInfoBankCardRecordMapper;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private SysUserJzgInfoSalesmanService sysUserJzgInfoSalesmanService;
|
|
|
+
|
|
|
@Resource
|
|
|
private SysUploadFilesMapper sysUploadFilesMapper;
|
|
|
|
|
|
@@ -64,6 +73,8 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
|
|
|
public Page<SysUserJzgInfoBankCardDto> getBankCardPageList(Page page, SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
|
|
|
log.info("查询业务员账户:sysUserJzgInfoBankCardVo=[{}]", JSONUtil.toJsonStr(sysUserJzgInfoBankCardVo));
|
|
|
Page<SysUserJzgInfoBankCardDto> pageList = sysUserJzgInfoBankCardMapper.getBankCardPageList(page, sysUserJzgInfoBankCardVo);
|
|
|
+ // 查询业务员类型
|
|
|
+ Map<String, String> typeAttrMap = sysUserJzgInfoSalesmanService.queryYwyTypeAttrMap();
|
|
|
pageList.getRecords().forEach(sysUserJzgInfoBankCardDto -> {
|
|
|
if (sysUserJzgInfoBankCardDto.getFileId() != null) {
|
|
|
String cardFileId = sysUserJzgInfoBankCardDto.getFileId();
|
|
|
@@ -72,6 +83,9 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
|
|
|
sysUserJzgInfoBankCardDto.setCardFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ // 设置业务员类型
|
|
|
+ sysUserJzgInfoBankCardDto.setTypeAttr(typeAttrMap.getOrDefault(sysUserJzgInfoBankCardDto.getUsername(), ""));
|
|
|
List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList = sysUserJzgInfoBankCardRecordMapper
|
|
|
.selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCardRecord>()
|
|
|
.eq(SysUserJzgInfoBankCardRecord::getBankCardId, sysUserJzgInfoBankCardDto.getId()));
|