Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
commit
24956a7aae
  1. 5
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterMapper.java
  2. 2
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterQuery.java
  3. 74
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java
  4. 17
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterService.java
  5. 5
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java
  6. 12
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml
  7. 2
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyQuery.java
  8. 9
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java
  9. 113
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java
  10. 108
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java
  11. 28
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java
  12. 18
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java
  13. 5
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java
  14. 1
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysorganization/SysOrganizationFeign.java
  15. 3
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/feign/system/sysuser/SysUserFeign.java

5
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<DataCenter> {
@Select("select shSid from project_sh where projectSid=#{projectSid}")
String getProjectIsJk (@Param("projectSid")String projectSid);
}

2
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;
}

74
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<ProjectDailyVos> getProjectDaily(@RequestBody ProjectDailys ProjectDailys) {
ResultBean rb = ResultBean.fireFail();
@ -93,4 +95,76 @@ public class DataCenterRest {
List<Map<String,Object>> pv = reportInventoryDayGatherService.getInventoryByOrderDate(orderDate);
return rb.success().setData(pv);
}
/**************************************************通用**********************************************************/
//数据总览
@PostMapping("/getProjectDailyNew")
public ResultBean<ProjectDailyVos> 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<ProjectDailyVos> getReportInventoryNew(@RequestBody DataCenterQuery dataCenterQuery) {
ResultBean rb = ResultBean.fireFail();
Map<String,Object> pv = projectDailyService.getInventoryByOrderDate(dataCenterQuery);
return rb.success().setData(pv);
}
//告警消息
// @PostMapping("/getRisk")
// public ResultBean<ProjectDailyVos> getRisk() {
// ResultBean rb = ResultBean.fireFail();
// List<ReportInventoryDayGatherVo> pv = reportInventoryDayGatherService.getReportInventoryByOrderDate();
// return rb.success().setData(pv);
// }
//仓库库存表
@GetMapping("/getInventoryNew")
public ResultBean getInventoryNew(String orderDate) {
ResultBean rb = ResultBean.fireFail();
List<Map<String,Object>> pv = reportInventoryDayGatherService.getInventoryByOrderDate(orderDate);
return rb.success().setData(pv);
}
@GetMapping("/getProjectBySid")
public ResultBean getProjectBySid(String projectSid) {
ResultBean rb = ResultBean.fireFail();
return reportInventoryDayGatherService.getProjectBySid(projectSid);
}
}

17
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<DataCenterMapper, DataCenter> {
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;
//
// }
}

