From 01c22bda76d92908eb8383c488d8c710a9318faf Mon Sep 17 00:00:00 2001
From: fkf <1475794025@qq.com>
Date: Mon, 26 Jun 2023 17:07:00 +0800
Subject: [PATCH 1/5] =?UTF-8?q?6-26=20=E9=A3=8E=E9=99=A9=E9=BB=91=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessRiskDataQuery.java                |  1 +
 .../api/riskblacklist/RiskBlacklistQuery.java | 15 ++++++++++++
 .../api/riskblacklist/RiskBlacklistVo.java    | 21 ++++++++++++++++
 .../BusinessRiskDataService.java              |  4 ++--
 .../riskblacklist/RiskBlacklistMapper.java    |  7 +++++-
 .../biz/riskblacklist/RiskBlacklistMapper.xml |  5 +++-
 .../biz/riskblacklist/RiskBlacklistRest.java  | 12 +++++++---
 .../riskblacklist/RiskBlacklistService.java   | 24 +++++++++++++++----
 8 files changed, 77 insertions(+), 12 deletions(-)
 create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistQuery.java
 create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistVo.java

diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataQuery.java
index d1777ddf..21f4b8ca 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataQuery.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataQuery.java
@@ -28,4 +28,5 @@ public class BusinessRiskDataQuery implements Query {
     private String buSid;
     //企业名称
     private String businessName;
+    private String executionTime;
 }
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistQuery.java
new file mode 100644
index 00000000..7c92f36b
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistQuery.java
@@ -0,0 +1,15 @@
+package com.supervise.rms.api.riskblacklist;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-06-26-11:17
+ */
+@Data
+public class RiskBlacklistQuery implements Query {
+    @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店")
+    private Integer objectType;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistVo.java
new file mode 100644
index 00000000..64424fd9
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskblacklist/RiskBlacklistVo.java
@@ -0,0 +1,21 @@
+package com.supervise.rms.api.riskblacklist;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-06-26-11:18
+ */
+@Data
+public class RiskBlacklistVo implements Vo {
+    private Integer id;
+    private String sid;
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("风险对象Sid")
+    private String objectSid;
+    @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店")
+    private Integer objectType;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java
index 17ed1c5b..18b5a5e3 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java
@@ -34,8 +34,8 @@ public class BusinessRiskDataService extends MybatisBaseService<BusinessRiskData
     public PagerVo<BusinessRiskDataVo> listPage(PagerQuery<BusinessRiskDataQuery> pq){
         BusinessRiskDataQuery params = pq.getParams();
         QueryWrapper<BusinessRiskData> wq = new QueryWrapper<>();
-        if (StringUtils.isNotNull(params.getBusinessName())){
-//            wq.eq("",params.getBusinessName());
+        if (StringUtils.isNotNull(params.getExecutionTime())){
+            wq.eq("e.executionTime",params.getExecutionTime());
         }
         IPage<BusinessRiskData> page = PagerUtil.queryToPage(pq);
         IPage<BusinessRiskDataVo> iPage = baseMapper.selectPageVo(page, wq);
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.java
index 79583cfa..ba80a581 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.java
@@ -1,8 +1,13 @@
 package com.supervise.rms.biz.riskblacklist;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.supervise.rms.api.riskblacklist.RiskBlacklist;
+import com.supervise.rms.api.riskblacklist.RiskBlacklistVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,5 +18,5 @@ import java.util.List;
 @Mapper
 public interface RiskBlacklistMapper extends BaseMapper<RiskBlacklist> {
 
-    List<RiskBlacklist> selectRiskBlackList();
+    IPage<RiskBlacklistVo> selectRiskBlackList(IPage<RiskBlacklist> page, @Param(Constants.WRAPPER) Wrapper<RiskBlacklist> qw);
 }
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.xml
index a69aa132..b1106f46 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.xml
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistMapper.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.supervise.rms.biz.riskblacklist.RiskBlacklistMapper">
-    <select id="selectRiskBlackList" resultType="com.supervise.rms.api.riskblacklist.RiskBlacklist">
+    <select id="selectRiskBlackList" resultType="com.supervise.rms.api.riskblacklist.RiskBlacklistVo">
         select * from risk_blacklist
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistRest.java
index 8adf9211..c621d90f 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistRest.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistRest.java
@@ -1,7 +1,11 @@
 package com.supervise.rms.biz.riskblacklist;
 
 import com.supervise.rms.api.riskblacklist.RiskBlacklistDto;
+import com.supervise.rms.api.riskblacklist.RiskBlacklistQuery;
+import com.supervise.rms.api.riskblacklist.RiskBlacklistVo;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +36,11 @@ public class RiskBlacklistRest {
     }
 
     @ApiOperation("查询风险黑名单列表")
-    @GetMapping("/select")
-    public ResultBean select(){
-        return riskBlacklistService.select();
+    @PostMapping("/listPage")
+    public ResultBean select(@RequestBody PagerQuery<RiskBlacklistQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<RiskBlacklistVo> vo = riskBlacklistService.select(pq);
+        return rb.success().setData(vo);
     }
 
     @ApiOperation("根据sid查询")
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistService.java
index 971851db..4b03af20 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistService.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskblacklist/RiskBlacklistService.java
@@ -1,10 +1,18 @@
 package com.supervise.rms.biz.riskblacklist;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.supervise.rms.api.riskblacklist.RiskBlacklist;
 import com.supervise.rms.api.riskblacklist.RiskBlacklistDto;
+import com.supervise.rms.api.riskblacklist.RiskBlacklistQuery;
+import com.supervise.rms.api.riskblacklist.RiskBlacklistVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -19,7 +27,7 @@ public class RiskBlacklistService extends MybatisBaseService<RiskBlacklistMapper
     public ResultBean saveRiskBlackList(RiskBlacklistDto dto){
         ResultBean rb = ResultBean.fireFail();
         RiskBlacklist riskBlacklist = new RiskBlacklist();
-        BeanUtil.copyProperties(dto,riskBlacklist);
+        BeanUtil.copyProperties(dto,riskBlacklist,"sid");
         baseMapper.insert(riskBlacklist);
         return rb.success().setMsg("添加成功");
     }
@@ -30,10 +38,16 @@ public class RiskBlacklistService extends MybatisBaseService<RiskBlacklistMapper
         return rb.success().setMsg("删除成功");
     }
 
-    public ResultBean select(){
-        ResultBean rb = ResultBean.fireFail();
-        List<RiskBlacklist> riskBlacklists = baseMapper.selectRiskBlackList();
-        return rb.success().setData(riskBlacklists);
+    public PagerVo<RiskBlacklistVo> select(PagerQuery<RiskBlacklistQuery> pq){
+        RiskBlacklistQuery params = pq.getParams();
+        QueryWrapper<RiskBlacklist> wq = new QueryWrapper<>();
+        if (StringUtils.isNotNull(params.getObjectType()) && !params.getObjectType().equals("")){
+            wq.eq("objectType",params.getObjectType());
+        }
+        IPage<RiskBlacklist> page = PagerUtil.queryToPage(pq);
+        IPage<RiskBlacklistVo> vos = baseMapper.selectRiskBlackList(page, wq);
+        PagerVo<RiskBlacklistVo> vo = PagerUtil.pageToVo(vos, null);
+        return vo;
     }
 
     public ResultBean selectRiskBlackListBySid(String sid){

From b74cdbd12b06805fe48da6bfab1738c8482fe416 Mon Sep 17 00:00:00 2001
From: fkf <1475794025@qq.com>
Date: Mon, 26 Jun 2023 17:33:44 +0800
Subject: [PATCH 2/5] 111

---
 .../java/com/supervise/rms/biz/risktype/RiskTypeService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeService.java
index cfd8bff1..dabcb6ce 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeService.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeService.java
@@ -74,7 +74,7 @@ public class RiskTypeService extends MybatisBaseService<RiskTypeMapper, RiskType
 
     public ResultBean del(String sid){
         ResultBean rb = ResultBean.fireFail();
-        RiskType riskType = fetchBySid(sid);
+        RiskType riskType = baseMapper.selectRiskTypeBySid(sid);
         deleteBySid(sid);
         //查询一级下是否有二级数据
         List<RiskType> riskTypes = baseMapper.selectRiskTypeSubordinate(riskType.getSid());

From 6d689676784b9ba9e149875de56286d695a35ce6 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Mon, 26 Jun 2023 17:42:55 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 supervise-customer-ui/src/layout/index.vue                  | 2 +-
 yxt-portal-ui/src/views/Home/Home.vue                       | 6 +++---
 .../src/layout/components/Navbar.vue                        | 4 ++--
 .../yxt-supervise-dbcenter-ui/src/settings.js               | 2 +-
 .../yxt-supervise-dbcenter-ui/vue.config.js                 | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/supervise-customer-ui/src/layout/index.vue b/supervise-customer-ui/src/layout/index.vue
index 8b7511b3..83ac505f 100644
--- a/supervise-customer-ui/src/layout/index.vue
+++ b/supervise-customer-ui/src/layout/index.vue
@@ -11,7 +11,7 @@
     <div class="main-container">
       <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>
+        <a href="javascript:void(0);" class="text-center">企业中心</a>
       </div>
       <sidebar class="sidebar-container" />
       <!--菜单-->
diff --git a/yxt-portal-ui/src/views/Home/Home.vue b/yxt-portal-ui/src/views/Home/Home.vue
index a35b932f..02c69152 100644
--- a/yxt-portal-ui/src/views/Home/Home.vue
+++ b/yxt-portal-ui/src/views/Home/Home.vue
@@ -222,7 +222,7 @@
       return {
         menus: [{
             imgUrl: require('@/assets/home/bIcon5.png'),
-            title: '客户中心'
+            title: '企业中心'
           },
           {
             imgUrl: require('@/assets/home/bIcon6.png'),
@@ -440,8 +440,8 @@
         if (index === 11) {
           window.open('/#/index', '_blank')
         } else if (index === 0) {
-          window.open('http://127.0.0.1:9531/#/' + '?token=' + getStorage(), '_blank')
-          // window.open('http://jianguan.yyundong.com/customer/#/' + '?token=' + getStorage(), '_blank')
+          // window.open('http://127.0.0.1:9531/#/' + '?token=' + getStorage(), '_blank')
+          window.open('http://jianguan.yyundong.com/customer/#/' + '?token=' + getStorage(), '_blank')
         } else if (index === 1) {
           // window.open('http://192.168.3.8:9531#/' + '?token=' + getStorage(), '_blank')
           window.open('http://jianguan.yyundong.com/report/#/' + '?token=' + getStorage(), '_blank')
diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/layout/components/Navbar.vue b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/layout/components/Navbar.vue
index d7842b7c..c0acc8ab 100644
--- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/layout/components/Navbar.vue
+++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <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/logo.png" style="width: 45px;height: 45px;margin-right: 10px;">汇融云仓清分系统-中鸿记</p>
       <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
       <div class="right-menu">
         <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
@@ -11,7 +11,7 @@
         <span class="backToHome" @click="logout"><i class="el-icon-back" />返回首页</span>
       </div>
     </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云仓贷后监管平台 All Rights Reserved</el-footer>
+    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云仓清分系统-中鸿记 All Rights Reserved</el-footer>
   </div>
 </template>
 
diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/settings.js b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/settings.js
index 358411dc..658ad779 100644
--- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/settings.js
+++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融云眼仓后监管平台',
+  title: '汇融云仓清分系统-中鸿记',
 
   /**
    * @type {boolean} true | false
diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/vue.config.js b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/vue.config.js
index ccad0303..71c27d51 100644
--- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/vue.config.js
+++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-ui/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，
 // 使用管理员权限执行命令行。

From 5e44d698b13a6c50fc128977eb96c405b97ebc69 Mon Sep 17 00:00:00 2001
From: fengdong777 <1478994744@qq.com>
Date: Mon, 26 Jun 2023 18:02:18 +0800
Subject: [PATCH 4/5] 6.26

---
 supervise-risk-ui/src/api/Risk/riskIndex.js   |  61 ++++
 .../src/layout/components/Sidebar/index.vue   |  10 +
 .../src/router/modules/codemenu.js            |  18 +-
 .../src/views/risk/RIskJkzb/addJkzb.vue       | 316 ++++++++++++++++++
 .../riskJkzb.vue}                             |  38 +--
 .../src/views/risk/RiskManage/RiskAdd.vue     |   4 +-
 .../src/views/risk/RiskManage/addBlack.vue    | 227 -------------
 .../src/views/risk/RiskManage/categoryAdd.vue |  63 +++-
 supervise-risk-ui/src/views/risk/addBlack.vue | 149 +++++++++
 .../src/views/risk/addRiskBlack.vue           | 229 +++++++++++++
 supervise-risk-ui/src/views/risk/riskCljl.vue |   2 +-
 11 files changed, 859 insertions(+), 258 deletions(-)
 create mode 100644 supervise-risk-ui/src/api/Risk/riskIndex.js
 create mode 100644 supervise-risk-ui/src/views/risk/RIskJkzb/addJkzb.vue
 rename supervise-risk-ui/src/views/risk/{RiskManage/addRiskBlack.vue => RIskJkzb/riskJkzb.vue} (86%)
 delete mode 100644 supervise-risk-ui/src/views/risk/RiskManage/addBlack.vue
 create mode 100644 supervise-risk-ui/src/views/risk/addBlack.vue
 create mode 100644 supervise-risk-ui/src/views/risk/addRiskBlack.vue

diff --git a/supervise-risk-ui/src/api/Risk/riskIndex.js b/supervise-risk-ui/src/api/Risk/riskIndex.js
new file mode 100644
index 00000000..5da6aee8
--- /dev/null
+++ b/supervise-risk-ui/src/api/Risk/riskIndex.js
@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+// 汇总工单数据
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/v1/riskBlackList/listPage',
+      method: 'post',
+      data: params
+    })
+  },
+  // 保存新增记录
+  saveRiskBlackList: function(params) {
+    return request({
+      url: '/v1/riskBlackList/saveRiskBlackList  ',
+      method: 'post',
+      data: params
+    })
+  },
+ // 查询记录列表
+ riskAlarmTreatmentListPage: function(params) {
+   return request({
+     url: '/v1/riskAlarmTreatment/listPage',
+     method: 'post',
+     data: params
+   })
+ },
+   // 通过sid删除一条或多条记录
+   delBySids: function(sid) {
+    return request({
+        url: '/v1/riskBlackList/del/' + sid,
+        method: 'get',
+      })
+  },
+
+   // 保存新增监控指标
+   saveRiskIndicator: function(params) {
+    return request({
+      url: '/v1/riskIndex/saveRiskIndex',
+      method: 'post',
+      data: params
+    })
+  },
+   // 查询监控指标列表
+   riskIndexListPage: function(params) {
+    return request({
+      url: '/v1/riskIndex/listPage',
+      method: 'post',
+      data: params
+    })
+  },
+     // 通过sid删除一条或多条记录
+     riskIndexDel: function(sid) {
+        return request({
+            url: '/v1/riskIndex/del/' + sid,
+            method: 'get',
+          })
+      },
+    
+}
diff --git a/supervise-risk-ui/src/layout/components/Sidebar/index.vue b/supervise-risk-ui/src/layout/components/Sidebar/index.vue
index 2a376a5b..0415529c 100644
--- a/supervise-risk-ui/src/layout/components/Sidebar/index.vue
+++ b/supervise-risk-ui/src/layout/components/Sidebar/index.vue
@@ -105,6 +105,16 @@
             },
             name: "/addRiskBlack/index",
             path: "/addRiskBlack/index",
+          },
+          {
+            alwaysShow: true,
+            component: "riskJkzb",
+            meta: {
+              icon: "el-icon-menu",
+              title: "监控指标",
+            },
+            name: "/riskJkzb/index",
+            path: "/riskJkzb/index",
           }
         ],
         params: {
diff --git a/supervise-risk-ui/src/router/modules/codemenu.js b/supervise-risk-ui/src/router/modules/codemenu.js
index 5860f2c5..ff6a4d1f 100644
--- a/supervise-risk-ui/src/router/modules/codemenu.js
+++ b/supervise-risk-ui/src/router/modules/codemenu.js
@@ -145,13 +145,29 @@ const codemenu = [{
   },
   children: [{
     path: '/addRiskBlack/index',
-    component: () => import('@/views/risk/RiskManage/addRiskBlack.vue'),
+    component: () => import('@/views/risk/addRiskBlack.vue'),
     name: 'riskBlack',
     meta: {
       title: '黑名单',
       noCache: true
     }
   }]
+},{
+  path: '/riskJkzb',
+  component: Layout,
+  redirect: '/riskJkzb/index',
+  meta: {
+    title: '监控指标'
+  },
+  children: [{
+    path: '/riskJkzb/index',
+    component: () => import('@/views/risk/RIskJkzb/riskJkzb.vue'),
+    name: 'riskJkzb',
+    meta: {
+      title: '监控指标',
+      noCache: true
+    }
+  }]
 },
 
 ]
diff --git a/supervise-risk-ui/src/views/risk/RIskJkzb/addJkzb.vue b/supervise-risk-ui/src/views/risk/RIskJkzb/addJkzb.vue
new file mode 100644
index 00000000..6cbcbec3
--- /dev/null
+++ b/supervise-risk-ui/src/views/risk/RIskJkzb/addJkzb.vue
@@ -0,0 +1,316 @@
+<template>
+	<div>
+		<!-- 标题按钮部分开始 -->
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>{{ viewTitle }}</div>
+			<!-- start 添加修改按钮 -->
+			<div>
+				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+				<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+			</div>
+			<!-- end 添加修改按钮 -->
+			<!-- end 详情按钮 -->
+		</div>
+		<!-- 标题按钮部分结束 -->
+		<!-- Start 新增修改部分 -->
+		<div class="listconadd">
+			<el-form ref="form_obj">
+			<el-card class="box-card">
+			 <div class="wlInfo"><span>监控指标</span></div>
+             <div class="item">
+                <span class="item_text">编号：</span>
+				<el-input v-model="formobj.code" placeholder="类别编号" class="item_input" clearable />
+              </div>
+			  <div class="item">
+                <span class="item_text">指标名称：</span>
+                <el-input v-model="formobj.name" placeholder="指标名称" class="item_input" clearable />
+              </div>
+			  <div class="item"  >
+                <span class="item_text">风险程度：</span>
+                <el-select
+                    v-model="formobj.levelName"
+                    class="item_input"
+                    placeholder="请选择风险等级名称"
+					          @change="getType"
+                  >
+                    <el-option
+                      v-for="(item, i) in arrList"
+                      :key="i"
+                      :label="item.name"
+                      :value="item.sid"
+                    />
+                </el-select>
+              </div>
+			    <div class="item"  >
+                <span class="item_text">风险类别：</span>
+                <el-cascader ref="cascaderAddr" :options="options" :props="optionProps" v-model="selectedOptions" :show-all-levels="false" @change="handleChange3" class="item_input"></el-cascader>
+              </div>
+              <div class="item">
+                <span class="item_text">指标说明：</span>
+				     <el-input v-model="formobj.content" placeholder="分类说明" class="item_input" clearable />
+              </div>
+              <div class="item" style="height: 110px;">
+                <span class="item_text">备注信息：</span>
+                <el-input  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 6 }" v-model="formobj.remarks"  class="item_input" placeholder="备注信息" />
+              </div>
+			</el-card>
+		</el-form>
+		</div>
+		<!-- End 添加修改部分 -->
+	</div>
+</template>
+
+<script>
+import req from '@/api/Risk/index.js'
+import req2 from '@/api/Risk/riskIndex'
+export default {
+	name: 'DispatchStandardsAdd',
+	data() {
+		return {
+			submitdisabled: false,
+			viewTitle: '',
+			viewState: 1,
+			arrLists: [],
+			arrList: [],
+			rangeArr: [],
+			option: [],
+			options: [],
+			hierarchys: false,
+			formobj: {
+				name: '', 
+				code: '', 
+				content: '', 
+				levelSid: '', 
+                levelCode: '', 
+				levelName: '', 
+				typeCode:'',
+				typeName:'',
+				typeSid:'',
+                remarks:'',
+			},
+			rules: {
+				name: [{ required: true, message: '风险等级名称不能为空', trigger: 'blur' }],
+				code: [{ required: true, message: '风险等级代码不能为空', trigger: 'blur' }], 
+				content: [{ required: true, message: '分类说明不能为空', trigger: 'blur' }], 
+				reportTarget: [{ required: true, message: '报送单位不能为空', trigger: 'blur' }], 
+			},
+      optionProps: {
+				value: 'code',
+				label: 'name',
+				children: 'down',
+				expandTrigger: 'hover',
+			},
+       selectedOptions: [], //配送选择值
+		}
+	},
+	created() {
+        this.superior()
+        this.selectTypes()
+    },
+	methods: {
+		handleReturn(isreload) {
+			if (isreload === 'true') this.$emit('reloadlist')
+			this.formobj.sid = '' 
+			this.formobj.name= '', 
+			this.formobj.code= '', 
+			this.formobj.content= '', 
+			this.formobj.levelSid= '', 
+			this.formobj.levelCode= ''
+			this.formobj.levelName= ''
+			this.formobj.typeCode='',
+            this.formobj.typeName='',
+            this.formobj.typeSid='',
+            this.formobj.remarks='',
+            this.formobj.reportTarget='',
+            this.selectedOptions=[],
+			
+			this.$refs['form_obj'].resetFields()
+			this.$emit('doback')
+		},
+		showAdd() {
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.viewTitle = '【新增】监控指标'
+			this.hierarchys= false
+		},
+		showEdit(row) {
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.viewTitle = '【修改】监控指标'
+			this.hierarchys= true
+			const _this = this
+			const vdata = row
+			_this.formobj.id = vdata.id
+			_this.formobj.sid = vdata.sid 
+			_this.formobj.name = vdata.name 
+			_this.formobj.code = vdata.code 
+			_this.formobj.content = vdata.content 
+			_this.formobj.levelName = vdata.levelName 
+			_this.formobj.levelSid = vdata.levelSid 
+			_this.formobj.levelCode = vdata.levelCode 
+			_this.formobj.typeName = vdata.typeName
+			_this.formobj.typeSid = vdata.typeSid
+			_this.formobj.typeCode = vdata.typeCode 
+			_this.formobj.reportTarget = vdata.reportTarget 
+			_this.formobj.remarks = vdata.remarks
+		},
+    getParentsById(list, id) {
+      for (let i in list) {
+        if (list[i].no == id) {//这里的no根据你的需求可进行改变
+          //查询到就返回该数组对象的value
+          return [list[i].no];
+        }
+        if (list[i].children) {
+          let node = this.getParentsById(list[i].children, id);
+          if (node !== undefined) {
+            //查询到把父节把父节点加到数组前面
+            node.unshift(list[i].no);
+            return node;
+          }
+        }
+      }
+    },
+	saveOrUpdate() {
+      if(this.formobj.reportTarget==='监管公司'){
+        this.formobj.reportTarget===1
+      }else if(this.formobj.reportTarget==='贷款支行'){
+        this.formobj.reportTarget===2
+      }else{
+        this.formobj.reportTarget===3
+      }
+      req2
+			.saveRiskIndicator(this.formobj)
+				.then(resp => {
+					if (resp.success) {
+						this.$message({ showClose: true, type: 'success', message: resp.msg })
+						this.handleReturn('true')
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+			})
+		},
+    superior(){
+            req
+			.selectRiskLevel()
+				.then(resp => {
+          if(resp.code==200){
+            this.arrLists=resp.data					
+						for (var i = 0; i < this.arrLists.length; i++) {
+
+            let item = {
+              name: this.arrLists[i].name,
+              sid: this.arrLists[i].sid,
+            
+            }
+            this.arrList.push(item)
+            }
+           }
+			})
+        },
+        selectTypes(){
+            req
+			.selectType()
+				.then(resp => {
+          if(resp.code==200){
+          this.options=resp.data
+         }
+			})
+        },
+		getType(value) {
+        const choose = this.arrLists.filter((item) => item.sid === value)
+        this.formobj.levelSid = value
+        this.formobj.levelCode = choose[0].code
+        this.formobj.levelName = choose[0].name
+      },
+      handleChange3(value) {
+      var getSId = this.$refs.cascaderAddr.getCheckedNodes()[0].data.sid
+      this.formobj.typeSid=getSId
+			var thsAreaCode = this.$refs.cascaderAddr.getCheckedNodes()[0].pathLabels;  //注意2： 获取label值
+			var len=value.length-1;
+			var lens=thsAreaCode.length-1;
+			this.formobj.typeCode=value[len];//这是最终修改后的要提交的选中后的数据值
+			this.formobj.typeName=thsAreaCode[lens];//这是最终修改后的要提交的选中后的数据值
+			this.$refs.cascaderAddr.toggleDropDownVisible();// 选择之后将下拉界面收起
+	},
+	},
+    watch: {
+        selectedOptions() {
+          if (this.$refs.cascaderAddr) {
+            this.$refs.cascaderAddr.dropDownVisible = false;
+            console.log(this.$refs.cascaderAddr,'cascader')
+          }
+        }
+      },
+}
+</script>
+
+<style lang="scss">
+  .box-card {
+    margin-left: 60px;
+    margin-right: 60px;
+    min-width: 70%;
+    margin-top: 20px;
+    padding-bottom: 50px;
+
+    .item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-top: 15px;
+      height: 40px;
+      line-height: 40px;
+
+      .item_text {
+        flex: 0.8;
+        font-size: 18px;
+        text-align: right;
+      }
+
+      .item_input {
+        flex: 4;
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+      .item_left_input {
+        width: 20%;
+      }
+
+      .item_left_text {
+        height: 30px;
+        margin-left: 20px;
+        line-height: 30px;
+        color: #018AD2;
+        padding: 0px 15px;
+        border: 1.5px solid #018AD2;
+        border-radius: 5px;
+
+      }
+
+      .item_right {
+        flex: 1;
+        justify-items: center;
+
+        .item_right_list_text {
+          font-size: 16px;
+        }
+
+        .item_right_list_delect {
+          color: #5E94FF;
+          margin-left: 20px;
+          font-size: 16px;
+          text-decoration: underline;
+        }
+      }
+
+    }
+
+  }
+</style>
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/addRiskBlack.vue b/supervise-risk-ui/src/views/risk/RIskJkzb/riskJkzb.vue
similarity index 86%
rename from supervise-risk-ui/src/views/risk/RiskManage/addRiskBlack.vue
rename to supervise-risk-ui/src/views/risk/RIskJkzb/riskJkzb.vue
index f957722c..90192597 100644
--- a/supervise-risk-ui/src/views/risk/RiskManage/addRiskBlack.vue
+++ b/supervise-risk-ui/src/views/risk/RIskJkzb/riskJkzb.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="app-container">
 		<div v-show="viewState == 1">
-			<button-bar ref="btnbar" view-title="风险类别" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+			<button-bar ref="btnbar" view-title="监控指标" :btndisabled="btndisabled" @btnhandle="btnHandle" />
 			<div class="main-content">
 			<div class="searchcon">
 				<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
@@ -18,7 +18,7 @@
 			</div>
 			<!-- Start 项目列表头部 -->
 			<div class="listtop">
-				<div class="tit">风险类别列表</div>
+				<div class="tit">监控指标列表</div>
 				<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
 			</div>
 			<!-- End 项目列表头部 -->
@@ -27,11 +27,14 @@
 			<div>
 				<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" >
 					<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
-					<el-table-column prop="name" label="类别名称" align="center" />
-					<el-table-column prop="code" label="类别编号" align="center" />
-					<el-table-column prop="content" label="分类说明" align="center" />
-					<el-table-column prop="hierarchy" :formatter="formatorderdegree"  label="层级" align="center" />
-                    <el-table-column prop="remarks" label="备注信息" align="center" />
+					<el-table-column prop="name" label="指标名称" align="center" />
+					<el-table-column prop="code" label="指标编码" align="center" />
+					<el-table-column prop="levelName" label="风险等级" align="center" />
+					<el-table-column prop="bigTypeName" label="风险类别" align="center" />
+					<el-table-column prop="typeName" label="风险小类" align="center" />
+					<el-table-column prop="content" label="指标说明" align="center" />
+					<!-- <el-table-column prop="hierarchy" :formatter="formatorderdegree"  label="层级" align="center" /> -->
+          <el-table-column prop="remarks" label="备注信息" align="center" />
 					<el-table-column fixed="right" label="操作"  align="center">
                         <template slot-scope="scope">
 						   <el-tooltip class="item" effect="dark" content="编辑" placement="top-end">
@@ -40,14 +43,11 @@
 						   <el-tooltip class="item" effect="dark" content="删除" placement="top">
 							<i  class="el-icon-delete"  @click="doDel(scope.row)"></i>
                            </el-tooltip>
-						   <el-tooltip class="item" effect="dark" content="查看二级" placement="top-start">
-							<i  class="el-icon-notebook-2" @click="purchase(scope.row)"></i>
-                           </el-tooltip>
-                        </template>
-                      </el-table-column>
+               </template>
+             </el-table-column>
 				</el-table>
 			</div>
-			<!-- End 项目列表 -->
+			<!-- End 项目列表 -->   
 			<div class="pages">
 				<div class="tit" />
 				<!--  翻页  -->
@@ -92,11 +92,11 @@
 </template>
 
 <script>
-import req from '@/api/Risk/index'
+import req from '@/api/Risk/riskIndex'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
-import divAdd from './addBlack'
+import divAdd from './addJkzb'
 
 export default {
 	name: 'DispatchOrderinfoIndex',
@@ -162,8 +162,8 @@ export default {
 					this.toAdd()
 					break
 			   case 'doClose': // 关闭
-                    this.doClose()
-                    break
+         this.doClose()
+         break
 				default:
 					break
 			}
@@ -188,7 +188,7 @@ export default {
 			})
 				.then(() => {
 					req
-						.delriskType(sids)
+						.riskIndexDel(sids)
 						.then(resp => {
 							if (resp.success) {
 								this.$message({ type: 'success', message: resp.msg, showClose: true })
@@ -214,7 +214,7 @@ export default {
 			const _this = this
 			this.tableLoading = true
 			req
-				.RiskListPage(this.queryParams)
+				.riskIndexListPage(this.queryParams)
 				.then(resp => {
 					_this.tableLoading = false
 					if (resp.success) { 
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue
index bc4fd4f7..a800b352 100644
--- a/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue
+++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue
@@ -149,14 +149,14 @@ export default {
 			this.$nextTick(() => {
 				this.$refs['form_obj'].clearValidate()
 			})
-			this.viewTitle = '【新增】风险等级'
+			this.viewTitle = '【新增】风险指标'
 			this.hierarchys= false
 		},
 		showEdit(row) {
 			this.$nextTick(() => {
 				this.$refs['form_obj'].clearValidate()
 			})
-			this.viewTitle = '【修改】风险等级'
+			this.viewTitle = '【修改】风险指标'
 			this.hierarchys= true
 			const _this = this
 			const vdata = row
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/addBlack.vue b/supervise-risk-ui/src/views/risk/RiskManage/addBlack.vue
deleted file mode 100644
index 9cb05e72..00000000
--- a/supervise-risk-ui/src/views/risk/RiskManage/addBlack.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-<template>
-	<div>
-		<!-- 标题按钮部分开始 -->
-		<div class="tab-header webtop">
-			<!-- 标题 -->
-			<div>{{ viewTitle }}</div>
-			<!-- start 添加修改按钮 -->
-			<div>
-				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
-				<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
-			</div>
-			<!-- end 添加修改按钮 -->
-			<!-- end 详情按钮 -->
-		</div>
-		<!-- 标题按钮部分结束 -->
-		<!-- Start 新增修改部分 -->
-		<div class="listconadd">
-			<el-form ref="form_obj">
-			<el-card class="box-card">
-			 <div class="wlInfo"><span>风险类别</span></div>
-			  <div class="item">
-                <span class="item_text">类别名称：</span>
-                <el-input v-model="formobj.name" placeholder="类别名称" class="item_input" clearable />
-              </div>
-              <div class="item">
-                <span class="item_text">类别编号：</span>
-				<el-input v-model="formobj.code" placeholder="类别编号" class="item_input" clearable />
-              </div>
-
-			  <div class="item">
-                <span class="item_text">分类说明：</span>
-				<el-input v-model="formobj.content" placeholder="分类说明" class="item_input" clearable />
-              </div>
-			  <div class="item">
-                <span class="item_text">层级：</span>
-                <el-input v-model="formobj.hierarchy" :disabled="hierarchys" placeholder="请输入层级(1/2)" @input="hierarchy($event)" class="item_input" clearable />
-              </div>
-			  <div class="item" >
-                <span class="item_text">上级名称：</span>
-                <el-select
-                    v-model="formobj.parentName"
-                    class="item_input"
-                    placeholder="请选择上级名称"
-                  >
-                    <el-option
-                      v-for="(item, i) in arrList"
-                      :key="i"
-                      :label="item.name"
-                      :value="item.sid"
-                    />
-                </el-select>
-              </div>
-              <div class="item" style="height: 110px;">
-                <span class="item_text">备注信息：</span>
-                <el-input  type="textarea"
-                  :autosize="{ minRows: 4, maxRows: 6 }" v-model="formobj.remarks"  class="item_input" placeholder="备注信息" />
-              </div>
-			</el-card>
-		</el-form>
-		</div>
-		<!-- End 添加修改部分 -->
-	</div>
-</template>
-
-<script>
-import req from '@/api/Risk/index'
-export default {
-	name: 'DispatchStandardsAdd',
-	data() {
-		return {
-			submitdisabled: false,
-			viewTitle: '',
-			viewState: 1,
-			arrList: [],
-			hierarchys: false,
-			formobj: {
-				name: '', 
-				code: '', 
-				content: '', 
-				hierarchy: '', 
-				parentSid: '', 
-				parentName: '', 
-				remarks: '' ,
-				sid:''
-			},
-		}
-	},
-	created() {},
-	methods: {
-		handleReturn(isreload) {
-			if (isreload === 'true') this.$emit('reloadlist')
-			this.formobj.sid = '' 
-			this.formobj.name= '', 
-			this.formobj.code= '', 
-			this.formobj.content= '', 
-			this.formobj.hierarchy= '', 
-			this.formobj.parentSid= ''
-			this.formobj.parentName= ''
-			this.formobj.remarks= ''
-			
-			this.$refs['form_obj'].resetFields()
-			this.$emit('doback')
-		},
-		showAdd() {
-			this.$nextTick(() => {
-				this.$refs['form_obj'].clearValidate()
-			})
-			this.viewTitle = '【新增】风险等级'
-			this.hierarchys= false
-		},
-		showEdit(row) {
-			this.$nextTick(() => {
-				this.$refs['form_obj'].clearValidate()
-			})
-			this.viewTitle = '【修改】风险等级'
-			this.hierarchys= true
-			const _this = this
-			const vdata = row
-			_this.formobj.id = vdata.id
-			_this.formobj.sid = vdata.sid 
-			_this.formobj.name = vdata.name 
-			_this.formobj.code = vdata.code 
-			_this.formobj.content = vdata.content 
-			_this.formobj.hierarchy = vdata.hierarchy 
-			_this.formobj.parentName = vdata.parentName
-			_this.formobj.parentSid = vdata.parentSid
-			_this.formobj.remarks = vdata.remarks 
-		},
-		saveOrUpdate() {
-			req
-			.saveRiskType(this.formobj)
-				.then(resp => {
-					if (resp.success) {
-						this.$message({ showClose: true, type: 'success', message: resp.msg })
-						this.handleReturn('true')
-					} else {
-						// 根据resp.code进行异常情况处理
-					}
-				})
-				.catch(() => {
-			})
-		},
-        hierarchy(e){
-           if(e==2){
-            this.viewState=2
-			this.superior()
-           }else{
-            this.viewState=1
-			this.sid=null
-			this.parentSid=null
-			this.parentName=null
-           }
-        },
-		getType(value) {
-        const choose = this.arrLists.filter((item) => item.sid === value)
-        this.formobj.parentName = choose[0].name
-        this.formobj.parentSid = value
-		console.log( this.formobj.parentSid);
-      },
-	}
-}
-</script>
-
-<style lang="scss">
-  .box-card {
-    margin-left: 60px;
-    margin-right: 60px;
-    min-width: 70%;
-    margin-top: 20px;
-    padding-bottom: 50px;
-
-    .item {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      margin-top: 15px;
-      height: 40px;
-      line-height: 40px;
-
-      .item_text {
-        flex: 0.8;
-        font-size: 18px;
-        text-align: right;
-      }
-
-      .item_input {
-        flex: 4;
-        font-size: 16px;
-        margin-left: 10px;
-        margin-right: 80px;
-      }
-
-      .item_left_input {
-        width: 20%;
-      }
-
-      .item_left_text {
-        height: 30px;
-        margin-left: 20px;
-        line-height: 30px;
-        color: #018AD2;
-        padding: 0px 15px;
-        border: 1.5px solid #018AD2;
-        border-radius: 5px;
-
-      }
-
-      .item_right {
-        flex: 1;
-        justify-items: center;
-
-        .item_right_list_text {
-          font-size: 16px;
-        }
-
-        .item_right_list_delect {
-          color: #5E94FF;
-          margin-left: 20px;
-          font-size: 16px;
-          text-decoration: underline;
-        }
-      }
-
-    }
-
-  }
-</style>
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue b/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue
index c0c0c8b9..be228a65 100644
--- a/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue
+++ b/supervise-risk-ui/src/views/risk/RiskManage/categoryAdd.vue
@@ -33,7 +33,11 @@
               </div>
 			  <div class="item">
                 <span class="item_text">层级：</span>
-                <el-input v-model="formobj.hierarchy" :disabled="hierarchys" placeholder="请输入层级(1/2)" @input="hierarchy($event)" class="item_input" clearable />
+				<div class="info-sex">
+					<el-radio v-model="formobj.hierarchy" :disabled="hierarchys" @input="hierarchy($event)"  :label="1">一级</el-radio>
+                    <el-radio v-model="formobj.hierarchy" :disabled="hierarchys" @input="hierarchy($event)" :label="2">二级</el-radio>
+				</div>
+                <!-- <el-input v-model="formobj.hierarchy" :disabled="hierarchys" placeholder="请输入层级(1/2)" @input="hierarchy($event)" class="item_input" clearable /> -->
               </div>
 			  <div class="item" v-show="viewState == 2" >
                 <span class="item_text">上级名称：</span>
@@ -79,7 +83,7 @@ export default {
 				name: '', 
 				code: '', 
 				content: '', 
-				hierarchy: '', 
+				hierarchy: 1, 
 				parentSid: '', 
 				parentName: '', 
 				remarks: '' ,
@@ -101,11 +105,11 @@ export default {
 			this.formobj.name= '', 
 			this.formobj.code= '', 
 			this.formobj.content= '', 
-			this.formobj.hierarchy= '', 
+			this.formobj.hierarchy= 1, 
 			this.formobj.parentSid= ''
 			this.formobj.parentName= ''
 			this.formobj.remarks= ''
-			
+			this.viewState=1
 			this.$refs['form_obj'].resetFields()
 			this.$emit('doback')
 		},
@@ -114,16 +118,17 @@ export default {
 				this.$refs['form_obj'].clearValidate()
 			})
 			this.viewTitle = '【新增】风险等级'
-			this.hierarchys= false
+			this.hierarchys=false
+			this.formobj.hierarchy= 1
 		},
 		showEdit(row) {
 			this.$nextTick(() => {
 				this.$refs['form_obj'].clearValidate()
 			})
 			this.viewTitle = '【修改】风险等级'
-			this.hierarchys= true
 			const _this = this
 			const vdata = row
+			_this.hierarchys=true
 			_this.formobj.id = vdata.id
 			_this.formobj.sid = vdata.sid 
 			_this.formobj.name = vdata.name 
@@ -133,6 +138,11 @@ export default {
 			_this.formobj.parentName = vdata.parentName
 			_this.formobj.parentSid = vdata.parentSid
 			_this.formobj.remarks = vdata.remarks 
+			if(vdata.hierarchy==1){
+				_this.viewState=1
+			}else{
+				_this.viewState=2
+			}
 		},
 		saveOrUpdate() {
 			req
@@ -169,12 +179,14 @@ export default {
         hierarchy(e){
            if(e==2){
             this.viewState=2
+			this.arrList=[]
 			this.superior()
            }else{
             this.viewState=1
 			this.sid=null
 			this.parentSid=null
 			this.parentName=null
+			this.arrList=[]
            }
         },
 		getType(value) {
@@ -187,7 +199,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style scoped  lang="scss">
   .box-card {
     margin-left: 60px;
     margin-right: 60px;
@@ -246,7 +258,42 @@ export default {
           text-decoration: underline;
         }
       }
-
+	.info-sex {
+	flex: 4;
+    font-size: 16px;
+    margin-left: 10px;
+    margin-right: 80px;
+    ::v-deep.el-radio__input.is-checked .el-radio__inner {
+      border-color: #48d18a;
+      background-color: #fff;
+    }
+    ::v-deep.el-radio__input.is-checked + .el-radio__label {
+      color: #424346;
+    }
+    ::v-deep.el-radio__input.is-checked .el-radio__inner:after {
+      transform: rotate(45deg) scaleY(1);
+    }
+    ::v-deep.el-radio__label {
+      color: #80838a;
+    }
+    ::v-deep.el-radio__inner::after {
+      box-sizing: content-box;
+      content: "";
+      border: 1px solid #48d18a;
+      border-left: 0;
+      border-top: 0;
+      height: 7px;
+      left: 4px;
+      position: absolute;
+      top: 1px;
+      transform: rotate(45deg) scaleY(0);
+      width: 3px;
+      transition: transform 0.15s ease-in 0.05s;
+      transform-origin: center;
+      border-radius: unset;
+      background-color: transparent;
+    }
+}
     }
 
   }
diff --git a/supervise-risk-ui/src/views/risk/addBlack.vue b/supervise-risk-ui/src/views/risk/addBlack.vue
new file mode 100644
index 00000000..95496fdc
--- /dev/null
+++ b/supervise-risk-ui/src/views/risk/addBlack.vue
@@ -0,0 +1,149 @@
+<template>
+	<div>
+		<!-- 标题按钮部分开始 -->
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>{{ viewTitle }}</div>
+			<!-- start 添加修改按钮 -->
+			<div>
+				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+				<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+			</div>
+			<!-- end 添加修改按钮 -->
+			<!-- end 详情按钮 -->
+		</div>
+		<!-- 标题按钮部分结束 -->
+		<!-- Start 新增修改部分 -->
+		<div class="listconadd">
+			<el-form ref="form_obj">
+			<el-card class="box-card">
+			 <div class="wlInfo"><span>风险类别</span></div>
+			  <div class="item">
+                <span class="item_text">风险对象：</span>
+                <el-input v-model="formobj.objectSid" placeholder="类别名称" class="item_input" clearable />
+              </div>
+			  <div class="item" >
+                <span class="item_text">对象类型：</span>
+                <el-select
+                    v-model="formobj.objectType"
+                    class="item_input"
+                    placeholder="请选择风险对象类型"
+                  >
+                    <el-option
+                      v-for="(item, i) in arrList"
+                      :key="i"
+                      :label="item.type"
+                      :value="item.value"
+                    />
+                </el-select>
+              </div>
+              <div class="item" style="height: 110px;">
+                <span class="item_text">备注信息：</span>
+                <el-input  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 6 }" v-model="formobj.remarks"  class="item_input" placeholder="备注信息" />
+              </div>
+			</el-card>
+		</el-form>
+		</div>
+		<!-- End 添加修改部分 -->
+	</div>
+</template>
+
+<script>
+import req from '@/api/Risk/riskIndex.js'
+export default {
+	name: 'DispatchStandardsAdd',
+	data() {
+		return {
+			submitdisabled: false,
+			viewTitle: '',
+			arrList: [{value:1,type:'供应商'},{value:2,type:'仓库'},{value:3,type:'门店'}],
+			hierarchys: false,
+			formobj: {
+				objectSid:'',
+				objectType:'',
+				remarks: '' 
+			},
+		}
+	},
+	created() {},
+	methods: {
+		handleReturn(isreload) {
+			if (isreload === 'true') this.$emit('reloadlist')
+			this.formobj.sid = '' 
+			this.formobj.objectSid='',
+			this.formobj.objectType='',
+			this.formobj.remarks= ''
+			
+			this.$refs['form_obj'].resetFields()
+			this.$emit('doback')
+		},
+		showAdd() {
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.viewTitle = '【新增】风险等级'
+		},
+		showEdit(row) {
+			this.$nextTick(() => {
+				this.$refs['form_obj'].clearValidate()
+			})
+			this.viewTitle = '【修改】风险等级'
+			const _this = this
+			const vdata = row
+			_this.formobj.objectSid = vdata.objectSid
+			_this.formobj.objectType = vdata.objectType
+			_this.formobj.remarks = vdata.remarks 
+		},
+		saveOrUpdate() {
+			req
+			.saveRiskBlackList(this.formobj)
+				.then(resp => {
+					if (resp.success) {
+						this.$message({ showClose: true, type: 'success', message: resp.msg })
+						this.handleReturn('true')
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+			})
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+  .box-card {
+    margin-left: 60px;
+    margin-right: 60px;
+    min-width: 70%;
+    margin-top: 20px;
+    padding-bottom: 50px;
+
+    .item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-top: 15px;
+      height: 40px;
+      line-height: 40px;
+
+      .item_text {
+        flex: 0.8;
+        font-size: 18px;
+        text-align: right;
+      }
+
+      .item_input {
+        flex: 4;
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+
+    }
+
+  }
+</style>
diff --git a/supervise-risk-ui/src/views/risk/addRiskBlack.vue b/supervise-risk-ui/src/views/risk/addRiskBlack.vue
new file mode 100644
index 00000000..eb4634c7
--- /dev/null
+++ b/supervise-risk-ui/src/views/risk/addRiskBlack.vue
@@ -0,0 +1,229 @@
+<template>
+	<div class="app-container">
+		<div v-show="viewState == 1">
+			<button-bar ref="btnbar" view-title="风险类别" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+			<div class="main-content">
+			<div class="searchcon">
+				<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
+				<div v-show="isSearchShow" class="search">
+					<el-form ref="queryParams" :model="queryParams.params"  :inline="true" class="tab-header">
+						<el-form-item label="客户名称"><el-input v-model="queryParams.params.custname" placeholder="请输入客户名称" clearable /></el-form-item>
+						<el-form-item label="工单名称"><el-input v-model="queryParams.params.ordername" placeholder="请输入工单名称" clearable /></el-form-item>
+						<div class="btn" style="text-align: center;">
+							<el-button type="primary" size="small" icon="el-icon-search"  @click="dosearch">查询</el-button>
+							<el-button type="primary" size="small" icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+						</div>
+					</el-form>
+				</div>
+			</div>
+			<!-- Start 项目列表头部 -->
+			<div class="listtop">
+				<div class="tit">风险类别列表</div>
+				<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+			</div>
+			<!-- End 项目列表头部 -->
+
+			<!-- Start 项目列表 -->
+			<div>
+				<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" >
+					<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
+					<el-table-column prop="objectSid" label="风险对象名称" align="center" />
+					<el-table-column prop="objectType" :formatter="formatorderdegree" label="风险对象类型" align="center" />
+                    <el-table-column prop="remarks" label="备注信息" align="center" />
+					<el-table-column fixed="right" label="操作"  align="center">
+                        <template slot-scope="scope">
+						   <el-tooltip class="item" effect="dark" content="删除" placement="top">
+							<i  class="el-icon-delete"  @click="doDel(scope.row)"></i>
+                           </el-tooltip>
+                        </template>
+                      </el-table-column>
+				</el-table>
+			</div>
+			<!-- End 项目列表 -->
+			<div class="pages">
+				<div class="tit" />
+				<!--  翻页  -->
+				<pagination
+					v-show="dataList.length > 0"
+					:total="queryParams.total"
+					:page.sync="queryParams.current"
+					:limit.sync="queryParams.size"
+					class="pagination"
+					@pagination="loadList"
+				/>
+			</div>
+		</div>
+		</div>
+		<!-- 新增修改部分组件 -->
+		<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+	</div>
+</template>
+
+<script>
+import req from '@/api/Risk/riskIndex'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import divAdd from './addBlack'
+
+export default {
+	name: 'DispatchOrderinfoIndex',
+	components: {
+		ButtonBar,
+		Pagination,
+		pageye,
+		divAdd,
+	},
+	data() {
+		return {
+			btndisabled: false,
+			viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+			isSearchShow: false,
+			tableLoading: false,
+			drawer: false,
+			listLoading: false,
+			dataList: [],
+			queryParams: {
+				current: 1,
+				size: 10,
+				total: 0,
+				params: {
+                    
+				}
+			},
+			multipleSelection: [],
+			btnList: [
+                 {
+                  type: 'primary',
+                  size: 'small',
+                  icon: 'plus',
+                  btnKey: 'toAdd',
+                  btnLabel: '新增'
+                },
+                {
+                  type: 'info',
+                  size: 'small',
+                  icon: 'cross',
+                  btnKey: 'doClose',
+                  btnLabel: '关闭'
+                }
+              ],
+			size:'',
+			TableList:[],
+			formobj:[]
+		}
+	},
+	mounted() {
+      // 初始化按钮
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+	created() {
+		this.loadList()
+	},
+	methods: {
+		resetState() {
+			this.viewState = 1
+		},
+		btnHandle(btnKey) {
+			switch (btnKey) {
+				case 'toAdd':
+					this.toAdd()
+					break
+			   case 'doClose': // 关闭
+                    this.doClose()
+                    break
+				default:
+					break
+			}
+		},
+		toAdd() {
+			this.viewState = 2
+			this.$refs['divadd'].showAdd()
+		},
+		toEdit(row) {
+			this.viewState = 3
+			this.$refs['divadd'].showEdit(row)
+			this.drawer=false
+		},
+		doDel(row) {
+			const sids = []
+		    sids.push(row.sid)
+			const tip = '请确认是否是否删除该条记录?'
+			this.$confirm(tip, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(() => {
+					req
+						.delBySids(sids)
+						.then(resp => {
+							if (resp.success) {
+								this.$message({ type: 'success', message: resp.msg, showClose: true })
+								this.loadList()
+							} else {
+								// 根据resp.code进行异常情况处理
+							}
+						})
+				})
+				.catch(() => {})
+		},
+		dosearch() {
+			this.queryParams.current = 1
+			this.loadList()
+		},
+		resetQuery() {
+			this.queryParams.params = {}
+			this.queryParams.params.sid = '' // sid
+			this.queryParams.params.name = '' // 登录名
+			this.dosearch()
+		},
+		loadList() {
+			const _this = this
+			this.tableLoading = true
+			req
+				.listPage(this.queryParams)
+				.then(resp => {
+					_this.tableLoading = false
+					if (resp.success) { 
+						const data = resp.data
+						_this.queryParams.total = data.total
+						_this.dataList = data.records
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+					_this.tableLoading = false
+				})
+		},
+		// 序号
+		indexMethod(index) {
+			var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+			var pageindex = index + 1 + pagestart
+			return pageindex
+		},
+		doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+        },
+        formatorderdegree: function( row, column) {
+         if(row.objectType === 1){
+             return '供应商'
+         }else if(row.objectType === 2) {
+			return '仓库'
+		 }else if(row.objectType === 3){
+			return '门店'
+		 }
+        },
+	}
+}
+</script>
+<style scoped>
+.margin-top {
+  border-bottom: 1px solid #ebebeb;
+}
+.item {
+   margin: 6px;
+ }
+</style>
diff --git a/supervise-risk-ui/src/views/risk/riskCljl.vue b/supervise-risk-ui/src/views/risk/riskCljl.vue
index 67fee549..61bc2f27 100644
--- a/supervise-risk-ui/src/views/risk/riskCljl.vue
+++ b/supervise-risk-ui/src/views/risk/riskCljl.vue
@@ -64,7 +64,7 @@
               <el-table-column prop="userName" label="处理人姓名" width="120" align="center"  />
               <el-table-column prop="userPhone" label="处理人电话" align="center" width="150" />
               <el-table-column prop="remarks" label="处理说明" align="center" width="150" />
-              <el-table-column prop="treatmentStatus" label="处理状态" align="center" width="280"       fixed="right">
+              <el-table-column prop="treatmentStatus" label="处理状态" align="center" width="300"       fixed="right">
                <template slot-scope="scope">
                   <div class="info-sex">
                     <el-radio-group v-model="scope.row.treatmentStatus">

From 40db3be5fb7b1cf21579df29992e66a688980c42 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 26 Jun 2023 18:06:56 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=97=A5=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReportInventoryDayGather.java             | 41 +++++++++++++++++++
 .../ReportInventoryDayGatherDto.java          | 37 +++++++++++++++++
 .../ReportInventoryDayGatherQuery.java        | 37 +++++++++++++++++
 .../ReportInventoryDayGatherVo.java           | 39 ++++++++++++++++++
 .../ReportInventoryDayStore.java              | 28 +++++++++++++
 .../ReportInventoryDayStoreDto.java           | 25 +++++++++++
 .../ReportInventoryDayStoreQuery.java         | 25 +++++++++++
 .../ReportInventoryDayStoreVo.java            | 25 +++++++++++
 .../ReportInventoryDayGatherMapper.java       |  7 ++++
 .../ReportInventoryDayGatherService.java      | 12 ++++++
 .../reportinventory/ReportInventoryRest.java  | 16 ++++++--
 .../report/biz/wechat/WechatRest.java         |  6 +--
 12 files changed, 291 insertions(+), 7 deletions(-)
 create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGather.java
 create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherDto.java
 create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherQuery.java
 create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java
 create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStore.java
 create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreDto.java
 create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreQuery.java
 create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java

diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGather.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGather.java
new file mode 100644
index 00000000..f18f8348
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGather.java
@@ -0,0 +1,41 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+
+@ApiModel(value = "库存日报表-汇总", description = "库存日报表-汇总")
+@TableName("report_inventory_day_gather")
+@Data
+public class ReportInventoryDayGather extends EntityWithId {
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private double productAmount;
+    //合计货值
+    private double countAmount;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherDto.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherDto.java
new file mode 100644
index 00000000..cac1f6ac
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherDto.java
@@ -0,0 +1,37 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+@Data
+public class ReportInventoryDayGatherDto implements Dto {
+    private String id;
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private double productAmount;
+    //合计货值
+    private double countAmount;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherQuery.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherQuery.java
new file mode 100644
index 00000000..4bcb301e
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherQuery.java
@@ -0,0 +1,37 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+@Data
+public class ReportInventoryDayGatherQuery implements Query {
+    private String id;
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private double productAmount;
+    //合计货值
+    private double countAmount;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java
new file mode 100644
index 00000000..81e6102f
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaygather/ReportInventoryDayGatherVo.java
@@ -0,0 +1,39 @@
+package com.yxt.supervise.report.api.reportinventorydaygather;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 14:39
+ */
+@Data
+public class ReportInventoryDayGatherVo implements Vo {
+    private String id;
+    //记录创建时间
+    private Date createTime;
+    //备注说明
+    private String remarks;
+    //单据日期
+    private String orderDate;
+    //编号
+    private String serialNumber;
+    //上报时间
+    private String reportTime;
+    //排序
+    private Integer sort;
+    //仓库类型
+    private String storeType;
+    //仓库数量
+    private Integer storeNumber;
+    //品种数量
+    private Integer productCountNumber;
+    //货值
+    private double productAmount;
+    //合计货值
+    private double countAmount;
+    private List<ReportInventoryDayGatherVo> list;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStore.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStore.java
new file mode 100644
index 00000000..abdc86f7
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStore.java
@@ -0,0 +1,28 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 17:58
+ */
+@ApiModel(value = "仓库库存报表-汇总", description = "仓库库存报表-汇总")
+@TableName("report_inventory_day_store")
+@Data
+public class ReportInventoryDayStore extends EntityWithId {
+    private String createTime;
+    private String remarks;
+    private String orderDate;
+    private String serialNumber;
+    private String reportTime;
+    private String warehouseType;
+    private String storeCode;
+    private String storeCodeName;
+    private String productCountNumber;
+    private String productAmount;
+    private String countAmount;
+    private String countProductNumber;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreDto.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreDto.java
new file mode 100644
index 00000000..2cca6b62
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreDto.java
@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 17:59
+ */
+@Data
+public class ReportInventoryDayStoreDto implements Dto {
+    private String id;
+    private String createTime;
+    private String remarks;
+    private String orderDate;
+    private String serialNumber;
+    private String reportTime;
+    private String warehouseType;
+    private String storeCode;
+    private String storeCodeName;
+    private String productCountNumber;
+    private String productAmount;
+    private String countAmount;
+    private String countProductNumber;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreQuery.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreQuery.java
new file mode 100644
index 00000000..e792524e
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreQuery.java
@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 17:59
+ */
+@Data
+public class ReportInventoryDayStoreQuery implements Query {
+    private String id;
+    private String createTime;
+    private String remarks;
+    private String orderDate;
+    private String serialNumber;
+    private String reportTime;
+    private String warehouseType;
+    private String storeCode;
+    private String storeCodeName;
+    private String productCountNumber;
+    private String productAmount;
+    private String countAmount;
+    private String countProductNumber;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java
new file mode 100644
index 00000000..48c6d03e
--- /dev/null
+++ b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/reportinventorydaystore/ReportInventoryDayStoreVo.java
@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.api.reportinventorydaystore;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/26 17:59
+ */
+@Data
+public class ReportInventoryDayStoreVo implements Vo {
+    private String id;
+    private String createTime;
+    private String remarks;
+    private String orderDate;
+    private String serialNumber;
+    private String reportTime;
+    private String warehouseType;
+    private String storeCode;
+    private String storeCodeName;
+    private String productCountNumber;
+    private String productAmount;
+    private String countAmount;
+    private String countProductNumber;
+}
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java
index 7e5c8f20..52bfe128 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherMapper.java
@@ -1,6 +1,9 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -76,4 +79,8 @@ public interface ReportInventoryDayGatherMapper extends BaseMapper<ReportInvento
             " sum(prodValue)  " +
             "from gd_inventory_yc giy where warehouseType=2 ")
     double countProductAmountYc();
+    @Select("select * from report_inventory_day_gather where orderDate=#{orderDate}")
+    List<ReportInventoryDayGatherVo> getReportInventoryDayGathers(@Param("orderDate") String orderDate);
+    @Select("select * from report_inventory_day_gather where orderDate=#{orderDate} limit 1")
+    ReportInventoryDayGatherVo getReportInventoryDayGather(@Param("orderDate") String orderDate);
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java
index c8f51e69..b0a9e508 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryDayGatherService.java
@@ -1,7 +1,12 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherQuery;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -75,4 +80,11 @@ public class ReportInventoryDayGatherService extends ServiceImpl<ReportInventory
 
         super.saveBatch(whInList);
     }
+    public ReportInventoryDayGatherVo getReportInventoryDayGather(String orderDate) {
+        QueryWrapper<com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGather> qw = new QueryWrapper<>();
+        ReportInventoryDayGatherVo vo=baseMapper.getReportInventoryDayGather(orderDate);
+        List<ReportInventoryDayGatherVo> pagging = baseMapper.getReportInventoryDayGathers(orderDate);
+        vo.setList(pagging);
+        return vo;
+    }
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java
index 49dbbd35..d90c8296 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryRest.java
@@ -1,12 +1,12 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherQuery;
+import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayGatherVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController("com.yxt.supervise.report.biz.reportinventory.reportInventoryRest")
 @RequestMapping("/reportinventory")
@@ -14,6 +14,8 @@ public class ReportInventoryRest {
 
     @Autowired
     private ReportInventoryService reportInventoryService;
+    @Autowired
+    private ReportInventoryDayGatherService reportInventoryDayGatherService;
 
     @GetMapping("/kcReport")
     public ResultBean kcReport(@RequestParam("orderDate") String orderDate) {
@@ -27,4 +29,10 @@ public class ReportInventoryRest {
         reportInventoryService.buildInventoryReportByDay(orderDate);
         return rb.success();
     }
+    @GetMapping("/getReportInventoryDayGather/{orderDate}")
+    public ResultBean<ReportInventoryDayGatherVo> getReportInventoryDayGather(@PathVariable("orderDate") String orderDate){
+        ResultBean rb = ResultBean.fireFail();
+        ReportInventoryDayGatherVo pv = reportInventoryDayGatherService.getReportInventoryDayGather(orderDate);
+        return rb.success().setData(pv);
+    }
 }
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
index d51fbdc2..5025b6c4 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
@@ -76,7 +76,7 @@ public class WechatRest {
         //刘
         //String openId  ="otnrM5ySvUo7ZZc4qafWzM9eyKBk";
         //聂总
-        //otnrM521f8KcCsRfL2Jj4Tk8np1g
+//        otnrM521f8KcCsRfL2Jj4Tk8np1g
         // 模板参数
         Map<String, Template> sendMag = new HashMap<String, Template>();
         // 公众号的模板id(也有相应的接口可以查询到)
@@ -86,8 +86,8 @@ public class WechatRest {
         String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken);
         List<String> openIds=new ArrayList<>();
         openIds.add("otnrM57kui-WCUmRtChhb1HguOgw");
-        openIds.add("otnrM544hxIgkMOfaDU8VpJhj_6k");
-        openIds.add("otnrM5ySvUo7ZZc4qafWzM9eyKBk");
+        openIds.add("otnrM521f8KcCsRfL2Jj4Tk8np1g");
+//        openIds.add("otnrM5ySvUo7ZZc4qafWzM9eyKBk");
         JSONObject jsonObject=new JSONObject();
         for(String openId:openIds){
             sendMag.put("thing3", new Template(csmCashReportVo.getCompanyName()));