From 38890f68048e46c3f7d7d8baa2b72f0290f1fde7 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 16 Nov 2023 18:12:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=80=BB=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/projectdaily/ProjectDailyMapper.java | 4 +- .../biz/projectdaily/ProjectDailyMapper.xml | 24 ++++++++ .../biz/projectdaily/ProjectDailyRest.java | 10 ++++ .../biz/projectdaily/ProjectDailyService.java | 60 +++++++++++++++++++ .../biz/projectdaily/ProjectDailyVos.java | 8 +++ .../ProjectDailyAccountMapper.xml | 12 ++-- .../ProjectInformationRest.java | 6 ++ .../supervise/report/ds/crm/CrmMapper.java | 14 +++++ .../supervise/report/ds/crm/ProjectInfo.java | 3 + .../ProjectInformationFeign.java | 3 + 10 files changed, 137 insertions(+), 7 deletions(-) diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java index c16e4fcc..1e480b6f 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java @@ -17,5 +17,7 @@ public interface ProjectDailyMapper extends BaseMapper { IPage listPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew); @Select("select * from project_daily where orderDate=#{orderDate} and projectSid=#{projectSid}") ProjectDailyVos getProjectDaily( @Param("orderDate") String orderDate, @Param("projectSid") String projectSid); - List getProjectDailys( @Param(Constants.WRAPPER) Wrapper ew); + List getProjectDailys ( @Param(Constants.WRAPPER) Wrapper ew); + ProjectDailyVos getProjectDailySum( @Param(Constants.WRAPPER) Wrapper ew); + ProjectDailyVos getProjectDailyInSid( @Param(Constants.WRAPPER) Wrapper ew); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml index ce03e61b..2031bb3b 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml @@ -23,4 +23,28 @@ order by orderDate desc + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java index 77088786..8e6b62b1 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java @@ -122,4 +122,14 @@ public class ProjectDailyRest { ResultBean r=projectDailyService.getAccountByProjectSid(projectSid); return r; } + @ApiOperation("根据项目sid查询账户信息") + @PostMapping("/getProjectDailys") + public ResultBean getProjectDailys (@RequestBody ProjectDailyQuery query){ + return projectDailyService.getProjectDailys(query); + } + @ApiOperation("根据项目sid查询账户信息") + @PostMapping("/getProjectDailySum") + public ResultBean getProjectDailySum (@RequestBody ProjectDailyQuery query){ + return projectDailyService.getProjectDailySum(query); + } } 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 227ba306..9e748964 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 @@ -37,6 +37,7 @@ import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Service public class ProjectDailyService extends ServiceImpl { @@ -339,5 +340,64 @@ public class ProjectDailyService extends ServiceImpl> getProjectDailys(ProjectDailyQuery query) { + ResultBean rb=new ResultBean().fail(); + ProjectDailyQuery params = query; + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) { + qw.eq("orderDate", params.getOrderDate()); + } + + if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) { + qw.eq("projectSid", params.getProjectSid()); + } + } + List projectDailyVos=baseMapper.getProjectDailys(qw); + return rb.success().setData(projectDailyVos); + } + public ResultBean> getProjectDailySum(ProjectDailyQuery query) { + ResultBean rb=new ResultBean().fail(); + ProjectDailyQuery params = query; + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) { + qw.eq("orderDate", params.getOrderDate()); + } + + if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) { + qw.eq("projectSid", params.getProjectSid()); + } + } + List projectDailyVos=baseMapper.getProjectDailys(qw); + ProjectDailyVos projectDailyV=baseMapper.getProjectDailySum(qw); + + List sids=new ArrayList<>(); + for(ProjectDailyVos projectDailyVos1:projectDailyVos){ + sids.add(projectDailyVos1.getProjectSid()); + } + + //类型 + List list=crmMapper.getProjectType(); + for(ProjectInfo s:list){ + List info= crmMapper.getCountByType(sids.toArray(),s.getSid()); + QueryWrapper qw1 = new QueryWrapper<>(); + qw1.in("projectSid",info); + qw1.eq("orderDate", params != null ? params.getOrderDate() : null); + ProjectDailyVos projectDaily=baseMapper.getProjectDailyInSid(qw1); + if(s.getProjectType().equals("保证类项目")){ + projectDailyV.setBaoZheng(info.size()); + projectDailyV.setBzUseLimit(projectDaily.getUseLimit()+projectDailyV.getBzUseLimit()); + }else if(s.getProjectType().equals("动产质押类项目")){ + projectDailyV.setDongChan(info.size()); + projectDailyV.setDcUseLimit(projectDaily.getUseLimit()+projectDailyV.getDcUseLimit()); + }else if(s.getProjectType().equals("应收帐款质押类项目")){ + projectDailyV.setYingShou(info.size()); + projectDailyV.setYsUseLimit(projectDaily.getUseLimit()+projectDailyV.getYsUseLimit()); + } + System.out.println(info); + } + return rb.success().setData(projectDailyV); + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java index 8450bbec..80014a73 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.base.utils.StringUtils; import lombok.Data; import java.util.Date; @@ -58,6 +59,13 @@ public class ProjectDailyVos { private double useLimitW;//用信额度 万元 //1: 已上报报表 2 ：未上报报表 private String isReport; + private String projectType; + private int baoZheng; + private double bzUseLimit; + private int dongChan; + private double dcUseLimit; + private int yingShou; + private double ysUseLimit; /** diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml index 929065e6..92da8472 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdailyaccount/ProjectDailyAccountMapper.xml @@ -15,10 +15,10 @@ order by orderDate desc - + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java index 9ebcf6ba..d9f8357e 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectinformation/ProjectInformationRest.java @@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationFeign; import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationQuery; +import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -31,4 +32,9 @@ public class ProjectInformationRest { public ResultBean getProjectType(){ return projectInformationFeign.getProjectType(); } + @ApiOperation("查询全部（没有权限控制）") + @GetMapping("/listAllNew") + public ResultBean> listAllNew(@RequestHeader("token") String token){ + return projectInformationFeign.listAllNew(token); + } } 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 b561240a..102a74b7 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 @@ -56,4 +56,18 @@ public interface CrmMapper extends BaseMapper { List getAccountByProjectSid(@Param("projectSid")String projectSid); @Select("select * from project_information") List getProjects(); + @Select("select sid,projectType from project_type_dictionary") + List getProjectType(); + @Select({ + "" + }) + List getCountByType(@Param("ids") Object[] projectSids,@Param("typeSid") String typeSid); } 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 ea8debd6..6487d2c5 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.math.BigDecimal; +import java.time.Period; @Data @TableName("project_information") @@ -16,4 +17,6 @@ public class ProjectInfo { private double useLimit=0; private double bankPledgeRate=0; private double bankPledgeRateNew=0; + private String count; + private String projectType; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java index f37218c4..9382345f 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/crm/projectinformation/ProjectInformationFeign.java @@ -27,6 +27,9 @@ public interface ProjectInformationFeign { @ApiOperation("查询全部") @GetMapping("/listAll") public ResultBean> listAll(@RequestHeader("token") String token); + @ApiOperation("查询全部（没有权限控制）") + @GetMapping("/listAllNew") + public ResultBean> listAllNew(@RequestHeader("token") String token); @ApiOperation("根据用户sid查询项目名称App") @GetMapping("/getProjectByUserSidApp/{userSid}") public ResultBean getProjectByUserSidApp (@PathVariable("userSid")String userSid);