5
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<ProjectDaily> {
@Select("select * from project_daily where orderDate=#{orderDate} and projectSid=#{projectSid}")
ProjectDailyVos getProjectDaily( @Param("orderDate") String orderDate, @Param("projectSid") String projectSid);
List<ProjectDailyVos> getProjectDailys ( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
ProjectDailyVos getProjectDailySum( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
ProjectDailyVos getProjectDailyInSid( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
ProjectDailyVosBig getProjectDailySum( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
ProjectDailyVosBig getProjectDailyInSid( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
List<ProjectDailyVosBig> getInventoryByOrderDate( @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
}

12
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml

@ -29,7 +29,7 @@
${ew.sqlSegment}
</where>
</select>
<select id="getProjectDailySum" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDailyVos">
<select id="getProjectDailySum" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDailyVosBig">
select sum(accountsBalance) as accountsBalance ,
sum(accountsReceivable) as accountsReceivable ,
sum(stockAmount) as stockAmount ,
@ -40,11 +40,19 @@
${ew.sqlSegment}
</where>
</select>
<select id="getProjectDailyInSid" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDailyVos">
<select id="getProjectDailyInSid" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDailyVosBig">
select sum(useLimit) as useLimit
from project_daily
<where>
${ew.sqlSegment}
</where>
</select>
<select id="getInventoryByOrderDate" resultType="com.yxt.supervise.report.biz.projectdaily.ProjectDailyVosBig">
select *
from project_daily
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

2
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;
}

9
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);
}
}

113
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<ProjectDailyMapper, Project
projectDaily.setState("1");
}
}
return projectDaily;
}
return projectDaily;
return new ProjectDailyVos();
}
public ResultBean<List<ProjectAccountVo>> getAccountByProjectSid(String projectSid) {
ResultBean rb=new ResultBean();
@ -371,7 +378,7 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
}
}
List<ProjectDailyVos> projectDailyVos=baseMapper.getProjectDailys(qw);
ProjectDailyVos projectDailyV=baseMapper.getProjectDailySum(qw);
ProjectDailyVosBig projectDailyV=baseMapper.getProjectDailySum(qw);
List<String> sids=new ArrayList<>();
for(ProjectDailyVos projectDailyVos1:projectDailyVos){
@ -385,19 +392,113 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
QueryWrapper<ProjectDaily> 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<Map<String,Object>> getProjectDailyZx(ProjectDailyQuery query) {
ResultBean rb=new ResultBean().fail();
Map<String,Object> m=new HashMap<>();
ProjectDailyQuery params = query;
QueryWrapper<ProjectDaily> 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> projectDailyVos=baseMapper.getProjectDailys(qw);
List<String> a=new ArrayList<>();
List<String> b=new ArrayList<>();
List<String> c=new ArrayList<>();
List<String> d=new ArrayList<>();
List<String> e=new ArrayList<>();
List<String> f=new ArrayList<>();
//14
for(int k=0;k<i+1;k++){
String date=sdf.format(DateUtil.offsetDay(DateUtil.parse(EndDate),k));
a.add(date);
b.add("0");
c.add("0");
d.add("0");
e.add("0");
f.add("0");
for(ProjectDailyVos vo:projectDailyVos){
if(vo.getOrderDate().equals(date)){
b.set(k,String.valueOf(vo.getAccountsBalance()));
c.set(k,String.valueOf(vo.getAccountsReceivable()));
d.set(k,String.valueOf(vo.getStockAmount()));
e.set(k,String.valueOf(vo.getTransitAmount()));
f.set(k,String.valueOf(vo.getAdvancePayment()));
}
}
}
m.put("date",a.toArray());
m.put("accountsBalance",b.toArray());
m.put("accountsReceivable",c.toArray());
m.put("stockAmount",d.toArray());
m.put("transitAmount",e.toArray());
m.put("advancePayment",f.toArray());
return rb.success().setData(m);
}
public Map<String,Object> getInventoryByOrderDate(DataCenterQuery dataCenterQuery) {
Map<String,Object> 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<ProjectDaily> 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<ProjectDailyVosBig> list= baseMapper.getInventoryByOrderDate(qw);
List<String> a=new ArrayList<>();
List<String> b=new ArrayList<>();
for(int k=0;k<i+1;k++){
String date=sdf.format(DateUtil.offsetDay(DateUtil.parse(EndDate),k));
a.add(date);
b.add("0");
for(ProjectDailyVosBig vo:list){
if(vo.getOrderDate().equals(date)){
b.set(k,String.valueOf(vo.getStockAmount()));
}
}
}
m.put("date",a.toArray());
m.put("amount",b.toArray());
return m;
}
}

108
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java

