diff --git a/supervise-crm-ui/src/views/WechatPush/index.vue b/supervise-crm-ui/src/views/WechatPush/index.vue
index 00ce0b63..f1b8d405 100644
--- a/supervise-crm-ui/src/views/WechatPush/index.vue
+++ b/supervise-crm-ui/src/views/WechatPush/index.vue
@@ -45,7 +45,8 @@
                   <div v-if="node.childNodes.length==0"
                     style="width: 100%;display: flex;flex-direction: row;align-items: center;">
                     <div></div>
-                    <img v-if="data.isOpenId=='2'" src="../../../public/image/association.png" style="width: 35px;height: 25px;" />
+                    <img v-if="data.isOpenId=='2'" src="../../../public/image/association.png"
+                      style="width: 35px;height: 25px;" />
                     <span style="margin-left: 30px;width:100px; overflow: hidden;text-align: center;
           white-space: nowrap;
           text-overflow: ellipsis;">正在完善 </span>
@@ -269,21 +270,21 @@
         this.uploadData.userProjectSid = row.sid
         req.associationUserList(row.sid).then(res => {
           this.sysorganList = res.data
+          this.sysorganList2 = []
+          // this.uploadData.userProjectSid = res.data[0].sid
+          // req.templateMessage(this.dataListOne[0].sid).then(res => {
+          //   if (res.success) {
+          //     this.sysorganList = res.data
 
-          this.uploadData.userProjectSid = res.data[0].sid
-          req.templateMessage(this.dataListOne[0].sid).then(res => {
-            if (res.success) {
-              this.sysorganList = res.data
-
-              //this.Array为数组名
-              this.sysorganList.forEach(item => {
+          //     //this.Array为数组名
+          //     this.sysorganList.forEach(item => {
 
-                this.$set(item, 'Show', true)
+          //       this.$set(item, 'Show', true)
 
-              })
+          //     })
 
-            }
-          })
+          //   }
+          // })
 
         })
       },
