Skip to content

L
lingxi-lxy-yanshou
Commit 964d7a2d authored by liao_ds's avatar liao_ds
Browse files
Options

平台采购统计-待办处理

parent 4ec2b836
Hide whitespace changes
Inline Side-by-side
Showing with 435 additions and 12 deletions
report-service/src/main/java/com/ssy/lingxi/report/controller/PlatformHomeController.java
View file @ 964d7a2d
......@@ -67,6 +67,17 @@ public class PlatformHomeController extends BaseController {
}
/**
* 获取采购计数
* @author ds
* @date 2021/6/15
* @version 2.0.0
*/
@RequestMapping(value = "/getPurchaseTally", method = RequestMethod.GET)
Wrapper<PurchaseTallyVO> getPurchaseTally(HttpServletRequest httpRequest) {
return platformHomeService.getPurchaseTally(getSysUser(httpRequest));
}
/**
* 获取今日新增报表
* @author: 伍将
* @date: 2020/11/12
......
report-service/src/main/java/com/ssy/lingxi/report/dao/purchase/BiddingDAO.java
View file @ 964d7a2d
package com.ssy.lingxi.report.dao.purchase;
import cn.hutool.core.collection.CollectionUtil;
import com.ssy.lingxi.report.model.bo.tally.statistics.PlatformPurchaseStatisticsTallyVO;
import com.ssy.lingxi.report.model.bo.tally.statistics.PurchaseBiddingStatisticsTallyVO;
import com.ssy.lingxi.report.model.bo.tally.statistics.PurchaseOnlineBiddingStatisticsTallyVO;
import org.springframework.beans.factory.annotation.Qualifier;
......@@ -136,4 +137,16 @@ public class BiddingDAO {
}
return map!=null?map.values().stream().collect(Collectors.toList()):null;
}
/**
* 平台采购统计[待审核采购竞价]
* @return
*/
public PlatformPurchaseStatisticsTallyVO getPlatformStatisticsCount() {
StringBuilder sql = new StringBuilder();
sql.append(" select ")
.append(" count(*) toBeVerifyBiddingCount")
.append(" FROM pu_bidding where external_state=2 ;");
return jdbcTemplate.queryForObject(sql.toString(), new BeanPropertyRowMapper<>(PlatformPurchaseStatisticsTallyVO.class));
}
}
report-service/src/main/java/com/ssy/lingxi/report/dao/purchase/InviteTenderDAO.java
View file @ 964d7a2d
package com.ssy.lingxi.report.dao.purchase;
import cn.hutool.core.collection.CollectionUtil;
import com.ssy.lingxi.report.model.bo.tally.statistics.PlatformPurchaseStatisticsTallyVO;
import com.ssy.lingxi.report.model.bo.tally.statistics.PurchaseInviteTenderStatisticsTallyVO;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
......@@ -122,4 +123,15 @@ public class InviteTenderDAO {
return map!=null?map.values().stream().collect(Collectors.toList()):null;
}
/**
* 平台采购统计[待审核采购询价]
* @return
*/
public PlatformPurchaseStatisticsTallyVO getPlatformStatisticsCount() {
StringBuilder sql = new StringBuilder();
sql.append(" select ")
.append(" count(*) toBeVerifyInviteTenderCount")
.append(" FROM purchase_invite_tender where invite_tender_out_status=2 ;");
return jdbcTemplate.queryForObject(sql.toString(), new BeanPropertyRowMapper<>(PlatformPurchaseStatisticsTallyVO.class));
}
}
report-service/src/main/java/com/ssy/lingxi/report/dao/purchase/PurchaseInquiryDAO.java
View file @ 964d7a2d
package com.ssy.lingxi.report.dao.purchase;
import com.ssy.lingxi.report.model.bo.tally.statistics.PlatformPurchaseStatisticsTallyVO;
import com.ssy.lingxi.report.model.bo.tally.statistics.PurchaseConfirmQuotedPriceStatisticsTallyVO;
import com.ssy.lingxi.report.model.bo.tally.statistics.PurchaseInquiryStatisticsTallyVO;
import org.springframework.beans.factory.annotation.Qualifier;
......@@ -57,4 +58,15 @@ public class PurchaseInquiryDAO {
return jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(PurchaseConfirmQuotedPriceStatisticsTallyVO.class));
}
/**
* 平台采购统计[待审核采购询价]
* @return
*/
public PlatformPurchaseStatisticsTallyVO getPlatformStatisticsCount() {
StringBuilder sql = new StringBuilder();
sql.append(" select ")
.append(" count(*) toBeVerifyInquiryCount")
.append(" FROM pu_purchase_inquiry where external_state=2 ;");
return jdbcTemplate.queryForObject(sql.toString(), new BeanPropertyRowMapper<>(PlatformPurchaseStatisticsTallyVO.class));
}
}
report-service/src/main/java/com/ssy/lingxi/report/model/bo/MemberTallyReportBO.java
View file @ 964d7a2d
......@@ -120,6 +120,10 @@ public class MemberTallyReportBO implements Serializable {
* 采购计划
*/
private PurchasePlanTallyBO purchasePlan;
/**
* 平台采购统计
*/
private PlatformPurchaseTallyBO platformPurchase;
/****************************合同中心*******************************/
/**
......@@ -565,4 +569,12 @@ public class MemberTallyReportBO implements Serializable {
public void setPlatformMemberVerifyTallyBO(PlatformMemberVerifyTallyBO platformMemberVerifyTallyBO) {
this.platformMemberVerifyTallyBO = platformMemberVerifyTallyBO;
}
public PlatformPurchaseTallyBO getPlatformPurchase() {
return platformPurchase;
}
public void setPlatformPurchase(PlatformPurchaseTallyBO platformPurchase) {
this.platformPurchase = platformPurchase;
}
}
report-service/src/main/java/com/ssy/lingxi/report/model/bo/tally/PlatformPurchaseTallyBO.java 0 → 100644
View file @ 964d7a2d
package com.ssy.lingxi.report.model.bo.tally;
import java.io.Serializable;
/**
* 平台采购统计.
* @author ds
* @date 2021/6/15
* @version 2.0.0
*/
public class PlatformPurchaseTallyBO implements Serializable {
private static final long serialVersionUID = 8643590861720563721L;
/**
* 待审核采购询价
*/
private Long toBeVerifyInquiryCount = 0L;
/**
* 待审核采购竞价
*/
private Long toBeVerifyBiddingCount = 0L;
/**
* 待审核招标项目
*/
private Long toBeVerifyInviteTenderCount = 0L;
public Long getToBeVerifyInquiryCount() {
return toBeVerifyInquiryCount;
}
public void setToBeVerifyInquiryCount(Long toBeVerifyInquiryCount) {
this.toBeVerifyInquiryCount = toBeVerifyInquiryCount;
}
public Long getToBeVerifyBiddingCount() {
return toBeVerifyBiddingCount;
}
public void setToBeVerifyBiddingCount(Long toBeVerifyBiddingCount) {
this.toBeVerifyBiddingCount = toBeVerifyBiddingCount;
}
public Long getToBeVerifyInviteTenderCount() {
return toBeVerifyInviteTenderCount;
}
public void setToBeVerifyInviteTenderCount(Long toBeVerifyInviteTenderCount) {
this.toBeVerifyInviteTenderCount = toBeVerifyInviteTenderCount;
}
}
report-service/src/main/java/com/ssy/lingxi/report/model/bo/tally/statistics/PlatformPurchaseStatisticsTallyVO.java 0 → 100644
View file @ 964d7a2d
package com.ssy.lingxi.report.model.bo.tally.statistics;
import java.io.Serializable;
/**
* 平台采购统计计数
* @author: ds
* @date: 2021/5/12
* @version: 2.0.0
*/
public class PlatformPurchaseStatisticsTallyVO implements Serializable {
private static final long serialVersionUID = -6579595614302137409L;
/**
* 会员id
*/
private Long memberId;
/**
* 角色id
*/
private Long roleId;
/**
* 待审核采购询价
*/
private Long toBeVerifyInquiryCount = 0L;
/**
* 待审核采购竞价
*/
private Long toBeVerifyBiddingCount = 0L;
/**
* 待审核招标项目
*/
private Long toBeVerifyInviteTenderCount = 0L;
public Long getMemberId() {
return memberId;
}
public void setMemberId(Long memberId) {
this.memberId = memberId;
}
public Long getRoleId() {
return roleId;
}
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
public Long getToBeVerifyInquiryCount() {
return toBeVerifyInquiryCount;
}
public void setToBeVerifyInquiryCount(Long toBeVerifyInquiryCount) {
this.toBeVerifyInquiryCount = toBeVerifyInquiryCount;
}
public Long getToBeVerifyBiddingCount() {
return toBeVerifyBiddingCount;
}
public void setToBeVerifyBiddingCount(Long toBeVerifyBiddingCount) {
this.toBeVerifyBiddingCount = toBeVerifyBiddingCount;
}
public Long getToBeVerifyInviteTenderCount() {
return toBeVerifyInviteTenderCount;
}
public void setToBeVerifyInviteTenderCount(Long toBeVerifyInviteTenderCount) {
this.toBeVerifyInviteTenderCount = toBeVerifyInviteTenderCount;
}
}
report-service/src/main/java/com/ssy/lingxi/report/model/vo/response/PurchaseTallyReportVO.java
View file @ 964d7a2d
......@@ -49,6 +49,10 @@ public class PurchaseTallyReportVO implements Serializable {
* 采购计划
*/
private List<TallyReportItemVO> purchasePlanList;
/**
* 平台采购统计
*/
private List<TallyReportItemVO> PlatformPurchaseList;
public List<TallyReportItemVO> getPurchaseInquiryList() {
return purchaseInquiryList;
......@@ -121,4 +125,12 @@ public class PurchaseTallyReportVO implements Serializable {
public void setPurchasePlanList(List<TallyReportItemVO> purchasePlanList) {
this.purchasePlanList = purchasePlanList;
}
public List<TallyReportItemVO> getPlatformPurchaseList() {
return PlatformPurchaseList;
}
public void setPlatformPurchaseList(List<TallyReportItemVO> platformPurchaseList) {
PlatformPurchaseList = platformPurchaseList;
}
}
report-service/src/main/java/com/ssy/lingxi/report/model/vo/response/PurchaseTallyVO.java 0 → 100644
View file @ 964d7a2d
package com.ssy.lingxi.report.model.vo.response;
import java.io.Serializable;
import java.util.List;
/**
* [平台]采购计数VO
* @author ds
* @date 2021/6/15
* @version 2.0.0
*/
public class PurchaseTallyVO implements Serializable {
private static final long serialVersionUID = 2483421067960607183L;
/**
* 待处理
*/
private List<TallyReportItemVO> todoList;
public List<TallyReportItemVO> getTodoList() {
return todoList;
}
public void setTodoList(List<TallyReportItemVO> todoList) {
this.todoList = todoList;
}
}
report-service/src/main/java/com/ssy/lingxi/report/service/IPlatformHomeService.java
View file @ 964d7a2d
......@@ -2,10 +2,7 @@ package com.ssy.lingxi.report.service;
import com.ssy.lingxi.common.model.dto.UserLoginCacheDTO;
import com.ssy.lingxi.common.response.Wrapper;
import com.ssy.lingxi.report.model.vo.response.AccountAndSettleAccountTallyVO;
import com.ssy.lingxi.report.model.vo.response.PlatformCommodityTallyVO;
import com.ssy.lingxi.report.model.vo.response.TallyReportItemVO;
import com.ssy.lingxi.report.model.vo.response.TradeAndAfterSaleTallyVO;
import com.ssy.lingxi.report.model.vo.response.*;
import java.util.List;
......@@ -44,4 +41,11 @@ public interface IPlatformHomeService {
* @return
*/
Wrapper<AccountAndSettleAccountTallyVO> getAccountAndSettleAccountTally(UserLoginCacheDTO user);
/**
* 获取[平台]采购计数统计
* @param sysUser
* @return
*/
Wrapper<PurchaseTallyVO> getPurchaseTally(UserLoginCacheDTO sysUser);
}
report-service/src/main/java/com/ssy/lingxi/report/service/tally/IPurchaseTallyService.java
View file @ 964d7a2d
......@@ -3,6 +3,7 @@ package com.ssy.lingxi.report.service.tally;
import com.ssy.lingxi.report.api.vo.request.OperateNoticeVO;
import com.ssy.lingxi.report.entity.report.MemberTallyReportDO;
import com.ssy.lingxi.report.model.bo.MemberTallyReportBO;
import com.ssy.lingxi.report.model.bo.tally.PlatformPurchaseTallyBO;
import com.ssy.lingxi.report.model.vo.response.PurchaseTallyReportVO;
import java.util.List;
......@@ -24,13 +25,20 @@ public interface IPurchaseTallyService {
MemberTallyReportBO setPurchaseTally(MemberTallyReportBO tallyReportO, OperateNoticeVO noticeVO);
/**
* 转换合同
* 转换采购
* @param reportBO
* @return
*/
PurchaseTallyReportVO convertPurchaseTally(MemberTallyReportBO reportBO);
/**
* 转换平台采购
* @param tallyBO
* @return
*/
PurchaseTallyReportVO convertPlatformPurchaseTally(PlatformPurchaseTallyBO tallyBO);
/**
* 统计计数
* @param reportList
* @return
......
report-service/src/main/java/com/ssy/lingxi/report/serviceimpl/PlatformHomeServiceImpl.java
View file @ 964d7a2d
package com.ssy.lingxi.report.serviceimpl;
import cn.hutool.core.date.DateUtil;
import com.ssy.lingxi.common.constant.MemberRoleEnum;
import com.ssy.lingxi.common.model.dto.UserLoginCacheDTO;
import com.ssy.lingxi.common.response.ResponseCode;
import com.ssy.lingxi.common.response.Wrapper;
import com.ssy.lingxi.report.api.enums.AfterSaleReturnHandleOperateTypeEnum;
import com.ssy.lingxi.report.api.enums.CommodityOperateTypeEnum;
import com.ssy.lingxi.report.api.enums.DemandPublishOperateTypeEnum;
import com.ssy.lingxi.report.api.enums.SaleOrderOperateTypeEnum;
import com.ssy.lingxi.report.api.enums.*;
import com.ssy.lingxi.report.entity.report.MemberTallyReportDO;
import com.ssy.lingxi.report.entity.report.NewlyAddedDayReportDO;
import com.ssy.lingxi.report.model.bo.MemberTallyReportBO;
......@@ -221,4 +219,42 @@ public class PlatformHomeServiceImpl implements IPlatformHomeService {
return Wrapper.success(result);
}
@Override
public Wrapper<PurchaseTallyVO> getPurchaseTally(UserLoginCacheDTO sysUser) {
PurchaseTallyVO result = new PurchaseTallyVO();
// 平台账户查询时，默认会员与角色id为0
MemberTallyReportDO reportDO = tallyReportService.getTallyDetail(MemberRoleEnum.PLATFORM.getMemberId(), MemberRoleEnum.PLATFORM.getRoleId());
if (reportDO == null) {
reportDO = new MemberTallyReportDO();
}
if (reportDO.getTallyReport() == null) {
MemberTallyReportBO memberTallyReportBO = new MemberTallyReportBO();
reportDO.setTallyReport(memberTallyReportBO);
}
// 交易
List<TallyReportItemVO> itemVOList = new ArrayList<>();
// 待审核采购询价
TallyReportItemVO itemVO = new TallyReportItemVO();
itemVO.setName(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_INQUIRY_COUNT.getName());
itemVO.setLink(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_INQUIRY_COUNT.getLink());
itemVO.setCount(reportDO.getTallyReport().getPlatformPurchase() != null && reportDO.getTallyReport().getPlatformPurchase().getToBeVerifyInquiryCount() > 0 ? reportDO.getTallyReport().getPlatformPurchase().getToBeVerifyInquiryCount() : 0L);
itemVOList.add(itemVO);
// 待审核采购竞价
itemVO = new TallyReportItemVO();
itemVO.setName(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_BIDDING_COUNT.getName());
itemVO.setLink(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_BIDDING_COUNT.getLink());
itemVO.setCount(reportDO.getTallyReport().getTradeSaleOrder() != null && reportDO.getTallyReport().getPlatformPurchase().getToBeVerifyBiddingCount() > 0 ? reportDO.getTallyReport().getPlatformPurchase().getToBeVerifyBiddingCount() : 0L);
itemVOList.add(itemVO);
// 待审核招标项目
itemVO = new TallyReportItemVO();
itemVO.setName(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_INVITE_TENDER_COUNT.getName());
itemVO.setLink(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_INVITE_TENDER_COUNT.getLink());
itemVO.setCount(reportDO.getTallyReport().getAfterSaleReturnHandle() != null && reportDO.getTallyReport().getPlatformPurchase().getToBeVerifyInviteTenderCount() > 0 ? reportDO.getTallyReport().getPlatformPurchase().getToBeVerifyInviteTenderCount() : 0L);
itemVOList.add(itemVO);
result.setTodoList(itemVOList);
return Wrapper.success(result);
}
}
report-service/src/main/java/com/ssy/lingxi/report/serviceimpl/tally/PurchaseTallyServiceImpl.java
View file @ 964d7a2d
package com.ssy.lingxi.report.serviceimpl.tally;
import cn.hutool.core.collection.CollectionUtil;
import com.ssy.lingxi.common.constant.MemberRoleEnum;
import com.ssy.lingxi.report.api.enums.*;
import com.ssy.lingxi.report.api.vo.request.OperateNoticeVO;
import com.ssy.lingxi.report.dao.purchase.*;
......@@ -84,6 +85,39 @@ public class PurchaseTallyServiceImpl implements IPurchaseTallyService {
}
/**
* 转换平台采购
* @param tallyBO
* @return
*/
public PurchaseTallyReportVO convertPlatformPurchaseTally(PlatformPurchaseTallyBO tallyBO) {
PurchaseTallyReportVO vo=new PurchaseTallyReportVO();
List<TallyReportItemVO> resultList = new ArrayList<>();
if (tallyBO == null) {
tallyBO = new PlatformPurchaseTallyBO();
}
//待审核采购询价
TallyReportItemVO tallyReportItem = new TallyReportItemVO();
tallyReportItem.setCount(tallyBO.getToBeVerifyInquiryCount() > 0 ? tallyBO.getToBeVerifyInquiryCount() : 0);
tallyReportItem.setName(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_INQUIRY_COUNT.getName());
tallyReportItem.setLink(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_INQUIRY_COUNT.getLink());
resultList.add(tallyReportItem);
//待审核采购竞价
tallyReportItem = new TallyReportItemVO();
tallyReportItem.setCount(tallyBO.getToBeVerifyBiddingCount() > 0 ? tallyBO.getToBeVerifyBiddingCount() : 0);
tallyReportItem.setName(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_BIDDING_COUNT.getName());
tallyReportItem.setLink(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_BIDDING_COUNT.getLink());
resultList.add(tallyReportItem);
//待审核招标项目
tallyReportItem = new TallyReportItemVO();
tallyReportItem.setCount(tallyBO.getToBeVerifyInviteTenderCount() > 0 ? tallyBO.getToBeVerifyInviteTenderCount() : 0);
tallyReportItem.setName(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_INVITE_TENDER_COUNT.getName());
tallyReportItem.setLink(PlatformPurchaseOperateTypeEnum.TO_BE_VERIFY_INVITE_TENDER_COUNT.getLink());
resultList.add(tallyReportItem);
vo.setPlatformPurchaseList(resultList);
return vo;
}
/**
* 转换采购询价数据
* @param tallyBO
* @return
......@@ -516,8 +550,6 @@ public class PurchaseTallyServiceImpl implements IPurchaseTallyService {
return resultList;
}
/**
* 设置采购
* @param tallyReportBO 会员计数报表
......@@ -556,6 +588,9 @@ public class PurchaseTallyServiceImpl implements IPurchaseTallyService {
case PURCHASE_PLAN: // 转换采购计划数据
tallyReportBO.setPurchasePlan(setPurchasePlanTally(tallyReportBO.getPurchasePlan(), noticeVO));
break;
case PLATFORM_PURCHASE: // 转换平台采购统计数据
tallyReportBO.setPlatformPurchase(setPlatformPurchaseTally(tallyReportBO.getPlatformPurchase(), noticeVO));
break;
}
return tallyReportBO;
}
......@@ -1089,6 +1124,53 @@ public class PurchaseTallyServiceImpl implements IPurchaseTallyService {
}
/**
* 设置平台采购统计数据
* @param tallyBO
* @param noticeVO
* @return
*/
private PlatformPurchaseTallyBO setPlatformPurchaseTally(PlatformPurchaseTallyBO tallyBO, OperateNoticeVO noticeVO) {
if (tallyBO == null) {
tallyBO = new PlatformPurchaseTallyBO();
}
// 更新数据
PlatformPurchaseOperateTypeEnum typeEnum;
if (noticeVO.getReduceCount() > 0) {
typeEnum = PlatformPurchaseOperateTypeEnum.getEnum(noticeVO.getReduceOperateType());
if (typeEnum != null) {
switch (typeEnum) {
case TO_BE_VERIFY_INQUIRY_COUNT:
tallyBO.setToBeVerifyInquiryCount(tallyBO.getToBeVerifyInquiryCount() - noticeVO.getReduceCount());
break;
case TO_BE_VERIFY_BIDDING_COUNT:
tallyBO.setToBeVerifyBiddingCount(tallyBO.getToBeVerifyBiddingCount() - noticeVO.getReduceCount());
break;
case TO_BE_VERIFY_INVITE_TENDER_COUNT:
tallyBO.setToBeVerifyInviteTenderCount(tallyBO.getToBeVerifyInviteTenderCount() - noticeVO.getReduceCount());
break;
}
}
}
if (noticeVO.getIncreaseCount() > 0) {
typeEnum = PlatformPurchaseOperateTypeEnum.getEnum(noticeVO.getIncreaseOperateType());
if (typeEnum != null) {
switch (typeEnum) {
case TO_BE_VERIFY_INQUIRY_COUNT:
tallyBO.setToBeVerifyInquiryCount(tallyBO.getToBeVerifyInquiryCount() + noticeVO.getIncreaseCount());
break;
case TO_BE_VERIFY_BIDDING_COUNT:
tallyBO.setToBeVerifyBiddingCount(tallyBO.getToBeVerifyBiddingCount() + noticeVO.getIncreaseCount());
break;
case TO_BE_VERIFY_INVITE_TENDER_COUNT:
tallyBO.setToBeVerifyInviteTenderCount(tallyBO.getToBeVerifyInviteTenderCount() + noticeVO.getIncreaseCount());
break;
}
}
}
return tallyBO;
}
/**
* 统计计数-采购
* @param reportList
* @return
......@@ -1113,6 +1195,8 @@ public class PurchaseTallyServiceImpl implements IPurchaseTallyService {
reportList = statisticsNeedPlanTally(reportList);
//采购计划
reportList = statisticsPurchasePlanTally(reportList);
//统计平台采购
reportList=statisticsPlatformPurchaseTally(reportList);
return reportList;
}
......@@ -1467,4 +1551,61 @@ public class PurchaseTallyServiceImpl implements IPurchaseTallyService {
}
return dbReportList.values().stream().collect(Collectors.toList());
}
/**
* 统计平台采购
* @param reportList
* @return
*/
private List<MemberTallyReportDO> statisticsPlatformPurchaseTally(List<MemberTallyReportDO> reportList) {
if (reportList == null) {
reportList = new ArrayList<>();
}
Map<String, MemberTallyReportDO> dbReportList = reportList.stream().collect(Collectors.toMap(o -> o.getMemberId() + ":" + o.getRoleId(), o -> o));
PlatformPurchaseStatisticsTallyVO platformPurchaseCount = getPlatformPurchaseStatistics();
String key=platformPurchaseCount.getMemberId()+":"+platformPurchaseCount.getRoleId();
MemberTallyReportDO memberTallyReportDO = dbReportList.get(key);
if(memberTallyReportDO==null){
memberTallyReportDO=new MemberTallyReportDO();
memberTallyReportDO.setMemberId(platformPurchaseCount.getMemberId());
memberTallyReportDO.setRoleId(platformPurchaseCount.getRoleId());
MemberTallyReportBO memberTallyReportBO=new MemberTallyReportBO();
memberTallyReportDO.setTallyReport(memberTallyReportBO);
PlatformPurchaseTallyBO bo=new PlatformPurchaseTallyBO();
BeanUtils.copyProperties(platformPurchaseCount,bo);
memberTallyReportDO.getTallyReport().setPlatformPurchase(bo);
dbReportList.put(key,memberTallyReportDO);
}else{
PlatformPurchaseTallyBO bo = memberTallyReportDO.getTallyReport().getPlatformPurchase();
if(bo==null){
bo=new PlatformPurchaseTallyBO();
}
BeanUtils.copyProperties(platformPurchaseCount,bo);
memberTallyReportDO.getTallyReport().setPlatformPurchase(bo);
}
return dbReportList.values().stream().collect(Collectors.toList());
}
/**
* 获得采购-平台-待审核[询价、竞价、招标]计数
* @return
*/
private PlatformPurchaseStatisticsTallyVO getPlatformPurchaseStatistics(){
PlatformPurchaseStatisticsTallyVO result=new PlatformPurchaseStatisticsTallyVO();
result.setMemberId(MemberRoleEnum.PLATFORM.getMemberId());
result.setRoleId(MemberRoleEnum.PLATFORM.getRoleId());
PlatformPurchaseStatisticsTallyVO inquiryCount = purchaseInquiryDAO.getPlatformStatisticsCount();
if(inquiryCount!=null){
result.setToBeVerifyInquiryCount(inquiryCount.getToBeVerifyInquiryCount());
}
PlatformPurchaseStatisticsTallyVO biddingCount = biddingDAO.getPlatformStatisticsCount();
if(biddingCount!=null){
result.setToBeVerifyBiddingCount(biddingCount.getToBeVerifyBiddingCount());
}
PlatformPurchaseStatisticsTallyVO inviteTenderCount = inviteTenderDAO.getPlatformStatisticsCount();
if(inviteTenderCount!=null){
result.setToBeVerifyInviteTenderCount(inviteTenderCount.getToBeVerifyInviteTenderCount());
}
return result;
}
}
report-service/src/main/java/com/ssy/lingxi/report/serviceimpl/tally/TallyReportServiceImpl.java
View file @ 964d7a2d
package com.ssy.lingxi.report.serviceimpl.tally;
import com.ssy.lingxi.common.constant.Constants;
import com.ssy.lingxi.common.constant.MemberRoleEnum;
import com.ssy.lingxi.common.exception.BusinessException;
import com.ssy.lingxi.common.model.dto.UserLoginCacheDTO;
import com.ssy.lingxi.common.response.ResponseCode;
......@@ -209,7 +210,12 @@ public class TallyReportServiceImpl implements ITallyReportService {
// 转换合同
result.setContract(contractTallyService.convertContractTally(reportDO.getTallyReport()));
// 转换采购
result.setPurchase(purchaseTallyService.convertPurchaseTally(reportDO.getTallyReport()));
if(MemberRoleEnum.PLATFORM.getMemberId().equals(reportDO.getMemberId())){
result.setPurchase(purchaseTallyService.convertPlatformPurchaseTally(reportDO.getTallyReport().getPlatformPurchase()));
}else{
result.setPurchase(purchaseTallyService.convertPurchaseTally(reportDO.getTallyReport()));
}
//订单
result.setOrder(orderTallyService.convertOrderTally(reportDO.getTallyReport()));
return result;
......
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