Skip to content

M
midjourney-proxy
Commit 1fad8fb3 by 田超
Options

Merge branch 'fixbug/exportBookInfo' into 'master' 

feat: [none] 修改数据错误的问题

See merge request rays/pcloud-book!1009
parents b281b26a c0092158
Showing with 11 additions and 28 deletions
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java
......@@ -59,7 +59,6 @@ import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
import com.pcloud.book.es.biz.ESBookAndAdviserBiz;
import com.pcloud.book.group.biz.BookGroupBiz;
import com.pcloud.book.group.dao.BookGroupDao;
import com.pcloud.book.group.dao.GroupQrcodeDao;
import com.pcloud.book.group.dto.BookGroupDTO;
import com.pcloud.book.group.dto.BookGroupServeCountDTO;
import com.pcloud.book.group.enums.JoinGroupTypeEnum;
......@@ -1578,7 +1577,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
// 扫码人数
long scanUser = statsDTOS.stream().map(GroupScanUserStatsDTO::getWxUserId).distinct().count();
// 扫码量
int scan = statsDTOS.size();
int scan = statsDTOS.stream().filter(x->Objects.nonNull(x.getScanTotal())).mapToInt(groupScanUserStatsDTO -> Math.toIntExact(groupScanUserStatsDTO.getScanTotal())).sum();
// 补充累计扫码量（社群书部分）
varietyStatsDto.setScanTotal(varietyStatsDto.getScanTotal() == null ? scan : varietyStatsDto.getScanTotal() + scan);
......@@ -1596,7 +1595,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
&& getAgentQuarterDigital(x.getCreateDay()) == getAgentQuarterDigital(new Date())
).collect(Collectors.toList());
if (CollUtil.isNotEmpty(thisQuarterCollect)) {
scan = thisQuarterCollect.size();
scan = thisQuarterCollect.stream().filter(x->Objects.nonNull(x.getScanTotal())).mapToInt(groupScanUserStatsDTO -> Math.toIntExact(groupScanUserStatsDTO.getScanTotal())).sum();
scanUser = thisQuarterCollect.stream().map(GroupScanUserStatsDTO::getWxUserId).distinct().count();
// 补充本季度扫码量（社群书部分）
varietyStatsDto.setScanThisQuarter(varietyStatsDto.getScanThisQuarter() == null ? scan : varietyStatsDto.getScanThisQuarter() + scan);
......@@ -1615,12 +1614,12 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
&& getAgentQuarterDigital(x.getCreateDay()) == getAgentLastQuarterDigital(new Date())
).collect(Collectors.toList());
if (CollUtil.isNotEmpty(thisQuarterCollect)) {
scan = lastQuarterCollect.size();
scan = lastQuarterCollect.stream().filter(x->Objects.nonNull(x.getScanTotal())).mapToInt(groupScanUserStatsDTO -> Math.toIntExact(groupScanUserStatsDTO.getScanTotal())).sum();
scanUser = lastQuarterCollect.stream().map(GroupScanUserStatsDTO::getWxUserId).distinct().count();
// 补充上季度扫码量（社群书部分）
varietyStatsDto.setScanLastQuarter(varietyStatsDto.getScanLastQuarter() == null ? scan : varietyStatsDto.getScanLastQuarter() + scan);
// 补充上季度扫码人数（社群书部分）
varietyStatsDto.setScanUserLastQuarter(Math.toIntExact(varietyStatsDto.getScanLastQuarter() == null ? scanUser : varietyStatsDto.getScanLastQuarter() + scanUser));
varietyStatsDto.setScanUserLastQuarter(Math.toIntExact(varietyStatsDto.getScanUserLastQuarter() == null ? scanUser : varietyStatsDto.getScanUserLastQuarter() + scanUser));
// 补充上季度浏览量（社群书部分）
varietyStatsDto.setBrowseLastQuarter(varietyStatsDto.getBrowseLastQuarter() == null ? scan : varietyStatsDto.getBrowseLastQuarter() + scan);
// 补充上季度浏览量（社群书部分）
......@@ -1680,9 +1679,9 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
// 根据ERP编号 项目编号查询图书信息
List<ErpBookInfoDTO> raysBookIds = new ArrayList<>();
if (Objects.nonNull(endDate) && CollUtil.isEmpty(raysBookIds)){
if (Objects.nonNull(endDate) || StrUtil.isNotBlank(name)){
raysBookIds = erpConsr.searchBookInfo(name, advisers, startDate, endDate);
if (CollUtil.isEmpty(raysBookIds)){
if (CollUtil.isEmpty(raysBookIds) && (StrUtil.isBlank(name) || Objects.nonNull(endDate))){
return new PageBeanNew<>();
}
}
......@@ -1725,8 +1724,8 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
ErpBookInfoDTO erpBookInfoDTO = new ErpBookInfoDTO();
erpBookInfoDTO.setAdviserId(dto.getAdviserId());
erpBookInfoDTO.setRaysBookId(Math.toIntExact(dto.getBookId()));
erpBookInfoDTO.setRaysChannelId(Math.toIntExact(dto.getChannelId()));
erpBookInfoDTO.setRaysBookId(Objects.nonNull(dto.getBookId())?Math.toIntExact(dto.getBookId()):null);
erpBookInfoDTO.setRaysChannelId(Objects.nonNull(dto.getChannelId())?Math.toIntExact(dto.getChannelId()):null);
finalRaysBookIds.add(erpBookInfoDTO);
}
});
......@@ -1875,7 +1874,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
// 标题
String excelTitle = String.format("%s做书明细导出-%s", agentName, DateUtil.format(new Date(), "yyyyMMdd"));
// 列名称
String[] rowsName = {"书刊ID", "书刊名称", "ISBN", "ERP编号", "项目编号", "二维码信息", "编辑ID", "编辑名称", "是否小睿书", "立项时间", "印册量", "总浏览量", "总浏览人数", "总扫码量", "总扫码人数", "成交金额"};
String[] rowsName = {"书刊ID", "书刊名称", "ISBN", "ERP编号", "项目编号", "编辑ID", "编辑名称", "是否小睿书", "立项时间", "印册量", "总浏览量", "总浏览人数", "总扫码量", "总扫码人数", "成交金额"};
// 数据列
List<Object[]> dataList = new ArrayList<>();
......@@ -1886,33 +1885,16 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
List<AgentBookStatsDetailVO> detailVOS = pageBeanNew.getRecordList();
for (AgentBookStatsDetailVO detailVO : detailVOS) {
if (Objects.nonNull(detailVO)) {
List<QrcodeInfoDto> qrcodeList = detailVO.getQrcodeList();
String qrcodeInfo = "";
if (CollUtil.isNotEmpty(qrcodeList)){
StringBuilder stringBuilder = new StringBuilder();
for (QrcodeInfoDto qrcodeInfoDto : qrcodeList) {
if (StrUtil.isNotEmpty(qrcodeInfoDto.getQrcodeUrl())) {
continue;
}
if (StrUtil.isNotEmpty(qrcodeInfoDto.getLocationName())) {
stringBuilder.append("印码位置：").append(qrcodeInfoDto.getLocationName()).append(" ");
}
stringBuilder.append("二维码地址：").append(qrcodeInfoDto.getQrcodeUrl()).append("\n");
}
qrcodeInfo = stringBuilder.toString().trim();
}
Object[] objects = new Object[]{
Objects.nonNull(detailVO.getBookId()) ? detailVO.getBookId() : "--",
Objects.nonNull(detailVO.getBookName()) ? detailVO.getBookName() : "--",
Objects.nonNull(detailVO.getIsbn()) ? detailVO.getIsbn() : "--",
Objects.nonNull(detailVO.getErpNumber()) ? detailVO.getErpNumber() : "--",
Objects.nonNull(detailVO.getProjectNumber()) ? detailVO.getProjectNumber() : "--",
StrUtil.isBlank(qrcodeInfo) ? "--" : qrcodeInfo,
Objects.nonNull(detailVO.getAdviserId()) ? String.valueOf(detailVO.getAdviserId()) : "--",
Objects.nonNull(detailVO.getAdviserName()) ? detailVO.getAdviserName() : "--",
Objects.equals(detailVO.getIsRay(), 1) ? "是" : "否",
Objects.nonNull(detailVO.getToProjectTime()) ? DateUtil.format(detailVO.getToProjectTime(), "yyyy/MM/dd") : "--",
Objects.nonNull(detailVO.getToProjectTime()) ? DateUtil.format(detailVO.getToProjectTime(), "yyyy-MM-dd HH:mm:ss") : "--",
Objects.nonNull(detailVO.getExpectPublishNum()) ? String.valueOf(detailVO.getExpectPublishNum()) : "0",
Objects.nonNull(detailVO.getBrowseTotal()) ? String.valueOf(detailVO.getBrowseTotal()) : "0",
Objects.nonNull(detailVO.getBrowseUserTotal()) ? String.valueOf(detailVO.getBrowseUserTotal()) : "0",
......
pcloud-service-book/src/main/resources/mapper/book/BookAdviser.Mapper.xml
......@@ -873,6 +873,7 @@
SELECT
BOOK_ID AS bookId,
ADVISER_ID adviserId,
CHANNEL_ID channelId,
CREATED_DATE createdDate
FROM
book_adviser
......
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