From 293ac948b2d05fa37b059dd0885ee5e55841b83d Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Sat, 18 Nov 2023 18:22:14 +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/datacenter/DataCenterMapper.java | 5 + .../biz/datacenter/DataCenterQuery.java | 2 + .../report/biz/datacenter/DataCenterRest.java | 74 ++++++++++++ .../biz/datacenter/DataCenterService.java | 17 +++ .../biz/projectdaily/ProjectDailyMapper.java | 5 +- .../biz/projectdaily/ProjectDailyMapper.xml | 12 +- .../biz/projectdaily/ProjectDailyQuery.java | 2 + .../biz/projectdaily/ProjectDailyRest.java | 9 +- .../biz/projectdaily/ProjectDailyService.java | 113 +++++++++++++++++- .../biz/projectdaily/ProjectDailyVosBig.java | 108 +++++++++++++++++ .../ReportInventoryDayGatherService.java | 28 +++++ .../supervise/report/ds/crm/CrmMapper.java | 18 +++ .../supervise/report/ds/crm/ProjectInfo.java | 5 + .../sysorganization/SysOrganizationFeign.java | 1 + .../feign/system/sysuser/SysUserFeign.java | 3 + 15 files changed, 390 insertions(+), 12 deletions(-) create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterMapper.java index e1e8ba98..0f167115 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterMapper.java @@ -3,6 +3,8 @@ package com.yxt.supervise.report.biz.datacenter; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.supervise.report.api.dailysalesreport.DailySalesReport; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @author wangpengfei @@ -10,4 +12,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface DataCenterMapper extends BaseMapper { + @Select("select shSid from project_sh where projectSid=#{projectSid}") + String getProjectIsJk (@Param("projectSid")String projectSid); + } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java index 65422b07..11e65798 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java @@ -13,6 +13,8 @@ public class DataCenterQuery implements Query { private String startDate; //间隔时间 private String intervalTime; + // + private String projectSid; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java index 4931ed3b..a1dcdbfb 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java @@ -1,5 +1,6 @@ package com.yxt.supervise.report.biz.datacenter; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo; import com.yxt.supervise.report.biz.projectdaily.ProjectDailyQuery; @@ -36,6 +37,7 @@ public class DataCenterRest { DataCenterService dataCenterService; //数据总览 + /*********************************************36524演示************************************/ @PostMapping("/getProjectDaily") public ResultBean getProjectDaily(@RequestBody ProjectDailys ProjectDailys) { ResultBean rb = ResultBean.fireFail(); @@ -93,4 +95,76 @@ public class DataCenterRest { List> pv = reportInventoryDayGatherService.getInventoryByOrderDate(orderDate); return rb.success().setData(pv); } + /**************************************************通用**********************************************************/ + //数据总览 + @PostMapping("/getProjectDailyNew") + public ResultBean getProjectDailyNew(@RequestBody ProjectDailys ProjectDailys) { + ResultBean rb = ResultBean.fireFail(); +// ResultBean b=projectDailyService.ww(ProjectDailys); +// if(!b.getCode().equals("200")){ +// return b; +// } + ProjectDailyVos pv = projectDailyService.fetchByProjectAndDay(ProjectDailys.getProjectSid(), ProjectDailys.getOrderDate()); + return rb.success().setData(pv); + } + + //仓库安防 + @ApiOperation("查询项目是否存在绑定监控的仓库") + @GetMapping("/getProjectIsJk") + public ResultBean getProjectIsJk(@RequestParam String projectSid){ + return dataCenterService.getProjectIsJk(projectSid); + } + @ApiOperation("获取正常视频流") + @GetMapping("/getVedioPcLiveByIdNew") + public ResultBean getVedioPcLiveByIdNew(@RequestParam String id){ + + return yDeviceImageFeign.getVedioPcLiveById(id); + } + @ApiOperation("获取回放视频流") + @GetMapping("/getVedioPcRecByIdNew") + public ResultBean getVedioPcRecByIdNew(@RequestParam String id){ + return yDeviceImageFeign.getVedioPcRecById(id); + } + @ApiOperation("获取指定设备列表") + @GetMapping("/getOtherListNew") + public ResultBean getOtherListNew( String type, String ckId){ +// String b = dataCenterService.getProjectIsJk(projectSid); + return yDeviceFeign.getOtherList(type, ckId); + } + @ApiOperation("获取状态数量") + @GetMapping("/getStatusCountNew") + public ResultBean getStatusCountNew(String deviceType, String statusType, String ckId){ + return yDeviceFeign.getStatusCount(deviceType, statusType, ckId); + + + } + //库存分析图 + @PostMapping("/getReportInventoryNew") + public ResultBean getReportInventoryNew(@RequestBody DataCenterQuery dataCenterQuery) { + ResultBean rb = ResultBean.fireFail(); + Map pv = projectDailyService.getInventoryByOrderDate(dataCenterQuery); + return rb.success().setData(pv); + } + //告警消息 + +// @PostMapping("/getRisk") +// public ResultBean getRisk() { +// ResultBean rb = ResultBean.fireFail(); +// List pv = reportInventoryDayGatherService.getReportInventoryByOrderDate(); +// return rb.success().setData(pv); +// } + + //仓库库存表 + + @GetMapping("/getInventoryNew") + public ResultBean getInventoryNew(String orderDate) { + ResultBean rb = ResultBean.fireFail(); + List> pv = reportInventoryDayGatherService.getInventoryByOrderDate(orderDate); + return rb.success().setData(pv); + } + @GetMapping("/getProjectBySid") + public ResultBean getProjectBySid(String projectSid) { + ResultBean rb = ResultBean.fireFail(); + return reportInventoryDayGatherService.getProjectBySid(projectSid); + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java index 6319cd32..bcea9e2a 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java @@ -3,6 +3,8 @@ package com.yxt.supervise.report.biz.datacenter; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.report.api.dailysalesreport.DailySalesReport; import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo; import com.yxt.supervise.report.api.reportinventorydaystore.ReportInventoryDayStoreVo; @@ -25,4 +27,19 @@ import java.util.Map; @Service public class DataCenterService extends MybatisBaseService { + public ResultBean getProjectIsJk(String project){ + ResultBean rb =new ResultBean<>(); + String i=baseMapper.getProjectIsJk(project); + if(StringUtils.isBlank(i)){ + return rb.fail().setMsg("此项目暂未绑定"); + }else { + return rb.success().setData(i); + } + } +// public String getProjectIsJk(String project){ +//// ResultBean rb =new ResultBean<>(); +// String i=baseMapper.getProjectIsJk(project); +// return i; +// +// } } 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 1e480b6f..53bd5a45 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 @@ -18,6 +18,7 @@ public interface ProjectDailyMapper extends BaseMapper { @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); - ProjectDailyVos getProjectDailySum( @Param(Constants.WRAPPER) Wrapper ew); - ProjectDailyVos getProjectDailyInSid( @Param(Constants.WRAPPER) Wrapper ew); + ProjectDailyVosBig getProjectDailySum( @Param(Constants.WRAPPER) Wrapper ew); + ProjectDailyVosBig getProjectDailyInSid( @Param(Constants.WRAPPER) Wrapper ew); + List getInventoryByOrderDate( @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 2031bb3b..77d01d63 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 @@ -29,7 +29,7 @@ ${ew.sqlSegment} - select sum(accountsBalance) as accountsBalance , sum(accountsReceivable) as accountsReceivable , sum(stockAmount) as stockAmount , @@ -40,11 +40,19 @@ ${ew.sqlSegment} - select sum(useLimit) as useLimit from project_daily ${ew.sqlSegment} + + \ 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/ProjectDailyQuery.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyQuery.java index 4ecff82f..1d943098 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyQuery.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyQuery.java @@ -28,4 +28,6 @@ public class ProjectDailyQuery implements Query { private String dataDateStart; // 数据日期 private String dataDateEnd; // 数据日期 private String userSid; + //时间间隔 + private String intervalTime; } 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 8e6b62b1..bcf27c49 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,14 +122,19 @@ public class ProjectDailyRest { ResultBean r=projectDailyService.getAccountByProjectSid(projectSid); return r; } - @ApiOperation("根据项目sid查询账户信息") + @ApiOperation("数据总览列表") @PostMapping("/getProjectDailys") public ResultBean getProjectDailys (@RequestBody ProjectDailyQuery query){ return projectDailyService.getProjectDailys(query); } - @ApiOperation("根据项目sid查询账户信息") + @ApiOperation("数据总览") @PostMapping("/getProjectDailySum") public ResultBean getProjectDailySum (@RequestBody ProjectDailyQuery query){ return projectDailyService.getProjectDailySum(query); } + @ApiOperation("数据总览-折线图") + @PostMapping("/getProjectDailyZx") + public ResultBean getProjectDailyZx (@RequestBody ProjectDailyQuery query){ + return projectDailyService.getProjectDailyZx(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 9e748964..7fade966 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 @@ -1,6 +1,7 @@ package com.yxt.supervise.report.biz.projectdaily; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; @@ -14,10 +15,13 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.report.api.messageopenid.MessageOpenid; import com.yxt.supervise.report.api.messagepushlog.MessagePushLog; +import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo; +import com.yxt.supervise.report.biz.datacenter.DataCenterQuery; import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService; import com.yxt.supervise.report.biz.messagepushlog.MessagePushLogService; 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; @@ -28,6 +32,7 @@ import com.yxt.supervise.report.feign.crm.projectinformation.ProjectInformationF import com.yxt.supervise.report.feign.system.sysuser.SysUserFeign; import com.yxt.supervise.system.sysuser.SysUserVo; import org.apache.commons.lang3.StringUtils; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; @@ -35,6 +40,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -257,8 +263,9 @@ public class ProjectDailyService extends ServiceImpl> getAccountByProjectSid(String projectSid) { ResultBean rb=new ResultBean(); @@ -371,7 +378,7 @@ public class ProjectDailyService extends ServiceImpl projectDailyVos=baseMapper.getProjectDailys(qw); - ProjectDailyVos projectDailyV=baseMapper.getProjectDailySum(qw); + ProjectDailyVosBig projectDailyV=baseMapper.getProjectDailySum(qw); List sids=new ArrayList<>(); for(ProjectDailyVos projectDailyVos1:projectDailyVos){ @@ -385,19 +392,113 @@ public class ProjectDailyService extends ServiceImpl qw1 = new QueryWrapper<>(); qw1.in("projectSid",info); qw1.eq("orderDate", params != null ? params.getOrderDate() : null); - ProjectDailyVos projectDaily=baseMapper.getProjectDailyInSid(qw1); + ProjectDailyVosBig projectDaily=baseMapper.getProjectDailyInSid(qw1); if(s.getProjectType().equals("保证类项目")){ projectDailyV.setBaoZheng(info.size()); - projectDailyV.setBzUseLimit(projectDaily.getUseLimit()+projectDailyV.getBzUseLimit()); + projectDailyV.setBzUseLimit(projectDaily.getUseLimit().add(projectDailyV.getBzUseLimit())); }else if(s.getProjectType().equals("动产质押类项目")){ projectDailyV.setDongChan(info.size()); - projectDailyV.setDcUseLimit(projectDaily.getUseLimit()+projectDailyV.getDcUseLimit()); + projectDailyV.setDcUseLimit(projectDaily.getUseLimit().add(projectDailyV.getDcUseLimit())); }else if(s.getProjectType().equals("应收帐款质押类项目")){ projectDailyV.setYingShou(info.size()); - projectDailyV.setYsUseLimit(projectDaily.getUseLimit()+projectDailyV.getYsUseLimit()); + projectDailyV.setYsUseLimit(projectDaily.getUseLimit().add(projectDailyV.getYsUseLimit())); } System.out.println(info); } return rb.success().setData(projectDailyV); } + public ResultBean> getProjectDailyZx(ProjectDailyQuery query) { + ResultBean rb=new ResultBean().fail(); + Map m=new HashMap<>(); + ProjectDailyQuery params = query; + QueryWrapper qw = new QueryWrapper<>(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String startDate=""; + if(com.yxt.common.base.utils.StringUtils.isBlank(params.getOrderDate())){ + startDate=sdf.format(DateUtil.yesterday()); + }else{ + startDate=params.getOrderDate(); + } + String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.parse(startDate),-Integer.parseInt(params.getIntervalTime())+1)); + long i=DateUtil.between(DateUtil.parse(startDate),DateUtil.parse(EndDate), DateUnit.DAY); + if (params != null) { + if (com.yxt.common.base.utils.StringUtils.isNotBlank(startDate)) { + qw.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate); + } + if (com.yxt.common.base.utils.StringUtils.isNotBlank(EndDate)) { + qw.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate); + } + if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) { + qw.eq("projectSid", params.getProjectSid()); + } + } + List projectDailyVos=baseMapper.getProjectDailys(qw); + List a=new ArrayList<>(); + List b=new ArrayList<>(); + List c=new ArrayList<>(); + List d=new ArrayList<>(); + List e=new ArrayList<>(); + List f=new ArrayList<>(); + //14 + for(int k=0;k getInventoryByOrderDate(DataCenterQuery dataCenterQuery) { + Map m=new HashMap<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String startDate=""; + if(com.yxt.common.base.utils.StringUtils.isBlank(dataCenterQuery.getStartDate())){ + startDate=sdf.format(DateUtil.yesterday()); + }else{ + startDate=dataCenterQuery.getStartDate(); + } + String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.parse(startDate),-Integer.parseInt(dataCenterQuery.getIntervalTime())+1)); + + long i=DateUtil.between(DateUtil.parse(startDate),DateUtil.parse(EndDate), DateUnit.DAY); + + QueryWrapper qw = new QueryWrapper<>(); + qw.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate); + qw.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate); + qw.eq("projectSid",dataCenterQuery.getProjectSid()); + List list= baseMapper.getInventoryByOrderDate(qw); + List a=new ArrayList<>(); + List b=new ArrayList<>(); + for(int k=0;k { + @Autowired + CrmMapper crmMapper; + @Autowired + SysUserFeign sysUserFeign; + @Autowired + SysOrganizationFeign sysOrganizationFeign; public void clearAndBuildOfDay(String orderDate) { baseMapper.clearDay(orderDate); @@ -196,4 +211,17 @@ public class ReportInventoryDayGatherService extends ServiceImpl { "" }) List getCountByType(@Param("ids") Object[] projectSids,@Param("typeSid") String typeSid); + @Select(" SELECT\n" + + " info.entryName,\n" + + " info.sid as sid,\n" + + " td.projectType as typeName,\n" + + " info.creditLimit,\n" + + " info.signingDate,\n" + + " info.endDate,\n" + + " ei.enterpriseName,\n" + + " ei.contacts as eContacts,\n" + + " info.regulatoryLeader,info.*\n" + + " FROM\n" + + " project_information info\n" + + " LEFT JOIN project_type_dictionary td on td.sid=info.typeSid\n" + + " left join industry_dictionary id on id.sid =info .industrySid\n"+ + " LEFT JOIN enterprise_information ei on ei.sid=info.enterpriseSid\n" + + " left join project_state_dictionary sd on sd.sid=info.stateSid\n" + + " WHERE info.sid=#{sid}") + ProjectInfo fetchProjectBySid(@Param("sid") String 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 6487d2c5..a236e7a0 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 @@ -19,4 +19,9 @@ public class ProjectInfo { 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; } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysorganization/SysOrganizationFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysorganization/SysOrganizationFeign.java index 521cb922..78a734ba 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysorganization/SysOrganizationFeign.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysorganization/SysOrganizationFeign.java @@ -43,4 +43,5 @@ public interface SysOrganizationFeign { @ApiOperation("获取组织结构下人员信息") @GetMapping("/userList/{projectSid}") public ResultBean> userList(@PathVariable("projectSid")String projectSid); + } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserFeign.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserFeign.java index c0bf6570..6006532d 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserFeign.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserFeign.java @@ -3,6 +3,7 @@ package com.yxt.supervise.report.feign.system.sysuser; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.yxt.common.core.result.FileUploadResult; import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.system.sysuser.SysUser; import com.yxt.supervise.system.sysuser.SysUserQuery; import com.yxt.supervise.system.sysuser.SysUserUpdate; import com.yxt.supervise.system.sysuser.SysUserVo; @@ -40,4 +41,6 @@ public interface SysUserFeign { @ApiOperation(value = "3、登录") @ApiOperationSupport(order = 30) public ResultBean login(@RequestBody SysUserQuery sysUserQuery); + @GetMapping("/getUserBySid") + public ResultBean getUserBySid(@RequestParam("sid")String sid); }