@ -0,0 +1,108 @@
package com.yxt.supervise.report.biz.projectdaily;
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 lombok.Data;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
/**
* @author wangpengfei
* @date 2023/11/18 15:40
*/
@Data
public class ProjectDailyVosBig {
private String sid = IdUtil.fastSimpleUUID(); // sid
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",
timezone = "GMT+8"
)
private Date createTime = new Date(); // 记录创建时间
private String remarks; // 备注说明',
private String orderDate; // 单据日期',
private String reportTime; // 汇总时间',
private String projectSid; // 项目Sid',
private String projectName; // 项目名称',
private BigDecimal totalLoan = new BigDecimal(0); // 贷款总额',
private BigDecimal accountsBalance = new BigDecimal(0); // 帐户余额',
private BigDecimal accountsReceivable = new BigDecimal(0); // 应收账款',
private BigDecimal stockAmount = new BigDecimal(0); // 库存货值',
private BigDecimal transitAmount = new BigDecimal(0); // 在途货值',
private BigDecimal advancePayment = new BigDecimal(0); // 预付款',
// private double pledgeRate = 0; // 质押率=(贷款金额-帐户余额)/(库存总价值+应收帐款+在途商品+预付款)',
private double pledgeRate = 0; // 质押率=(贷款金额)/(库存总价值+应收帐款+在途商品+预付款+帐户余额)',
private int messState = 0; // 消息发送状态: 0=未发送;1=已发送',
private int messNum = 0; // 消息发送次数',
private String userSid; // 用户(报告人)Sid',
private String userMobile; // 用户(报告人)手机号',
private String userName; // 用户(报告人)姓名',
private int userType = 1; // 用户(报告人)类型:1监管、2客户、3银行',
private String userStaffSid; // 关联人员的Sid',
@TableField(exist = false)
private double bankPledgeRate;//银行规定质押率
@TableField(exist = false)
private String state="2";//质押状态
@TableField(exist = false)
private double creditLimit;//授信额度
private double creditLimitW;//授信额度万元
private BigDecimal useLimit=new BigDecimal(0);//用信额度
private double useLimitW;//用信额度 万元
//1: 已上报报表 2 :未上报报表
private String isReport;
private String projectType;
private int baoZheng;
private BigDecimal bzUseLimit=new BigDecimal(0);
private int dongChan;
private BigDecimal dcUseLimit=new BigDecimal(0);
private int yingShou;
private BigDecimal ysUseLimit=new BigDecimal(0);
/**
* 计算出的质押率
*
* @return
*/
public String getPledgeRateNormal() {
// double a = totalLoan - accountsBalance;
// double b = stockAmount + accountsReceivable + transitAmount + advancePayment;
BigDecimal a=this.useLimit;
// double b=stockAmount+accountsReceivable+transitAmount+advancePayment+accountsBalance;
BigDecimal b=stockAmount.add(accountsReceivable).add(transitAmount).add(advancePayment).add(accountsBalance);
if (b.equals(new BigDecimal(0)))
return "0";
// double v = a / b;
BigDecimal v = a.divide(b, 2,RoundingMode.HALF_UP);
return v.toString();
}
/**
* 计算出的质押率(百分数值)
*
* @return
*/
public String getPledgeRatePercent() {
// double a = totalLoan - accountsBalance;
// double b = stockAmount + accountsReceivable + transitAmount + advancePayment;
// double a=this.useLimit;
BigDecimal a=this.useLimit;
// double b=stockAmount+accountsReceivable+transitAmount+advancePayment+accountsBalance;
BigDecimal b=stockAmount.add(accountsReceivable).add(transitAmount).add(advancePayment).add(accountsBalance);
if (b.equals(new BigDecimal(0)))
return "0";
// double v = (a / b) * 100;
BigDecimal v = a.divide(b, 2,RoundingMode.HALF_UP).multiply(new BigDecimal(100));
return v.toString();
}
}

28
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java

@ -2,11 +2,20 @@ package com.yxt.supervise.report.biz.reportinventory;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.alibaba.nacos.common.model.RestResult;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.datacenter.DataCenterQuery;
import com.yxt.supervise.report.ds.crm.CrmMapper;
import com.yxt.supervise.report.ds.crm.ProjectInfo;
import com.yxt.supervise.report.feign.system.sysorganization.SysOrganizationFeign;
import com.yxt.supervise.report.feign.system.sysuser.SysUserFeign;
import com.yxt.supervise.system.sysorganization.SysOrganizationVo;
import com.yxt.supervise.system.sysuser.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
@ -15,6 +24,12 @@ import java.util.stream.Collectors;
@Service
public class ReportInventoryDayGatherService extends ServiceImpl<ReportInventoryDayGatherMapper, ReportInventoryDayGather> {
@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<ReportInventory
}
return maps;
}
public ResultBean getProjectBySid(String projectSid) {
ResultBean rb=new ResultBean().fail();
ProjectInfo projectInfo=crmMapper.fetchProjectBySid(projectSid);
SysUser sysUser = sysUserFeign.getUserBySid(projectInfo.getManagerSid()).getData();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(projectInfo.getBankSid()).getData();
if(null!=sysOrganizationVo){
projectInfo.setBankName(sysOrganizationVo.getName());
}
if(null!=sysUser){
projectInfo.setBManagerName(sysUser.getName());
}
return rb.success().setData(projectInfo);
}
}

18
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java

@ -70,4 +70,22 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
"</script>"
})
List<String> 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);
}

5
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;
}

1
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<List<SysOrganizationVo>> userList(@PathVariable("projectSid")String projectSid);
}

3
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<SysUserVo> login(@RequestBody SysUserQuery sysUserQuery);
@GetMapping("/getUserBySid")
public ResultBean<SysUser> getUserBySid(@RequestParam("sid")String sid);
}

Loading…
Cancel
Save