diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index 27b02001..f85b83e2 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java @@ -23,10 +23,7 @@ import com.yxt.supervise.report.biz.projectdailyaccount.ProjectDailyAccountDto; import com.yxt.supervise.report.biz.projectdailyaccount.ProjectDailyAccountService; import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGather; import com.yxt.supervise.report.biz.wechat.WechatService; -import com.yxt.supervise.report.ds.crm.CrmMapper; -import com.yxt.supervise.report.ds.crm.ProjectAccountVo; -import com.yxt.supervise.report.ds.crm.ProjectInfo; -import com.yxt.supervise.report.ds.crm.UserProject; +import com.yxt.supervise.report.ds.crm.*; import com.yxt.supervise.report.ds.system.SysUser; import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationFeign; import com.yxt.supervise.report.feign.system.sysuser.SysUserFeign; @@ -397,7 +394,14 @@ public class ProjectDailyService extends ServiceImpl projectDailyVos=baseMapper.getProjectDailys(qw); + ProjectDailyVosBig projectDailyV=baseMapper.getProjectDailySum(qw); + if(null==projectDailyV){ + + projectDailyV=new ProjectDailyVosBig(); + +// return rb.success().setData(new ProjectDailyVosBig()); + } QueryWrapper qw2 = new QueryWrapper<>(); if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) { qw2.eq("orderDate",sdf.format(DateUtil.offsetDay(DateUtil.parse(params.getOrderDate()),-1)) ); @@ -411,29 +415,58 @@ public class ProjectDailyService extends ServiceImpl sids=new ArrayList<>(); - for(ProjectDailyVos projectDailyVos1:projectDailyVos){ - sids.add(projectDailyVos1.getProjectSid()); + + if(projectDailyVos.size()==0){ + sids.add(query.getProjectSid()); +// return rb.success().setData(new ProjectDailyVosBig()); + }else{ + for(ProjectDailyVos projectDailyVos1:projectDailyVos){ + sids.add(projectDailyVos1.getProjectSid()); + } } //类型 List list=crmMapper.getProjectType(); for(ProjectInfo s:list){ List info= crmMapper.getCountByType(sids.toArray(),s.getSid()); + if(info.size()==0){ + continue; + } QueryWrapper qw1 = new QueryWrapper<>(); qw1.in("projectSid",info); qw1.eq("orderDate", params != null ? params.getOrderDate() : null); ProjectDailyVosBig projectDaily=baseMapper.getProjectDailyInSid(qw1); if(s.getProjectType().equals("保证类项目")){ projectDailyV.setBaoZheng(info.size()); - projectDailyV.setBzUseLimit(projectDaily.getUseLimit().add(projectDailyV.getBzUseLimit())); + if(projectDailyVos.size()!=0){ + projectDailyV.setBzUseLimit(projectDaily.getUseLimit().add(projectDailyV.getBzUseLimit())); +// return rb.success().setData(new ProjectDailyVosBig()); + }else{ + ProjectInfos info1=crmMapper.getProjectBigBySid (query.getProjectSid()); + projectDailyV.setBzUseLimit(info1.getUseLimit()); + } }else if(s.getProjectType().equals("动产质押类项目")){ projectDailyV.setDongChan(info.size()); - projectDailyV.setDcUseLimit(projectDaily.getUseLimit().add(projectDailyV.getDcUseLimit())); + if(projectDailyVos.size()!=0){ + projectDailyV.setDcUseLimit(projectDaily.getUseLimit().add(projectDailyV.getDcUseLimit())); +// return rb.success().setData(new ProjectDailyVosBig()); + }else{ + ProjectInfos info1=crmMapper.getProjectBigBySid (query.getProjectSid()); + projectDailyV.setDcUseLimit(info1.getUseLimit()); + } }else if(s.getProjectType().equals("应收帐款质押类项目")){ projectDailyV.setYingShou(info.size()); - projectDailyV.setYsUseLimit(projectDaily.getUseLimit().add(projectDailyV.getYsUseLimit())); + if(projectDailyVos.size()!=0){ + projectDailyV.setYsUseLimit(projectDaily.getUseLimit().add(projectDailyV.getYsUseLimit())); +// return rb.success().setData(new ProjectDailyVosBig()); + }else{ + ProjectInfos info1=crmMapper.getProjectBigBySid (query.getProjectSid()); + projectDailyV.setYsUseLimit(info1.getUseLimit()); + } } - System.out.println(info); + } + if(null==projectDailyYest){ + projectDailyYest=new ProjectDailyVosBig(); } projectDailyV.setAccountsBalanceBfb(sss(projectDailyV.getAccountsBalance(),projectDailyYest.getAccountsBalance())); projectDailyV.setAccountsReceivableBfb(sss(projectDailyV.getAccountsReceivable(),projectDailyYest.getAccountsReceivable())); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java index 7d28e616..f5389feb 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java @@ -67,11 +67,11 @@ public class ProjectDailyVosBig { private BigDecimal dcUseLimit=new BigDecimal(0); private int yingShou; private BigDecimal ysUseLimit=new BigDecimal(0); - private BigDecimal accountsBalanceBfb;//帐户余额 - private BigDecimal accountsReceivableBfb;//应收账款 - private BigDecimal stockAmountBfb;//库存货值 - private BigDecimal transitAmountBfb;//在途货值 - private BigDecimal advancePaymentBfb;//预付款 + private BigDecimal accountsBalanceBfb=new BigDecimal(0);//帐户余额 + private BigDecimal accountsReceivableBfb=new BigDecimal(0);//应收账款 + private BigDecimal stockAmountBfb=new BigDecimal(0);//库存货值 + private BigDecimal transitAmountBfb=new BigDecimal(0);//在途货值 + private BigDecimal advancePaymentBfb=new BigDecimal(0);//预付款 /** diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java index a8a3da76..c379c987 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java @@ -32,6 +32,8 @@ public interface CrmMapper extends BaseMapper { List listStoreHouseByProjectSid(@Param("projectSid") String projectSid); @Select("select * from project_information where sid = #{sid}") ProjectInfo getProjectBySid(@Param("sid") String sid); + @Select("select * from project_information where sid = #{sid}") + ProjectInfos getProjectBigBySid(@Param("sid") String sid); @Update("update project_information set useLimit=#{useLimit} where sid=#{sid}") int updateUseLimitBySid(@Param("useLimit") BigDecimal useLimit, @Param("sid")String sid); @Select("select * from user_project where projectSid = #{sid}") diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java index a236e7a0..0726fb72 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java @@ -24,4 +24,5 @@ public class ProjectInfo { private String signingDate; private String managerSid; private String bankSid; + private String typeSid; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfos.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfos.java new file mode 100644 index 00000000..4bd9a751 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfos.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.report.ds.crm; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author wangpengfei + * @date 2023/11/24 16:52 + */ +@Data +public class ProjectInfos { + private String id; + private String sid; + private String entryName; + private String regulatoryLeader; + private BigDecimal creditLimit=new BigDecimal(0); + private BigDecimal useLimit=new BigDecimal(0); + private double bankPledgeRate=0; + private double bankPledgeRateNew=0; + private String count; + private String projectType; + private String bankName; + private String bManagerName; + private String signingDate; + private String managerSid; + private String bankSid; + private String typeSid; +}