From cbbb922324a3dc10b7b699c44bd7fdc4dc750523 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 27 Oct 2023 18:51:47 +0800
Subject: [PATCH] 10/27

---
 .../report/biz/projectdaily/ProjectDaily.java |  15 +--
 .../biz/projectdaily/ProjectDailyMapper.java  |   3 +
 .../biz/projectdaily/ProjectDailyRest.java    |   4 +-
 .../biz/projectdaily/ProjectDailyService.java |  30 +++--
 .../biz/projectdaily/ProjectDailyVos.java     | 123 ++++++++++++++++++
 .../report/biz/wechat/WechatService.java      |   5 +-
 6 files changed, 153 insertions(+), 27 deletions(-)
 create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java

diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java
index 7af32cd9..925837ed 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java
@@ -52,11 +52,9 @@ public class ProjectDaily extends EntityWithId {
     private String state="2";//质押状态
     @TableField(exist = false)
     private double creditLimit;//授信额度
-    @TableField(exist = false)
-    private double creditLimitW;//授信额度
+
     private double useLimit;//用信额度
-    @TableField(exist = false)
-    private double useLimitW;//用信额度
+
 
     /**
      * 计算出的质押率
@@ -114,13 +112,4 @@ public class ProjectDaily extends EntityWithId {
         return NumberUtil.roundStr(this.advancePayment / 10000, 2);
     }
 
-    public double getCreditLimitW() {
-        double d=Double.valueOf(String.format("%.2f",creditLimit/10000));
-        return this.creditLimitW=d;
-    }
-
-    public double getUseLimitW() {
-        double d=Double.valueOf(String.format("%.2f",useLimit/10000));
-        return this.useLimitW=d;
-    }
 }
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 34b55d50..b19c40ea 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
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -14,4 +15,6 @@ public interface ProjectDailyMapper extends BaseMapper<ProjectDaily> {
 
     IPage<ProjectDaily> selectPageVo(IPage<ProjectDaily> page, @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
     IPage<ProjectDaily> listPageVo(IPage<ProjectDaily> page, @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
+    @Select("select * from project_daily where orderDate=#{orderDate} and projectSid=#{projectSid}")
+    ProjectDailyVos getProjectDaily( @Param("orderDate") String  orderDate, @Param("projectSid") String  projectSid);
 }
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 444457e2..77088786 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
@@ -74,13 +74,13 @@ public class ProjectDailyRest {
 
 
     @PostMapping("/getProjectDaily")
-    public ResultBean<ProjectDaily> getProjectDaily(@RequestBody ProjectDailys ProjectDailys) {
+    public ResultBean<ProjectDailyVos> getProjectDaily(@RequestBody ProjectDailys ProjectDailys) {
         ResultBean rb = ResultBean.fireFail();
         ResultBean b=projectDailyService.ww(ProjectDailys);
         if(!b.getCode().equals("200")){
             return b;
         }
-        ProjectDaily pv = projectDailyService.fetchByProjectAndDay(ProjectDailys.getProjectSid(), ProjectDailys.getOrderDate());
+        ProjectDailyVos pv = projectDailyService.fetchByProjectAndDay(ProjectDailys.getProjectSid(), ProjectDailys.getOrderDate());
         return rb.success().setData(pv);
     }
     public boolean changState(String wxCode,String sid){
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 ac279241..6e107ce3 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
@@ -115,7 +115,7 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
     }
     public Map<String,Object> selectList(ProjectDailyQuery params) {
         List<UserProject> userProjects=crmMapper.getProjectByUserSid(params.getUserSid());
-        List<ProjectDaily> list=new ArrayList<>();
+        List<ProjectDailyVos> list=new ArrayList<>();
         Map<String,Object> map=new HashMap<>();
         double creditLimitTotal=0;
         double useLimitTotal=0;
@@ -124,9 +124,7 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
                 params.setOrderDate(DateUtil.format(DateUtil.yesterday(),"yyyy-MM-dd"));;
             }
             ProjectInfo projectInfo= crmMapper.getProjectBySid(userProject.getProjectSid());
-            ProjectDaily projectDaily=baseMapper.selectOne(new QueryWrapper<ProjectDaily>()
-                    .eq("projectSid",userProject.getProjectSid())
-                    .eq("orderDate",params.getOrderDate()));
+            ProjectDailyVos projectDaily =baseMapper.getProjectDaily(params.getOrderDate(),userProject.getProjectSid());
             if(null!=projectInfo){
                 creditLimitTotal=creditLimitTotal+projectInfo.getCreditLimit();
                 useLimitTotal=useLimitTotal+projectInfo.getUseLimit();
@@ -185,11 +183,23 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
         return rb.success().setMsg("添加成功");
     }
 
-    public ProjectDaily fetchByProjectAndDay(String projectSid, String orderDate) {
-        QueryWrapper<ProjectDaily> wq = new QueryWrapper<>();
-        wq.eq("projectSid",projectSid)
-                .eq("orderDate",orderDate);
-        ProjectDaily projectDaily=baseMapper.selectOne(wq);
+    public ProjectDaily fetchByProjectAndDay1(String projectSid, String orderDate) {
+        ProjectDaily projectDaily=baseMapper.selectOne(new QueryWrapper<ProjectDaily>().eq("orderDate",orderDate).eq("projectSid",projectSid));
+        ProjectInfo projectInfo= crmMapper.getProjectBySid(projectSid);
+        if(null!=projectDaily){
+            if(null!=projectInfo) {
+                projectDaily.setCreditLimit(projectInfo.getCreditLimit());
+                projectDaily.setUseLimit(projectInfo.getUseLimit());
+                projectDaily.setBankPledgeRate(projectInfo.getBankPledgeRate());
+                if (projectInfo.getBankPledgeRate() >Double.valueOf(projectDaily.getPledgeRatePercent())) {
+                    projectDaily.setState("1");
+                }
+            }
+        }
+        return projectDaily;
+    }
+    public ProjectDailyVos fetchByProjectAndDay(String projectSid, String orderDate) {
+        ProjectDailyVos projectDaily=baseMapper.getProjectDaily(orderDate,projectSid);
         ProjectInfo projectInfo= crmMapper.getProjectBySid(projectSid);
         if(null!=projectDaily){
             if(null!=projectInfo) {
@@ -261,7 +271,7 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
         return rb.success().setCode("200");
     }
     public void sendMess(String projectSid, String orderDate) {
-        ProjectDaily projectDaily = this.fetchByProjectAndDay(projectSid, orderDate);
+        ProjectDaily projectDaily = this.fetchByProjectAndDay1(projectSid, orderDate);
         projectDaily.setMessState(1);
         projectDaily.setMessNum(projectDaily.getMessNum() + 1);
         baseMapper.updateById(projectDaily);
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
new file mode 100644
index 00000000..1a09a3be
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java
@@ -0,0 +1,123 @@
+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.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/10/27 18:36
+ */
+@Data
+public class ProjectDailyVos {
+    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 double totalLoan = 0; // 贷款总额',
+    private double accountsBalance = 0; // 帐户余额',
+    private double accountsReceivable = 0; // 应收账款',
+    private double stockAmount = 0; // 库存货值',
+    private double transitAmount = 0; // 在途货值',
+    private double advancePayment = 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 useLimit;//用信额度
+
+
+    /**
+     * 计算出的质押率
+     *
+     * @return
+     */
+    public String getPledgeRateNormal() {
+//        double a = totalLoan - accountsBalance;
+//        double b = stockAmount + accountsReceivable + transitAmount + advancePayment;
+        double a=this.useLimit;
+        double b=stockAmount+accountsReceivable+transitAmount+advancePayment+accountsBalance;
+        if (b == 0)
+            return "0";
+        double v = a / b;
+        return NumberUtil.roundStr(v, 2);
+    }
+
+    /**
+     * 计算出的质押率(百分数值)
+     *
+     * @return
+     */
+    public String getPledgeRatePercent() {
+//        double a = totalLoan - accountsBalance;
+//        double b = stockAmount + accountsReceivable + transitAmount + advancePayment;
+        double a=this.useLimit;
+        double b=stockAmount+accountsReceivable+transitAmount+advancePayment+accountsBalance;
+        if (b == 0)
+            return "0";
+        double v = (a / b) * 100;
+        return NumberUtil.roundStr(v, 2);
+    }
+
+    public String getTotalLoanWan() {
+        return NumberUtil.roundStr(this.totalLoan / 10000, 2);
+    }
+
+    public String getAccountsBalanceWan() {
+        return NumberUtil.roundStr(this.accountsBalance / 10000, 2);
+    }
+
+    public String getAccountsReceivableWan() {
+        return NumberUtil.roundStr(this.accountsReceivable / 10000, 2);
+    }
+
+    public String getStockAmountWan() {
+        return NumberUtil.roundStr(this.stockAmount / 10000, 2);
+    }
+
+    public String getTransitAmountWan() {
+        return NumberUtil.roundStr(this.transitAmount / 10000, 2);
+    }
+
+    public String getAdvancePaymentWan() {
+        return NumberUtil.roundStr(this.advancePayment / 10000, 2);
+    }
+
+    public double getCreditLimit() {
+        double d=Double.valueOf(String.format("%.2f",creditLimit/10000));
+        return this.creditLimit=d;
+    }
+
+    public double getUseLimit() {
+        double d=Double.valueOf(String.format("%.2f",useLimit/10000));
+        return this.useLimit=d;
+    }
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatService.java
index 52b942f2..ae805af7 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatService.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatService.java
@@ -17,6 +17,7 @@ import com.yxt.supervise.report.biz.imgmessageslog.ImgMessagesLogMapper;
 import com.yxt.supervise.report.biz.messagepushlog.MessagePushLogService;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDaily;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDailyService;
+import com.yxt.supervise.report.biz.projectdaily.ProjectDailyVos;
 import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGatherMapper;
 import com.yxt.supervise.report.biz.riskmessageslog.RiskMessagesLogMapper;
 import com.yxt.supervise.report.biz.stock.ReportStockDay;
@@ -129,7 +130,7 @@ public class WechatService {
                 }
             }
         }
-        ProjectDaily projectDaily=projectDailyService.fetchByProjectAndDay(projectSid,orderDate);
+        ProjectDaily projectDaily=projectDailyService.fetchByProjectAndDay1(projectSid,orderDate);
         // 模板参数
         Map<String, String> sendMag = new HashMap<String, String>();
         // 公众号的模板id(也有相应的接口可以查询到)
@@ -278,7 +279,7 @@ public class WechatService {
                 }
             }
         }
-        ProjectDaily projectDaily=projectDailyService.fetchByProjectAndDay(projectSid,orderDate);
+        ProjectDaily projectDaily=projectDailyService.fetchByProjectAndDay1(projectSid,orderDate);
 //        ProjectInfo projectInfo =crmMapper.getProjectNameBySid(projectSid);
         ProjectInfo projectInfo=crmMapper.selectOne(new QueryWrapper<ProjectInfo>().eq("sid",projectSid));
         // 公众号的模板id(也有相应的接口可以查询到)