@@ -510,4 +511,4 @@
   ::v-deep .el-collapse-item__content {
     padding-bottom: 0;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/supervise-report-ui/src/views/project/projectDaily.vue b/supervise-report-ui/src/views/project/projectDaily.vue
index 8159a001..0d0dc75c 100644
--- a/supervise-report-ui/src/views/project/projectDaily.vue
+++ b/supervise-report-ui/src/views/project/projectDaily.vue
@@ -429,10 +429,22 @@
         this.zyl()
       },
       zyl() {
-        const a = Number(this.projectDaily.totalLoan) - Number(this.projectDaily.accountsBalance)
+        //  质率=(贷款金额)(库总价值+应收款+在商品+预付款+户余额)
+
+        //   质押率= (贷款金额-户余额)/ (库总价值+应收款+在商品+预付款)
+        
+        // totalLoan: 0, // 贷款总额',
+        // useLimit: 0, // 用信总额',
+        // accountsBalance: 0, // 帐户余额',
+        // accountsReceivable: 0, // 应收账款',
+        // stockAmount: 0, // 库存货值',
+        // transitAmount: 0, // 在途货值',
+        // advancePayment: 0, // 预付款',
+
+        const a = Number(this.projectDaily.useLimit)
         const b = Number(this.projectDaily.accountsReceivable) + Number(this.projectDaily.stockAmount) + Number(this
           .projectDaily.transitAmount) + Number(this.projectDaily
-          .advancePayment)
+          .advancePayment)+ Number(this.projectDaily.accountsBalance)
         if (b === 0) {
           this.zhiyalv = '0'
         } else {
@@ -442,20 +454,20 @@
       initData() {
         req.projectdailyistAll().then(res => {
 
-          if (res.data.length > 0) {
+          // if (res.data.length > 0) {
             this.projectList = res.data
 
-            this.projectDaily.projectSid = this.projectList[0].sid
-            this.projectDaily.projectName = this.projectList[0].entryName
-            this.projectDaily.totalLoan = Number(this.projectList[0].creditLimit)
-            this.projectDaily.useLimit = Number(this.projectList[0].useLimit)
-            this.projectDaily.accountsBalance = this.projectList[0].balance
+            // this.projectDaily.projectSid = this.projectList[0].sid
+            // this.projectDaily.projectName = this.projectList[0].entryName
+            // this.projectDaily.totalLoan = Number(this.projectList[0].creditLimit)
+            // this.projectDaily.useLimit = Number(this.projectList[0].useLimit)
+            // this.projectDaily.accountsBalance = this.projectList[0].balance
 
-            console.log('projectList:', res)
-            console.log('projectList:', this.projectList[0])
-            console.log('projectDaily:', this.projectDaily)
+            // console.log('projectList:', res)
+            // console.log('projectList:', this.projectList[0])
+            // console.log('projectDaily:', this.projectDaily)
 
-          }
+          // }
 
 
         }).catch(e => {
@@ -526,7 +538,9 @@
           if (this.projectDaily.projectSid === this.projectList[i].sid) {
             this.projectDaily.totalLoan = Number(this.projectList[i].creditLimit)
             this.projectDaily.projectName = this.projectList[i].entryName
+            this.projectDaily.useLimit = Number(this.projectList[i].useLimit)
             this.projectDaily.accountsBalance = this.projectList[i].balance
+
           }
         }
 
diff --git a/supervise-uniapp/common/config.js b/supervise-uniapp/common/config.js
index 6636bd84..7c31ff99 100644
--- a/supervise-uniapp/common/config.js
+++ b/supervise-uniapp/common/config.js
@@ -8,7 +8,7 @@
 module.exports = {
 	// baseUrl: 'http://jg.yyundong.com',// 测试
 	baseUrl: 'https://supervise.yxtsoft.com',//正式
-	// baseUrl: 'http://192.168.1.107:8112',  
+	// baseUrl: 'http://192.168.1.107:7009/api',  
 	// baseUrl: 'http://192.168.1.110:8112',  
 	tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
 	loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
diff --git a/supervise-uniapp/pages/index/RegulatoryReporting.vue b/supervise-uniapp/pages/index/RegulatoryReporting.vue
index 4787671a..57930afe 100644
--- a/supervise-uniapp/pages/index/RegulatoryReporting.vue
+++ b/supervise-uniapp/pages/index/RegulatoryReporting.vue
@@ -30,8 +30,8 @@
 
 
 				<view class="centre-bom">
-					<text class="centre-lift-text">总授信：{{info.creditLimit}}万元</text>
-					<text class="centre-lift-text">总用信：{{info.useLimit}}万元</text>
+					<text class="centre-lift-text">总授信：{{info.creditLimitW}}万元</text>
+					<text class="centre-lift-text">总用信：{{info.useLimitW}}万元</text>
 
 				</view>
 
diff --git a/warehousing-system/project_web_ui-xxs/.env.development b/warehousing-system/project_web_ui-xxs/.env.development
index b986a193..6552d7fa 100644
--- a/warehousing-system/project_web_ui-xxs/.env.development
+++ b/warehousing-system/project_web_ui-xxs/.env.development
@@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/warehouseapi'
 
 ## 配置测试和本地开发时的 接口地址
 ##VUE_APP_URL = "http://jianguan.yyundong.com/"
-VUE_APP_URL = "http://127.0.0.1:9050"
+VUE_APP_URL = "http://192.168.1.107:9051"
diff --git a/warehousing-system/project_web_ui-xxs/src/api/User/login.js b/warehousing-system/project_web_ui-xxs/src/api/User/login.js
index 80149639..3deea8a4 100644
--- a/warehousing-system/project_web_ui-xxs/src/api/User/login.js
+++ b/warehousing-system/project_web_ui-xxs/src/api/User/login.js
@@ -12,7 +12,7 @@ class user {
 
   logout(data) { // 退出
     return request({
-      url: '/portal/v1/sysuser/signOut',
+      url: '/v1/sysuser/signOut',
       method: 'post',
       data: qs.stringify(data)
     })
diff --git a/warehousing-system/project_web_ui-xxs/src/assets/loginImg/logo2.png b/warehousing-system/project_web_ui-xxs/src/assets/loginImg/logo2.png
new file mode 100644
index 00000000..aa39ecbb
Binary files /dev/null and b/warehousing-system/project_web_ui-xxs/src/assets/loginImg/logo2.png differ
diff --git a/warehousing-system/project_web_ui-xxs/src/layout/components/Navbar.vue b/warehousing-system/project_web_ui-xxs/src/layout/components/Navbar.vue
index b2a263c3..822bbc4d 100644
--- a/warehousing-system/project_web_ui-xxs/src/layout/components/Navbar.vue
+++ b/warehousing-system/project_web_ui-xxs/src/layout/components/Navbar.vue
@@ -1,15 +1,15 @@
 <template>
   <div>
     <div class="navbar">
-      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png"
-          style="width: 45px;height: 45px;margin-right: 10px;" />汇融云仓贷后监管平台</p>
+      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo2.png"
+          style="width: 45px;height: 45px;margin-right: 10px;" />喜相随贸易</p>
       <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
       <div class="right-menu">
         <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
         <p>欢迎您，{{name}}</p>
-        <img src="@/assets/images/info.png">
+        <!-- <img src="@/assets/images/info.png"> -->
         <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
-        <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
+        <span class="backToHome" @click="logout"><i class="el-icon-back"></i>退出登录</span>
       </div>
     </div>
     <el-footer class="footer" height="40px">Copyright © {{ year }} 技术支持集团 All Rights Reserved</el-footer>
@@ -17,6 +17,11 @@
 </template>
 
 <script>
+  import {
+    getStorage,
+    removeStorage
+  } from '@/utils/auth'
+  import User from "@/api/User/login.js";
   export default {
     data() {
       return {
@@ -38,8 +43,26 @@
     methods: {
       logout() {
         // this.$router.push({ path: '/home' })
-        window.opener = null
-        window.open('about:blank', '_top').close()
+        // window.opener = null
+        // window.open('about:blank', '_top').close()
+        this.$confirm('确定要退出吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$router.push({
+            path: '/login'
+          })
+          // User.logout({
+          //   token: getStorage()
+          // }).then(res => {
+          //   removeStorage()
+          //   // this.$store.commit('user/SET_UESRINFO', '')
+          //   this.$router.push({
+          //     path: '/login'
+          //   })
+          // })
+        })
       }
     }
   }
diff --git a/warehousing-system/project_web_ui-xxs/src/layout/index.vue b/warehousing-system/project_web_ui-xxs/src/layout/index.vue
index 2f4dcbce..7c9b5f69 100644
--- a/warehousing-system/project_web_ui-xxs/src/layout/index.vue
+++ b/warehousing-system/project_web_ui-xxs/src/layout/index.vue
@@ -9,10 +9,10 @@
       @click="handleClickOutside"
     />
     <div class="main-container">
-      <div class="home-box">
+     <!-- <div class="home-box">
         <a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">平台首页</a>
         <a href="javascript:void(0);" class="text-center">云仓管理</a>
-      </div>
+      </div> -->
       <sidebar class="sidebar-container" />
       <!--菜单-->
       <div class="TagsView">
diff --git a/warehousing-system/project_web_ui-xxs/src/settings.js b/warehousing-system/project_web_ui-xxs/src/settings.js
index b6530e1e..4f45a38b 100644
--- a/warehousing-system/project_web_ui-xxs/src/settings.js
+++ b/warehousing-system/project_web_ui-xxs/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融云仓贷后监管平台',
+  title: '喜相随贸易',
 
   /**
    * @type {boolean} true | false
diff --git a/warehousing-system/project_web_ui-xxs/src/styles/sidebar.scss b/warehousing-system/project_web_ui-xxs/src/styles/sidebar.scss
index 4d304e20..088f372c 100644
--- a/warehousing-system/project_web_ui-xxs/src/styles/sidebar.scss
+++ b/warehousing-system/project_web_ui-xxs/src/styles/sidebar.scss
@@ -40,7 +40,7 @@
     transition: width 0.28s;
     width: $sideBarWidth !important;
     background-color: $menuBg;
-    height: calc(100% - 60px) ;
+    // height: calc(100% - 60px) ;
     position: absolute;
     font-size: 0px;
     top: 60px;
@@ -48,7 +48,7 @@
     left: 0;
     z-index: 8;
     overflow: hidden;
-    padding-top: 40px;
+    // padding-top: 40px;
 
     // reset element-ui css
     .horizontal-collapse-transition {
diff --git a/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/purchase.vue b/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/purchase.vue
index 0d5f8f41..240ec1e6 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/purchase.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/purchase.vue
@@ -26,13 +26,13 @@
           prop="supplierName"
           label="供货单位"
           align="center"
-          width="180">
+          width="220">
         </el-table-column>
         <el-table-column
           prop="purchaseNo"
           label="订单编号"
           align="center"
-          width="180">
+          width="220">
         </el-table-column>
         <el-table-column
           prop="purchaseDate"
@@ -55,8 +55,7 @@
         <el-table-column
           prop="storehouseName"
           label="仓库名称"
-          align="center"
-          width="180">
+          align="center"/>
         </el-table-column>
         <el-table-column
           prop="state"
@@ -65,7 +64,6 @@
           width="180">
         </el-table-column>
         <el-table-column
-          fixed="right"
           prop="operate"
           label="操作"
           width="300"
@@ -78,7 +76,7 @@
               @click="LookPurchase(scope.row)"
               >查看详情</el-button
             >
-            <el-button type="primary" icon="el-icon-edit" size="small" @click="open(scope.row)">修改</el-button>
+           <el-button type="primary" icon="el-icon-edit" size="small" @click="open(scope.row)">修改</el-button>
             <el-button type="danger" icon="el-icon-delete" size="small" @click="deletePurchase(scope.row)">删除</el-button>
           </template>
         </el-table-column>
diff --git a/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/putInManagement.vue b/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/putInManagement.vue
index c24429cb..f3f67253 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/putInManagement.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/component/instorehouse/putInManagement.vue
@@ -25,19 +25,19 @@
               prop="no"
               label="入库编号"
               align="center"
-              width="180">
+              width="220">
             </el-table-column>
             <el-table-column
               prop="createTime"
               label="入库日期"
               align="center"
-              width="180">
+              width="220">
             </el-table-column>
             <el-table-column
               prop="custerName"
               label="客户名称"
               align="center"
-              width="180">
+              width="220">
             </el-table-column>
             <el-table-column
               prop="applicationDate"
@@ -54,8 +54,7 @@
             <el-table-column
               prop="storeHouseName"
               label="仓库名称"
-              align="center"
-              width="180">
+              align="center">
             </el-table-column>
             <el-table-column
               prop="state"
@@ -159,7 +158,7 @@ export default {
     },
 		formatorderdegree: function( row, column) {
          if(row.state === '1'){
-             return '已出库'
+             return '已入库'
          } else if(row.state === '2') {
              return '重要'
          } else{
diff --git a/warehousing-system/project_web_ui-xxs/src/views/component/outStorehouseManagement/outList.vue b/warehousing-system/project_web_ui-xxs/src/views/component/outStorehouseManagement/outList.vue
index e50a1ad3..98ad58a6 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/component/outStorehouseManagement/outList.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/component/outStorehouseManagement/outList.vue
@@ -27,7 +27,7 @@
         prop="no"
         label="订单编号"
         align="center"
-        width="180">
+        width="220">
       </el-table-column>
       <el-table-column
         prop="applicationDate"
@@ -44,8 +44,7 @@
       <el-table-column
         prop="storeHouseName"
         label="仓库名称"
-        align="center"
-        width="180">
+        align="center">
       </el-table-column>
       <el-table-column
         prop="state"
@@ -55,7 +54,6 @@
         width="180">
       </el-table-column>
       <el-table-column
-        fixed="right"
         prop="operate"
         label="操作"
         width="300"
diff --git a/warehousing-system/project_web_ui-xxs/src/views/component/stockManagement/stockList.vue b/warehousing-system/project_web_ui-xxs/src/views/component/stockManagement/stockList.vue
index d5270d0c..60da3e0e 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/component/stockManagement/stockList.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/component/stockManagement/stockList.vue
@@ -100,8 +100,7 @@
       <el-table-column
         align="center"
         prop="storeHouseName"
-        label="仓库名称"
-        width="120">
+        label="仓库名称">
       </el-table-column>
       </el-table>
       <div class="pages">
diff --git a/warehousing-system/project_web_ui-xxs/src/views/login/login.vue b/warehousing-system/project_web_ui-xxs/src/views/login/login.vue
index 63502caa..d490db6e 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/login/login.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/login/login.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="login">
     <div class="logoTitle">
-      <span>汇融云仓测试</span>
-      <p class="title">贷后监管系统</p>
+      <span>喜相随贸易</span>
+      <p class="title">进销存管理</p>
     </div>
     <div class="images">
       <img class="one" src="../../assets/loginImg/001.jpg" alt="" />
diff --git a/warehousing-system/project_web_ui-xxs/vue.config.js b/warehousing-system/project_web_ui-xxs/vue.config.js
index 620c6f98..fdd64150 100644
--- a/warehousing-system/project_web_ui-xxs/vue.config.js
+++ b/warehousing-system/project_web_ui-xxs/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '汇融云仓贷后监管平台'// page title
+const name = defaultSettings.title || '喜相随贸易'// page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountRest.java
index 1c54fa4d..e88cab38 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountRest.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountRest.java
@@ -61,6 +61,12 @@ public class ProjectAccountRest {
         ResultBean r=ProjectAccountService.getAccountByProjectSid(projectSid);
         return r;
     }
+    @ApiOperation("根据项目sid查询账户信息 app")
+    @GetMapping("/getAccountByProjectSidApp/{projectSid}")
+    public ResultBean getAccountByProjectSidApp (@PathVariable("projectSid") String projectSid){
+        ResultBean r=ProjectAccountService.getAccountByProjectSidApp(projectSid);
+        return r;
+    }
     @ApiOperation("根据项目sid查询账户余额")
     @GetMapping("/getBalanceByProjectSid/{projectSid}")
     public ResultBean getBalanceByProjectSid (@PathVariable("projectSid") String projectSid){
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java
index c8fa2388..666bd5bc 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectaccount/ProjectAccountService.java
@@ -90,6 +90,15 @@ public class ProjectAccountService extends MybatisBaseService<ProjectAccountMapp
         }
         return rb.success().setData(projectStateBySid);
     }
+    public ResultBean<List<ProjectAccountVo>> getAccountByProjectSidApp(String projectSid) {
+        ResultBean rb=new ResultBean();
+        List<ProjectAccountVo> projectStateBySid=baseMapper.getAccountByProjectSid(projectSid);
+        if(projectStateBySid.size()<0){
+            return rb.success().setData(new ArrayList<>());
+        }
+        return rb.success().setData(projectStateBySid);
+    }
+
     public ResultBean<BigDecimal> getBalanceByProjectSid(String projectSid) {
         ResultBean rb=new ResultBean();
         BigDecimal balance=baseMapper.getBalanceByProjectSid(projectSid);
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java
index 729448a0..44aef473 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java
@@ -20,6 +20,8 @@ public interface ProjectInformationMapper extends BaseMapper<ProjectInformation>
     IPage<ProjectInformationVo> selectPageVo(IPage<ProjectInformation> page, @Param(Constants.WRAPPER) Wrapper<ProjectInformation> qw);
     @Select("select info.* from project_information info join user_project up on up.projectSid =info.sid where up.userSid= #{userSid}")
     List<ProjectInformationVo> listAll(@Param("userSid")String userSid);
+    @Select("select * from project_information")
+    List<ProjectInformationVo> listsAll();
     ProjectInformationVo getProjectBySid( @Param("sid") String sid);
     @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid left join user_project u on u.projectSid =p.sid where u.userSid=#{sid}")
     List<ProjectInformationVo> getProjectByUserSid( @Param("sid") String sid);
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java
index 8778150b..8f3cc3ab 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java
@@ -46,13 +46,20 @@ public class ProjectInformationRest implements ProjectInformationFeign {
         PagerVo<ProjectInformationVo> pv = ProjectInformationService.listPageVo(pq,token);
         return rb.success().setData(pv);
     }
-    @ApiOperation("查询全部")
+    @ApiOperation("查询全部（有权限控制）")
     @GetMapping("/listAll")
     public ResultBean<List<ProjectInformationVo>> listAll(@RequestHeader("token") String token) {
         ResultBean rb = ResultBean.fireFail();
         List<ProjectInformationVo> list =ProjectInformationService.listAll(token);
         return rb.success().setData(list);
     }
+    @ApiOperation("查询全部（没有权限控制）")
+    @GetMapping("/listsAll")
+    public ResultBean<List<ProjectInformationVo>> listsAll(@RequestHeader("token") String token) {
+        ResultBean rb = ResultBean.fireFail();
+        List<ProjectInformationVo> list =ProjectInformationService.listsAll(token);
+        return rb.success().setData(list);
+    }
     @ApiOperation("保存")
     @PostMapping("/save")
     public ResultBean save(@RequestBody ProjectInfoDto dto) {
@@ -72,6 +79,13 @@ public class ProjectInformationRest implements ProjectInformationFeign {
         ProjectInfoVo projectInfoVo=ProjectInformationService.getProjectBySid(sid);
         return rb.success().setData(projectInfoVo);
     }
+    @ApiOperation("根据sid查项目等相关信息")
+    @GetMapping("/getProjectBySidApp/{sid}")
+    public ResultBean getEnterpriseBySidApp(@PathVariable String sid){
+        ResultBean rb = ResultBean.fireFail();
+        ProjectInfoVo projectInfoVo=ProjectInformationService.getProjectBySidApp(sid);
+        return rb.success().setData(projectInfoVo);
+    }
     @ApiOperation("根据sid查询仓库信息")
     @GetMapping("/getStorehouseBySid/{sid}")
     public ResultBean getStorehouseBySid (@PathVariable String sid){
@@ -104,6 +118,13 @@ public class ProjectInformationRest implements ProjectInformationFeign {
         List<ProjectInformationVo> r=ProjectInformationService.getProjectByUserSid(userSid);
         return rb.success().setData(r);
     }
+    @ApiOperation("根据用户sid查询项目名称App")
+    @GetMapping("/getProjectByUserSidApp/{userSid}")
+    public ResultBean getProjectByUserSidApp (@PathVariable("userSid")String userSid){
+        ResultBean rb=new ResultBean();
+        List<ProjectInformationVo> r=ProjectInformationService.getProjectByUserSidApp(userSid);
+        return rb.success().setData(r);
+    }
     @ApiOperation("项目绑定或修改仓库")
     @GetMapping("/saveOrUpdateDto")
     public ResultBean saveOrUpdateDto (@RequestBody StoreHouseProjectDto dto){
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
index 7b435e6e..38a3d3f8 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
@@ -113,7 +113,15 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         }
         return pagging;
     }
-
+    public List<ProjectInformationVo> listsAll(String token) {
+//        SysUserVo sysUserVo=sysUserFeign.loginDetailsNew(token).getData();
+        List<ProjectInformationVo> pagging = baseMapper.listsAll();
+        for(ProjectInformationVo projectInformationVo:pagging){
+            BigDecimal balance=projectAccountService.getBalanceByProjectSid(projectInformationVo.getSid()).getData();
+            projectInformationVo.setBalance(balance);
+        }
+        return pagging;
+    }
     @Transactional
     public ResultBean save(ProjectInfoDto dto) {
         ResultBean rb = new ResultBean();
@@ -287,7 +295,49 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         }
         return new ProjectInfoVo();
     }
-
+    public ProjectInfoVo getProjectBySidApp(String sid) {
+        ProjectInfoVo projectInfoVo = new ProjectInfoVo();
+        ProjectInformationVo bank = baseMapper.getProjectBySid(sid);
+        if (null != bank) {
+            //主体
+            SysUser sysUser = sysUserFeign.getUserBySid(bank.getManagerSid()).getData();
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(bank.getBankSid()).getData();
+            if(null!=sysOrganizationVo){
+                bank.setBankName(sysOrganizationVo.getName());
+            }
+            if(null!=sysUser){
+                bank.setBManagerName(sysUser.getName());
+            }
+            projectInfoVo.setBaseInfo(bank);
+            projectInfoVo.setSid(bank.getSid());
+            //企业
+            List<EnterpriseProjectVo> enterpriseProjectVoList = enterpriseProjectService.getEnterpriseByProjectSid(sid);
+            projectInfoVo.setEnterpriseList(enterpriseProjectVoList);
+            //章证
+            List<ProjectZzFilesVo> projectZzFilesVos = projectZzFilesService.getZzFilesByProjectSid(bank.getSid()).getData();
+            if (projectZzFilesVos.size() != 0) {
+                projectZzFilesVos.forEach(j -> {
+                    List<Map<String,String>> maps =new ArrayList<>();
+                    for(String r:j.getUrl().split(",")){
+                        Map<String,String> map=new HashMap<>();
+                        map.put("url",r);
+                        maps.add(map);
+                    }
+                    j.setUrls(maps);
+                });
+            }
+            projectInfoVo.setIdCardList(projectZzFilesVos);
+            //账户
+            List<ProjectAccountVo> ProjectAccountVos = projectAccountService.getAccountByProjectSid(bank.getSid()).getData();
+            projectInfoVo.setBankList(ProjectAccountVos);
+            //仓库
+//            sh
+            List<StoreHouseProjectVo> storeHouseProjectVos = storeHouseProjectService.selectStoreBySid(bank.getSid());
+            projectInfoVo.setWarehouse(storeHouseProjectVos);
+            return projectInfoVo;
+        }
+        return new ProjectInfoVo();
+    }
     public List<ProjectInformationVo> getProjectByUserSid(String sid) {
         SysUser s = sysUserFeign.getUserBySid(sid).getData();
         //银行人员
@@ -320,7 +370,38 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         return bank;
 
     }
+    public List<ProjectInformationVo> getProjectByUserSidApp(String sid) {
+        SysUser s = sysUserFeign.getUserBySid(sid).getData();
+        //银行人员
+        if (s.getUserType() == 3) {
+            BankManager b = bankManagerService.getOne(new QueryWrapper<BankManager>().eq("sid", s.getStaffSid()));
+//        bankInformationService.
+            if (s.getRoleNames().size() > 0) {
+                for (String name : s.getRoleNames()) {
+                    if (name.equals("银行行长")) {
+                        List<ProjectInformationVo> bank = baseMapper.getProjectByBankSid(b.getBankSid());
+                        return bank;
+                    }
+                }
+            }
+            List<ProjectInformationVo> bank = baseMapper.getProjectByUserSid(s.getSid());
+            return bank;
+        } else if (s.getUserType() == 1) {
+            //监管人员
+            List<UserProject> projectSidListByUserSid = userProjectService.getProjectSidListByUserSid(sid);
+            List<ProjectInformationVo> list = new ArrayList<>();
+            for (UserProject userProject : projectSidListByUserSid) {
+                ProjectInformationVo project = getEnterpriseBySid(userProject.getProjectSid());
+                if (StringUtils.isNotBlank(project.getSid())) {
+                    list.add(project);
+                }
+            }
+            return list;
+        }
+        List<ProjectInformationVo> bank = baseMapper.getProjectByUser(s.getStaffSid());
+        return bank;
 
+    }
     public ResultBean delete(String sid) {
         ResultBean rb = new ResultBean();
         baseMapper.delete(new QueryWrapper<ProjectInformation>().eq("sid", sid));
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java
index bd9fd156..fa182d2f 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java
@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -70,6 +71,7 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje
     }
     public List<StoreHouseProjectVo> selectStoreBySid(String sid) {
         List<StoreHouseProjectVo> pagging = baseMapper.selectStoreBySid(sid);
+        List<StoreHouseProjectVo> pagging1 = new ArrayList<>();
         for(StoreHouseProjectVo vo:pagging){
             String shSid=vo.getShSid();
             ShStorehouseVo shStorehouseVo=shStorehouseFeign.selectStoreBySid(shSid).getData();
@@ -79,9 +81,10 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje
                 vo.setAddress(shStorehouseVo.getAddress());
                 vo.setLinkerName(shStorehouseVo.getLinkerName());
                 vo.setLinkerPhone(shStorehouseVo.getLinkerPhone());
+                pagging1.add(vo);
             }
         }
-        return pagging;
+        return pagging1;
     }
     public StoreHouseProjectVo selectProjectByshSid(String sid) {
         StoreHouseProjectVo pagging = baseMapper.selectProjectByshSid(sid);
diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskDto.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskDto.java
index 17503c69..a0bef39e 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskDto.java
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskDto.java
@@ -115,4 +115,5 @@ public class FlowTaskDto implements Serializable {
     private boolean hasRevokeButton = false;
     @ApiModelProperty("办理的url")
     private SysProUrlVo sysProUrlVo ;
+    private String PreviousPersonSid;
 }
diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/application.yml b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/application.yml
index 53d5cfee..29742003 100644
--- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/application.yml
+++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/resources/application.yml
@@ -2,8 +2,8 @@ spring:
   application:
     name: supervise-flowable
   profiles:
-    active: devv
-#    active: test
+#    active: devv
+    active: test
 #    active: pro
   messages:
     # 国际化资源文件路径
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 9847bff9..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,8 +52,10 @@ public class ProjectDaily extends EntityWithId {
     private String state="2";//质押状态
     @TableField(exist = false)
     private double creditLimit;//授信额度
+
     private double useLimit;//用信额度
 
+
     /**
      * 计算出的质押率
      *
@@ -110,13 +112,4 @@ public class ProjectDaily extends EntityWithId {
         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/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..176624ed
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVos.java
@@ -0,0 +1,126 @@
+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 creditLimitW;//授信额度
+
+    private double useLimit;//用信额度
+    private double useLimitW;//用信额度
+
+
+    /**
+     * 计算出的质押率
+     *
+     * @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 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/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(也有相应的接口可以查询到)
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java
index 6d991afb..ce04b4ed 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java
@@ -75,6 +75,7 @@ public class SysUserRest implements SysUserFeign {
         PagerVo<SysUserVo> pv = sysUserService.listPageVo(pq);
         return rb.success().setData(pv);
     }
+
     @Override
     public ResultBean<List<SysUserVo>> listAll(@RequestBody SysUserQuery query) {
         ResultBean rb = ResultBean.fireFail();
@@ -169,6 +170,7 @@ public class SysUserRest implements SysUserFeign {
         }
         return rb.success();
     }
+
     public ResultBean pSave(SysUserDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //手机号
@@ -248,14 +250,16 @@ public class SysUserRest implements SysUserFeign {
 //        }
         return rb.success();
     }
+
     @PostMapping("/saveOpenId")
-    public ResultBean saveOpenId(@RequestBody SysUserDto dto){
-        ResultBean rb=new ResultBean();
-        SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("sid",dto.getSid()));
+    public ResultBean saveOpenId(@RequestBody SysUserDto dto) {
+        ResultBean rb = new ResultBean();
+        SysUser sysUser = sysUserService.getOne(new QueryWrapper<SysUser>().eq("sid", dto.getSid()));
         sysUser.setOpenId(dto.getOpenid());
-        sysUserService.update(sysUser,new QueryWrapper<SysUser>().eq("sid",dto.getSid()));
+        sysUserService.update(sysUser, new QueryWrapper<SysUser>().eq("sid", dto.getSid()));
         return rb.success().setMsg("保存成功");
     }
+
     @PostMapping("/saveBank")
     public ResultBean saveBank(@RequestBody SysUserDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -314,6 +318,7 @@ public class SysUserRest implements SysUserFeign {
 //        }
         return rb.success();
     }
+
     @Override
     public ResultBean delSysUserByMobile(String mobile) {
         int i = sysUserService.delSysUserByMobile(mobile);
@@ -322,8 +327,9 @@ public class SysUserRest implements SysUserFeign {
         }
         return new ResultBean().success().setMsg("删除成功");
     }
+
     @GetMapping("/getUserBySid")
-    public ResultBean<SysUser> getUserBySid(@RequestParam("sid")String sid) {
+    public ResultBean<SysUser> getUserBySid(@RequestParam("sid") String sid) {
         SysUser sysUser = sysUserService.getUserBySid(sid);
         return new ResultBean().success().setData(sysUser);
     }
@@ -450,8 +456,8 @@ public class SysUserRest implements SysUserFeign {
     }
 
     @Override
-    public ResultBean reGetPwd(String userName, String userPhone,String verificationCode) {
-        return sysUserService.reGetPwd(userName, userPhone,verificationCode);
+    public ResultBean reGetPwd(String userName, String userPhone, String verificationCode) {
+        return sysUserService.reGetPwd(userName, userPhone, verificationCode);
     }
 
     @Override
@@ -592,7 +598,8 @@ public class SysUserRest implements SysUserFeign {
         return rb.success().setData(vo);
     }
 
-//    @Override
+    //    @Override
+    @PostMapping(value = "/loginDetails")
     public ResultBean<SysUserVo> loginDetails(HttpServletRequest httpServletRequest) {
         String token = httpServletRequest.getHeader("token");
         if (StringUtils.isBlank(token)) {
@@ -609,8 +616,9 @@ public class SysUserRest implements SysUserFeign {
         }
         return new ResultBean<SysUserVo>().success().setData(userInfoOneVo);
     }
+
     @Override
-    public ResultBean<SysUserVo> loginDetailsNew(@RequestHeader("token")String token) {
+    public ResultBean<SysUserVo> loginDetailsNew(@RequestHeader("token") String token) {
 //        String token = httpServletRequest.getHeader("token");
         if (StringUtils.isBlank(token)) {
             return new ResultBean<SysUserVo>().fail().setMsg("请重新登录");
@@ -626,6 +634,7 @@ public class SysUserRest implements SysUserFeign {
         }
         return new ResultBean<SysUserVo>().success().setData(userInfoOneVo);
     }
+
     @Override
     public ResultBean<AppUserOrgInfoVo> getUserOrgInfoByUserSid(String userSid) {
         AppUserOrgInfoVo vo = sysUserService.getUserOrgInfoByUserSid(userSid);
@@ -654,7 +663,7 @@ public class SysUserRest implements SysUserFeign {
     @Override
     public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(String userSid, String orgSid) {
         ResultBean<SysUserInfoVo> rb = ResultBean.fireFail();
-        SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid,orgSid);
+        SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid, orgSid);
         if (sysUserInfoVo == null) {
             return rb.setData(new SysUserInfoVo()).setMsg("该用户未设置所属部门");
         }
@@ -720,16 +729,17 @@ public class SysUserRest implements SysUserFeign {
     }
 
     @GetMapping("getUserByType")
-    public ResultBean getUserByType(@RequestParam("userType") String userType){
+    public ResultBean getUserByType(@RequestParam("userType") String userType) {
         return sysUserService.getUserByType(userType);
     }
+
     @GetMapping("getUserOrgBySid")
-    public ResultBean getUserOrgBySid(@RequestParam("sid") String sid){
+    public ResultBean getUserOrgBySid(@RequestParam("sid") String sid) {
         return sysUserService.getUserOrgBySid(sid);
     }
 
     @PostMapping("/uploadfile")
-    public ResultBean<FileUploadResult> uploadImage(@RequestParam(value = "file") MultipartFile file) {
+    public ResultBean<FileUploadResult> uploadImage(@RequestPart(value = "file") MultipartFile file) {
         ResultBean rb = ResultBean.fireFail();
         if (file == null || file.isEmpty()) {
             return rb.setMsg("文件为空");
@@ -739,11 +749,12 @@ public class SysUserRest implements SysUserFeign {
     }
 
     @PostMapping("/uploadImage")
-    public ResultBean updateSysUserImage(@RequestBody Map<String, String> map){
+    public ResultBean updateSysUserImage(@RequestBody Map<String, String> map) {
         return sysUserService.updateSysUserImage(map);
     }
+
     @PostMapping("/getUsersBySid")
-    public ResultBean<List<SysUser>> getUsersBySid(@RequestBody List<String> list){
+    public ResultBean<List<SysUser>> getUsersBySid(@RequestBody List<String> list) {
         return sysUserService.getUsersBySid(list);
     }
 }